[Super-tux-commit] supertux/src/trigger door.cpp,1.5,1.6 door.h,1.2,1.3 secretarea_trigger.cpp,1.5,1
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src/trigger door.cpp,1.5,1.6 door.h,1.2,1.3 secretarea_trigger.cpp,1.5,1.6 secretarea_trigger.h,1.5,1.6 sequence_trigger.cpp,1.3,1.4 sequence_trigger.h,1.2,1.3
|
From: Matze B. <mat...@us...> - 2004-11-28 14:57:05
|
Update of /cvsroot/super-tux/supertux/src/trigger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13367/src/trigger Modified Files: door.cpp door.h secretarea_trigger.cpp secretarea_trigger.h sequence_trigger.cpp sequence_trigger.h Log Message: move over rewritten lispreader from tuxkart (with additional fixes), generalized TileManager and Tile classes and use them for the worldmap too Index: door.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/door.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- door.h 25 Nov 2004 11:16:03 -0000 1.2 +++ door.h 28 Nov 2004 14:56:52 -0000 1.3 @@ -30,11 +30,11 @@ class Door : public TriggerBase, public Serializable { public: - Door(LispReader& reader); + Door(const lisp::Lisp& reader); Door(int x, int y, std::string sector, std::string spawnpoint); virtual ~Door(); - virtual void write(LispWriter& writer); + virtual void write(lisp::Writer& writer); virtual void action(float elapsed_time); virtual void draw(DrawingContext& context); Index: door.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/door.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- door.cpp 26 Nov 2004 13:56:32 -0000 1.5 +++ door.cpp 28 Nov 2004 14:56:52 -0000 1.6 @@ -19,25 +19,25 @@ #include <config.h> #include "door.h" -#include "utils/lispreader.h" -#include "utils/lispwriter.h" #include "gameloop.h" #include "resources.h" #include "special/sprite.h" #include "special/sprite_manager.h" #include "video/drawing_context.h" #include "app/globals.h" +#include "lisp/lisp.h" +#include "lisp/writer.h" using namespace SuperTux; -Door::Door(LispReader& reader) +Door::Door(const lisp::Lisp& reader) { - reader.read_float("x", bbox.p1.x); - reader.read_float("y", bbox.p1.y); + reader.get("x", bbox.p1.x); + reader.get("y", bbox.p1.y); bbox.set_size(32, 64); - reader.read_string("sector", target_sector); - reader.read_string("spawnpoint", target_spawnpoint); + reader.get("sector", target_sector); + reader.get("spawnpoint", target_spawnpoint); sprite = sprite_manager->create("door"); } @@ -58,7 +58,7 @@ } void -Door::write(LispWriter& writer) +Door::write(lisp::Writer& writer) { writer.start_list("door"); Index: sequence_trigger.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/sequence_trigger.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sequence_trigger.h 23 Nov 2004 16:47:26 -0000 1.2 +++ sequence_trigger.h 28 Nov 2004 14:56:52 -0000 1.3 @@ -7,11 +7,11 @@ class SequenceTrigger : public TriggerBase, public Serializable { public: - SequenceTrigger(LispReader& reader); + SequenceTrigger(const lisp::Lisp& reader); SequenceTrigger(const Vector& pos, const std::string& sequence); ~SequenceTrigger(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); void event(Player& player, EventType type); private: Index: secretarea_trigger.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/secretarea_trigger.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- secretarea_trigger.h 25 Nov 2004 16:22:05 -0000 1.5 +++ secretarea_trigger.h 28 Nov 2004 14:56:52 -0000 1.6 @@ -11,11 +11,11 @@ class SecretAreaTrigger : public TriggerBase, public Serializable { public: - SecretAreaTrigger(LispReader& reader); + SecretAreaTrigger(const lisp::Lisp& reader); SecretAreaTrigger(const Vector& pos); ~SecretAreaTrigger(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); void event(Player& player, EventType type); void draw(DrawingContext& context); Index: secretarea_trigger.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/secretarea_trigger.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- secretarea_trigger.cpp 25 Nov 2004 16:22:05 -0000 1.5 +++ secretarea_trigger.cpp 28 Nov 2004 14:56:52 -0000 1.6 @@ -1,19 +1,20 @@ #include <config.h> #include "secretarea_trigger.h" -#include "utils/lispwriter.h" #include "gameloop.h" +#include "lisp/lisp.h" +#include "lisp/writer.h" #define MESSAGE_TIME 3.5 //TODO: Count numbers of triggered/total secret areas -SecretAreaTrigger::SecretAreaTrigger(LispReader& reader) +SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader) { - reader.read_float("x", bbox.p1.x); - reader.read_float("y", bbox.p1.y); + reader.get("x", bbox.p1.x); + reader.get("y", bbox.p1.y); bbox.set_size(32, 32); - reader.read_string("message", message); + reader.get("message", message); message_displayed = false; } @@ -30,7 +31,7 @@ } void -SecretAreaTrigger::write(LispWriter& writer) +SecretAreaTrigger::write(lisp::Writer& writer) { writer.start_list("secretarea"); Index: sequence_trigger.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/sequence_trigger.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sequence_trigger.cpp 26 Nov 2004 17:16:14 -0000 1.3 +++ sequence_trigger.cpp 28 Nov 2004 14:56:52 -0000 1.4 @@ -1,13 +1,19 @@ #include <config.h> #include "sequence_trigger.h" -#include "utils/lispwriter.h" #include "gameloop.h" +#include "lisp/lisp.h" +#include "lisp/writer.h" -SequenceTrigger::SequenceTrigger(LispReader& reader) +SequenceTrigger::SequenceTrigger(const lisp::Lisp& reader) { - (void) reader; - // TODO + reader.get("x", bbox.p1.x); + reader.get("y", bbox.p1.y); + float w, h; + reader.get("width", w); + reader.get("height", h); + bbox.set_size(w, h); + reader.get("sequence", sequence_name); } SequenceTrigger::SequenceTrigger(const Vector& pos, const std::string& sequence) @@ -23,7 +29,7 @@ } void -SequenceTrigger::write(LispWriter& writer) +SequenceTrigger::write(lisp::Writer& writer) { writer.start_list("sequencetrigger"); |
