Rebased onto master, fixed werrors and stuff

SuperTux · Feb 3, 2016 · b27b423 · b27b423
1 parent 1d9e886
commit b27b423
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/src/trigger/sequence_trigger.cpp b/src/trigger/sequence_trigger.cpp
@@ -28,7 +28,8 @@
 
 SequenceTrigger::SequenceTrigger(const ReaderMapping& reader) :
   triggerevent(),
-  sequence(SEQ_ENDSEQUENCE)
+  sequence(SEQ_ENDSEQUENCE),
+  new_size()
 {
   if (!reader.get("x", bbox.p1.x)) bbox.p1.x = 0;
   if (!reader.get("y", bbox.p1.y)) bbox.p1.y = 0;
@@ -45,7 +46,8 @@ SequenceTrigger::SequenceTrigger(const ReaderMapping& reader) :
 
 SequenceTrigger::SequenceTrigger(const Vector& pos, const std::string& sequence_name) :
   triggerevent(),
-  sequence(SEQ_ENDSEQUENCE)
+  sequence(SEQ_ENDSEQUENCE),
+  new_size()
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
@@ -76,7 +78,7 @@ SequenceTrigger::get_settings() {
 
   ObjectOption seq(MN_STRINGSELECT, _("Sequence"), &sequence);
   seq.select.push_back(_("end sequence"));
-  seq.select.push_back(_("stop tux"));
+  seq.select.push_back(_("stop Tux"));
   seq.select.push_back(_("fireworks"));
 
   result.options.push_back( seq );

diff --git a/src/video/color.cpp b/src/video/color.cpp
@@ -89,4 +89,18 @@ Color::operator < (const Color& other) const
   return greyscale() < other.greyscale();
 }
 
+std::vector<float>
+Color::toVector(bool include_alpha)
+{
+  std::vector<float> result;
+  result.clear();
+  result.push_back(red);
+  result.push_back(green);
+  result.push_back(blue);
+  if (include_alpha){
+    result.push_back(alpha);
+  }
+  return result;
+}
+
 /* EOF */
diff --git a/src/video/color.hpp b/src/video/color.hpp
@@ -37,17 +37,7 @@ class Color
 
   bool operator < (const Color& other) const;
 
-  std::vector<float> toVector(bool include_alpha){
-    std::vector<float> result;
-    result.clear();
-    result.push_back(red);
-    result.push_back(green);
-    result.push_back(blue);
-    if (include_alpha){
-      result.push_back(alpha);
-    }
-    return result;
-  }
+  std::vector<float> toVector(bool include_alpha);
 
   float red, green, blue, alpha;