[Super-tux-commit] supertux/src/trigger door.cpp,1.3,1.4 door.h,1.1,1.2

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

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

Modified Files:
	door.cpp door.h 
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: door.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/door.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- door.cpp	24 Nov 2004 23:10:09 -0000	1.3
+++ door.cpp	25 Nov 2004 11:16:03 -0000	1.4
@@ -42,10 +42,12 @@
   sprite = sprite_manager->create("door");
 }
 
-Door::Door(int x, int y)
+Door::Door(int x, int y, std::string sector, std::string spawnpoint)
 {
   bbox.set_pos(Vector(x, y));
   bbox.set_size(32, 64);
+  target_sector = sector;
+  target_spawnpoint = spawnpoint;
 
   sprite = sprite_manager->create("door");
 }

Index: door.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/door.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- door.h	20 Nov 2004 22:14:40 -0000	1.1
+++ door.h	25 Nov 2004 11:16:03 -0000	1.2
@@ -31,7 +31,7 @@
 {
 public:
   Door(LispReader& reader);
-  Door(int x, int y);
+  Door(int x, int y, std::string sector, std::string spawnpoint);
   virtual ~Door();
 
   virtual void write(LispWriter& writer);