Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1563/src
Modified Files:
gameloop.cpp sector.cpp
Log Message:
TODO update, fix tux doesn't stop at igloo anymore
Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- sector.cpp 25 Mar 2005 20:39:52 -0000 1.66
+++ sector.cpp 26 Mar 2005 12:31:13 -0000 1.67
@@ -332,7 +332,8 @@
add_object(new Brick(pos, tile->getData()));
solids->change(x, y, 0);
} else if(tile->getAttributes() & Tile::GOAL) {
- add_object(new SequenceTrigger(pos, "endsequence"));
+ std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux";
+ add_object(new SequenceTrigger(pos, sequence));
solids->change(x, y, 0);
}
}
Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- gameloop.cpp 25 Mar 2005 20:39:49 -0000 1.212
+++ gameloop.cpp 26 Mar 2005 12:31:13 -0000 1.213
@@ -814,6 +814,8 @@
if(sequencename == "fireworks") {
currentsector->add_object(new Fireworks());
}
+ } else if(sequencename == "stoptux") {
+ end_sequence = ENDSEQUENCE_WAITING;
} else {
std::cout << "Unknown sequence '" << sequencename << "'.\n";
}
|
