[Super-tux-commit] supertux/src sector.cpp,1.47,1.48

[Marek M. <wa...@us...>]

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

Modified Files:
	sector.cpp 
Log Message:
added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic).
added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser).
added new test level "noloktest.stl", moved dispenser and secretarea tests to that level.
Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-)
This is the last thing I'll add before fixing all my other stuff. :-)


Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sector.cpp	25 Nov 2004 00:49:33 -0000	1.47
+++ sector.cpp	25 Nov 2004 11:16:02 -0000	1.48
@@ -55,6 +55,7 @@
 #include "badguy/mrbomb.h"
 #include "badguy/dispenser.h"
 #include "badguy/spike.h"
+#include "badguy/nolok_01.h"
 #include "trigger/door.h"
 #include "trigger/sequence_trigger.h"
 #include "trigger/secretarea_trigger.h"
@@ -158,6 +159,8 @@
     return new Dispenser(reader);
   } else if(name == "spike") {
     return new Spike(reader);
+  } else if(name == "nolok_01") {
+    return new Nolok_01(reader);
   }
 #if 0
     else if(badguykind_from_string(name) != BAD_INVALID) {