Update of /cvsroot/super-tux/supertux/src/trigger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22752/src/trigger
Modified Files:
secretarea_trigger.cpp secretarea_trigger.h
Log Message:
Improved collision detection by taking movement into account. Fixed long standing bug where returning from bonuslevel to mainmenu and going back to bonuslevels makes supertux crash
Index: secretarea_trigger.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/secretarea_trigger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- secretarea_trigger.h 23 Nov 2004 23:20:32 -0000 1.2
+++ secretarea_trigger.h 24 Nov 2004 03:42:58 -0000 1.3
@@ -14,7 +14,7 @@
{
public:
SecretAreaTrigger(LispReader& reader);
- SecretAreaTrigger(const Vector& pos, const std::string& sequence);
+ SecretAreaTrigger(const Vector& pos);
~SecretAreaTrigger();
void write(LispWriter& writer);
Index: secretarea_trigger.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/secretarea_trigger.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- secretarea_trigger.cpp 23 Nov 2004 23:20:31 -0000 1.2
+++ secretarea_trigger.cpp 24 Nov 2004 03:42:58 -0000 1.3
@@ -13,8 +13,7 @@
reader.read_string("message", message);
}
-SecretAreaTrigger::SecretAreaTrigger(const Vector& pos,
- const std::string& secretarea)
+SecretAreaTrigger::SecretAreaTrigger(const Vector& pos)
{
bbox.set_pos(pos);
bbox.set_size(32, 32);
|