[Super-tux-commit] supertux/src/badguy bouncing_snowball.cpp,1.7,1.8 dispenser.cpp,1.9,1.10 jumpy.cpp,1.5,1.6 mrbomb.cpp,1.9,1.10 mriceblock.cpp,1.6,1.7 nolok_01.cpp,1.7,1.8 snowball.cpp,1.7,1.8 spiky.cpp,1.5,1.6

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src/badguy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15164/src/badguy

Modified Files:
	bouncing_snowball.cpp dispenser.cpp jumpy.cpp mrbomb.cpp 
	mriceblock.cpp nolok_01.cpp snowball.cpp spiky.cpp 
Log Message:
changed worldmap to be stored inside the same directory as the levelsubset, fixed badguys writing out their current position instead of their startposition when saving levelfile

Index: dispenser.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dispenser.cpp	28 Nov 2004 14:56:50 -0000	1.9
+++ dispenser.cpp	2 Dec 2004 00:25:27 -0000	1.10
@@ -22,8 +22,8 @@
 {
   writer.start_list("dispenser");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
   writer.write_float("cycle", cycle);
   writer.write_string("badguy", badguy);
 

Index: mrbomb.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/mrbomb.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mrbomb.cpp	1 Dec 2004 15:58:38 -0000	1.9
+++ mrbomb.cpp	2 Dec 2004 00:25:27 -0000	1.10
@@ -29,8 +29,8 @@
 {
   writer.start_list("mrbomb");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("mrbomb");
 }

Index: mriceblock.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/mriceblock.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mriceblock.cpp	29 Nov 2004 00:12:24 -0000	1.6
+++ mriceblock.cpp	2 Dec 2004 00:25:27 -0000	1.7
@@ -33,8 +33,8 @@
 {
   writer.start_list("mriceblock");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("mriceblock");
 }

Index: snowball.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/snowball.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- snowball.cpp	29 Nov 2004 00:12:24 -0000	1.7
+++ snowball.cpp	2 Dec 2004 00:25:27 -0000	1.8
@@ -28,8 +28,8 @@
 {
   writer.start_list("snowball");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("snowball");
 }

Index: jumpy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jumpy.cpp	29 Nov 2004 00:12:24 -0000	1.5
+++ jumpy.cpp	2 Dec 2004 00:25:27 -0000	1.6
@@ -17,8 +17,8 @@
 {
   writer.start_list("jumpy");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("jumpy");
 }

Index: nolok_01.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- nolok_01.cpp	28 Nov 2004 14:56:51 -0000	1.7
+++ nolok_01.cpp	2 Dec 2004 00:25:27 -0000	1.8
@@ -33,8 +33,8 @@
 {
   writer.start_list("nolok01");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("nolok01");
 }

Index: bouncing_snowball.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bouncing_snowball.cpp	29 Nov 2004 00:12:24 -0000	1.7
+++ bouncing_snowball.cpp	2 Dec 2004 00:25:27 -0000	1.8
@@ -29,8 +29,8 @@
 {
   writer.start_list("bouncingsnowball");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("bouncingsnowball");
 }

Index: spiky.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/spiky.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spiky.cpp	29 Nov 2004 00:12:24 -0000	1.5
+++ spiky.cpp	2 Dec 2004 00:25:27 -0000	1.6
@@ -17,8 +17,8 @@
 {
   writer.start_list("spiky");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("spiky");
 }