Separated EndSequence logic from GameSession. This will allow for nice hierarchy...

[supertux.git] / src / trigger / sequence_trigger.cpp

diff --git a/src/trigger/sequence_trigger.cpp b/src/trigger/sequence_trigger.cpp
index 28c4b54..5a94419 100644 (file)
--- a/src/trigger/sequence_trigger.cpp
+++ b/src/trigger/sequence_trigger.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,29 +12,30 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 
 #include <config.h>
 
-#include "sequence_trigger.h"
-#include "game_session.h"
-#include "lisp/lisp.h"
-#include "lisp/writer.h"
-#include "object_factory.h"
+#include "sequence_trigger.hpp"
+#include "game_session.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
 
 SequenceTrigger::SequenceTrigger(const lisp::Lisp& reader)
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
-  float w, h;
+  float w = 0, h = 0;
   reader.get("width", w);
   reader.get("height", h);
   bbox.set_size(w, h);
   reader.get("sequence", sequence_name);
+  triggerevent = EVENT_TOUCH;
 }
 
 SequenceTrigger::SequenceTrigger(const Vector& pos, const std::string& sequence)
@@ -64,10 +65,10 @@ SequenceTrigger::write(lisp::Writer& writer)
 }
 
 void
-SequenceTrigger::event(Player& , EventType type)
+SequenceTrigger::event(Player& player, EventType type)
 {
   if(type == triggerevent) {
-    GameSession::current()->start_sequence(sequence_name);
+    player.trigger_sequence(sequence_name);
   }
 }