[Super-tux-commit] supertux/src/badguy badguy.h,1.4,1.5 bomb.cpp,1.6,1.7 bouncing_snowball.cpp,1.8,1.9 dispenser.cpp,1.10,1.11 flame.cpp,1.2,1.3 flyingsnowball.cpp,1.1,1.2 jumpy.cpp,1.7,1.8 mrbomb.cpp,1.10,1.11 mriceblock.cpp,1.7,1.8 nolok_01.cpp,1.8,1.9 snowball.cpp,1.8,1.9 spike.cpp,1.2,1.3 spiky.cpp,1.6,1.7

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

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

Modified Files:
	badguy.h bomb.cpp bouncing_snowball.cpp dispenser.cpp 
	flame.cpp flyingsnowball.cpp jumpy.cpp mrbomb.cpp 
	mriceblock.cpp nolok_01.cpp snowball.cpp spike.cpp spiky.cpp 
Log Message:
implemented a new object factory mechanism which is now really independent of the objects

Index: bouncing_snowball.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bouncing_snowball.cpp	2 Dec 2004 00:25:27 -0000	1.8
+++ bouncing_snowball.cpp	20 Dec 2004 21:24:26 -0000	1.9
@@ -81,3 +81,5 @@
   return CONTINUE;
 }
 
+IMPLEMENT_FACTORY(BouncingSnowball, "bouncingsnowball")
+

Index: mriceblock.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/mriceblock.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mriceblock.cpp	2 Dec 2004 00:25:27 -0000	1.7
+++ mriceblock.cpp	20 Dec 2004 21:24:27 -0000	1.8
@@ -165,3 +165,4 @@
   return true;
 }
 
+IMPLEMENT_FACTORY(MrIceBlock, "mriceblock")

Index: jumpy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jumpy.cpp	5 Dec 2004 16:57:14 -0000	1.7
+++ jumpy.cpp	20 Dec 2004 21:24:27 -0000	1.8
@@ -58,3 +58,5 @@
     //FIXME: add middle and up here
   sprite->set_action(dir == LEFT ? "left-down" : "right-down");
 }
+
+IMPLEMENT_FACTORY(Jumpy, "jumpy")

Index: spike.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/spike.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- spike.cpp	28 Nov 2004 14:56:51 -0000	1.2
+++ spike.cpp	20 Dec 2004 21:24:27 -0000	1.3
@@ -62,3 +62,5 @@
 Spike::active_action(float )
 {
 }
+
+IMPLEMENT_FACTORY(Spike, "spike")

Index: spiky.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/spiky.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spiky.cpp	2 Dec 2004 00:25:27 -0000	1.6
+++ spiky.cpp	20 Dec 2004 21:24:27 -0000	1.7
@@ -56,3 +56,4 @@
   return CONTINUE;
 }
 
+IMPLEMENT_FACTORY(Spiky, "spiky")

Index: bomb.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/bomb.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bomb.cpp	1 Dec 2004 15:58:38 -0000	1.6
+++ bomb.cpp	20 Dec 2004 21:24:26 -0000	1.7
@@ -74,3 +74,4 @@
 Bomb::kill_fall()
 {
 }
+

Index: mrbomb.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/mrbomb.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mrbomb.cpp	2 Dec 2004 00:25:27 -0000	1.10
+++ mrbomb.cpp	20 Dec 2004 21:24:27 -0000	1.11
@@ -77,3 +77,5 @@
 
   return CONTINUE;
 }
+
+IMPLEMENT_FACTORY(MrBomb, "mrbomb")

Index: flyingsnowball.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/flyingsnowball.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flyingsnowball.cpp	5 Dec 2004 17:04:57 -0000	1.1
+++ flyingsnowball.cpp	20 Dec 2004 21:24:27 -0000	1.2
@@ -80,3 +80,4 @@
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
+IMPLEMENT_FACTORY(FlyingSnowBall, "flyingsnowball")

Index: snowball.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/snowball.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- snowball.cpp	2 Dec 2004 00:25:27 -0000	1.8
+++ snowball.cpp	20 Dec 2004 21:24:27 -0000	1.9
@@ -76,3 +76,4 @@
   return CONTINUE;
 }
 
+IMPLEMENT_FACTORY(SnowBall, "snowball")

Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/badguy.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- badguy.h	28 Nov 2004 14:56:50 -0000	1.4
+++ badguy.h	20 Dec 2004 21:24:25 -0000	1.5
@@ -11,6 +11,7 @@
 #include "serializable.h"
 #include "resources.h"
 #include "sector.h"
+#include "object_factory.h"
 #include "lisp/parser.h"
 #include "lisp/lisp.h"
 #include "lisp/writer.h"

Index: dispenser.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dispenser.cpp	2 Dec 2004 00:25:27 -0000	1.10
+++ dispenser.cpp	20 Dec 2004 21:24:27 -0000	1.11
@@ -92,3 +92,4 @@
   }
 }
 
+IMPLEMENT_FACTORY(Dispenser, "dispenser")

Index: nolok_01.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- nolok_01.cpp	2 Dec 2004 00:25:27 -0000	1.8
+++ nolok_01.cpp	20 Dec 2004 21:24:27 -0000	1.9
@@ -106,3 +106,4 @@
   return CONTINUE;
 }
 
+IMPLEMENT_FACTORY(Nolok_01, "nolok01")

Index: flame.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/flame.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flame.cpp	28 Nov 2004 14:56:51 -0000	1.2
+++ flame.cpp	20 Dec 2004 21:24:27 -0000	1.3
@@ -42,3 +42,5 @@
 {
 }
 
+IMPLEMENT_FACTORY(Flame, "flame")
+