X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fsequence_trigger.cpp;h=5a94419b8a457bb0b343e4a41f364a8da0b5ba79;hb=764cff772b9eee29259330eeed03462036fa36df;hp=68860ec8b5e191faf38d948fbcaac95647f2a103;hpb=267c14b530f86b58090e6e054a0a775076729061;p=supertux.git diff --git a/src/trigger/sequence_trigger.cpp b/src/trigger/sequence_trigger.cpp index 68860ec8b..5a94419b8 100644 --- a/src/trigger/sequence_trigger.cpp +++ b/src/trigger/sequence_trigger.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,11 +12,11 @@ // 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 @@ -35,6 +35,7 @@ SequenceTrigger::SequenceTrigger(const lisp::Lisp& reader) 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); } }