super-tux-commit

[Matze B. <mat...@us...>]

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

Modified Files:
	secretarea_trigger.cpp secretarea_trigger.h 
Log Message:
fix secretarea and sequencetrigger loading bugs

Index: secretarea_trigger.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/secretarea_trigger.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- secretarea_trigger.h	28 Nov 2004 14:56:52 -0000	1.6
+++ secretarea_trigger.h	1 Dec 2004 23:26:31 -0000	1.7
@@ -12,7 +12,7 @@
 {
 public:
   SecretAreaTrigger(const lisp::Lisp& reader);
-  SecretAreaTrigger(const Vector& pos);
+  SecretAreaTrigger(const Rectangle& area);
   ~SecretAreaTrigger();
  
   void write(lisp::Writer& writer);

Index: secretarea_trigger.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/trigger/secretarea_trigger.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- secretarea_trigger.cpp	28 Nov 2004 14:56:52 -0000	1.6
+++ secretarea_trigger.cpp	1 Dec 2004 23:26:31 -0000	1.7
@@ -12,16 +12,18 @@
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
-  bbox.set_size(32, 32);
+  float w = 32, h = 32;
+  reader.get("width", w);
+  reader.get("height", h);
+  bbox.set_size(w, h);
 
   reader.get("message", message);
   message_displayed = false;
 }
 
-SecretAreaTrigger::SecretAreaTrigger(const Vector& pos)
+SecretAreaTrigger::SecretAreaTrigger(const Rectangle& area)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
+  bbox = area;
   message = "You found a secret area!";
   message_displayed = false;
 }