Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7595/src
Modified Files:
sector.cpp
Log Message:
patch contributed by markos_64:
-adds invisible tile (permanent, cannot be bumped)
-add spiky to sector.cpp (which someone apparantly forgot to do)
-fixed fireballs appearing behind tux
added an invisible tile to simple.stl, for testing
Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- sector.cpp 26 Nov 2004 17:16:14 -0000 1.53
+++ sector.cpp 27 Nov 2004 14:14:29 -0000 1.54
@@ -45,6 +45,7 @@
#include "object/coin.h"
#include "object/block.h"
#include "object/invisible_block.h"
+#include "object/invisible_tile.h"
#include "object/platform.h"
#include "object/bullet.h"
#include "badguy/jumpy.h"
@@ -55,6 +56,7 @@
#include "badguy/mrbomb.h"
#include "badguy/dispenser.h"
#include "badguy/spike.h"
+#include "badguy/spiky.h"
#include "badguy/nolok_01.h"
#include "trigger/door.h"
#include "trigger/sequence_trigger.h"
@@ -130,6 +132,8 @@
return new Dispenser(reader);
} else if(name == "spike") {
return new Spike(reader);
+ } else if(name == "spiky") {
+ return new Spiky(reader);
} else if(name == "nolok_01") {
return new Nolok_01(reader);
}
@@ -334,6 +338,9 @@
if(tile->getID() == 112) {
add_object(new InvisibleBlock(pos));
solids->change(x, y, 0);
+ } else if(tile->getID() == 1311) {
+ add_object(new InvisibleTile(pos));
+ solids->change(x, y, 0);
} else if(tile->getID() == 295) {
add_object(new Spike(pos, Spike::NORTH));
solids->change(x, y, 0);
|
