Rebased onto master, fixing conflicts in spotlight.cpp

SuperTux · Feb 3, 2016 · 544bd92 · 544bd92
1 parent b27b423
commit 544bd92
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/object/spotlight.cpp b/src/object/spotlight.cpp
@@ -59,8 +59,8 @@ Spotlight::~Spotlight()
 void
 Spotlight::save(Writer& writer) {
   GameObject::save(writer);
-  writer.write("x", position.x);
-  writer.write("y", position.y);
+  writer.write("x", bbox.p1.x);
+  writer.write("y", bbox.p1.y);
   writer.write("color", color.toVector(false));
 }