[Super-tux-commit] supertux/src/badguy badguy.h,1.3,1.4 bomb.cpp,1.3,1.4 bomb.h,1.1,1.2 bouncing_sno
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src/badguy badguy.h,1.3,1.4 bomb.cpp,1.3,1.4 bomb.h,1.1,1.2 bouncing_snowball.cpp,1.5,1.6 bouncing_snowball.h,1.3,1.4 dispenser.cpp,1.8,1.9 dispenser.h,1.3,1.4 flame.cpp,1.1,1.2 flame.h,1.1,1.2 jumpy.cpp,1.3,1.4 jumpy.h,1.1,1.2 mrbomb.cpp,1.6,1.7 mrbomb.h,1.3,1.4 mriceblock.cpp,1.4,1.5 mriceblock.h,1.2,1.3 nolok_01.cpp,1.6,1.7 nolok_01.h,1.4,1.5 snowball.cpp,1.5,1.6 snowball.h,1.3,1.4 spike.cpp,1.1,1.2 spike.h,1.1,1.2 spiky.cpp,1.3,1.4 spiky.h,1.1,1.2
Update of /cvsroot/super-tux/supertux/src/badguy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13367/src/badguy Modified Files: badguy.h bomb.cpp bomb.h bouncing_snowball.cpp bouncing_snowball.h dispenser.cpp dispenser.h flame.cpp flame.h jumpy.cpp jumpy.h mrbomb.cpp mrbomb.h mriceblock.cpp mriceblock.h nolok_01.cpp nolok_01.h snowball.cpp snowball.h spike.cpp spike.h spiky.cpp spiky.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: snowball.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/snowball.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- snowball.h 25 Nov 2004 16:22:05 -0000 1.3 +++ snowball.h 28 Nov 2004 14:56:51 -0000 1.4 @@ -6,11 +6,11 @@ class SnowBall : public BadGuy { public: - SnowBall(LispReader& reader); + SnowBall(const lisp::Lisp& reader); SnowBall(float pos_x, float pos_y, Direction d); void activate(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); protected: Index: spiky.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/spiky.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- spiky.h 20 Nov 2004 22:14:40 -0000 1.1 +++ spiky.h 28 Nov 2004 14:56:51 -0000 1.2 @@ -6,10 +6,10 @@ class Spiky : public BadGuy { public: - Spiky(LispReader& reader); + Spiky(const lisp::Lisp& reader); void activate(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); }; Index: mriceblock.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/mriceblock.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mriceblock.cpp 25 Nov 2004 16:22:05 -0000 1.4 +++ mriceblock.cpp 28 Nov 2004 14:56:51 -0000 1.5 @@ -6,11 +6,11 @@ static const float KICKSPEED = 500; static const int MAXSQUISHES = 10; -MrIceBlock::MrIceBlock(LispReader& reader) +MrIceBlock::MrIceBlock(const lisp::Lisp& reader) : ice_state(ICESTATE_NORMAL), squishcount(0) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("mriceblock"); set_direction = false; @@ -28,7 +28,7 @@ } void -MrIceBlock::write(LispWriter& writer) +MrIceBlock::write(lisp::Writer& writer) { writer.start_list("mriceblock"); Index: spike.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/spike.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- spike.h 25 Nov 2004 00:49:34 -0000 1.1 +++ spike.h 28 Nov 2004 14:56:51 -0000 1.2 @@ -10,10 +10,10 @@ NORTH=0, SOUTH, WEST, EAST }; Spike(const Vector& pos, Direction dir); - Spike(LispReader& reader); + Spike(const lisp::Lisp& reader); void active_action(float elapsed_time); - void write(LispWriter& writer); + void write(lisp::Writer& writer); void kill_fall(); private: void set_direction(Direction dir); Index: spike.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/spike.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- spike.cpp 25 Nov 2004 00:49:34 -0000 1.1 +++ spike.cpp 28 Nov 2004 14:56:51 -0000 1.2 @@ -9,14 +9,14 @@ set_direction(dir); } -Spike::Spike(LispReader& reader) +Spike::Spike(const lisp::Lisp& reader) { sprite = sprite_manager->create("spike"); - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(32, 32); int idir = 0; - reader.read_int("direction", idir); + reader.get("direction", idir); set_direction((Direction) idir); } @@ -43,7 +43,7 @@ } void -Spike::write(LispWriter& writer) +Spike::write(lisp::Writer& writer) { writer.start_list("spike"); writer.write_float("x", start_position.x); Index: jumpy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- jumpy.h 20 Nov 2004 22:14:39 -0000 1.1 +++ jumpy.h 28 Nov 2004 14:56:51 -0000 1.2 @@ -2,19 +2,16 @@ #define __JUMPY_H__ #include "badguy.h" -#include "utils/lispreader.h" -#include "utils/lispwriter.h" -#include "serializable.h" class Jumpy : public BadGuy { public: - Jumpy(LispReader& reader); + Jumpy(const lisp::Lisp& reader); virtual HitResponse collision_solid(GameObject& other, const CollisionHit& hit); - virtual void write(LispWriter& writer); + virtual void write(lisp::Writer& writer); }; #endif Index: bouncing_snowball.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- bouncing_snowball.cpp 25 Nov 2004 11:16:03 -0000 1.5 +++ bouncing_snowball.cpp 28 Nov 2004 14:56:50 -0000 1.6 @@ -5,10 +5,10 @@ static const float JUMPSPEED = 450; static const float WALKSPEED = 80; -BouncingSnowball::BouncingSnowball(LispReader& reader) +BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("bouncingsnowball"); set_direction = false; @@ -25,7 +25,7 @@ } void -BouncingSnowball::write(LispWriter& writer) +BouncingSnowball::write(lisp::Writer& writer) { writer.start_list("bouncingsnowball"); Index: mriceblock.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/mriceblock.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mriceblock.h 25 Nov 2004 16:22:05 -0000 1.2 +++ mriceblock.h 28 Nov 2004 14:56:51 -0000 1.3 @@ -6,11 +6,11 @@ class MrIceBlock : public BadGuy { public: - MrIceBlock(LispReader& reader); + MrIceBlock(const lisp::Lisp& reader); MrIceBlock(float pos_x, float pos_y, Direction d); void activate(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); void active_action(float elapsed_time); Index: nolok_01.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- nolok_01.h 25 Nov 2004 16:22:05 -0000 1.4 +++ nolok_01.h 28 Nov 2004 14:56:51 -0000 1.5 @@ -7,11 +7,11 @@ class Nolok_01 : public BadGuy { public: - Nolok_01(LispReader& reader); + Nolok_01(const lisp::Lisp& reader); Nolok_01(float pos_x, float pos_y); void activate(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); void active_action(float elapsed_time); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); Index: dispenser.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dispenser.h 24 Nov 2004 18:19:51 -0000 1.3 +++ dispenser.h 28 Nov 2004 14:56:50 -0000 1.4 @@ -7,10 +7,10 @@ class Dispenser : public BadGuy { public: - Dispenser(LispReader& reader); + Dispenser(const lisp::Lisp& reader); void activate(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); void active_action(float elapsed_time); Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/badguy.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- badguy.h 26 Nov 2004 14:45:41 -0000 1.3 +++ badguy.h 28 Nov 2004 14:56:50 -0000 1.4 @@ -11,8 +11,9 @@ #include "serializable.h" #include "resources.h" #include "sector.h" -#include "utils/lispwriter.h" -#include "utils/lispreader.h" +#include "lisp/parser.h" +#include "lisp/lisp.h" +#include "lisp/writer.h" #include "video/drawing_context.h" #include "special/sprite_manager.h" Index: snowball.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/snowball.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- snowball.cpp 25 Nov 2004 16:22:05 -0000 1.5 +++ snowball.cpp 28 Nov 2004 14:56:51 -0000 1.6 @@ -4,10 +4,10 @@ static const float WALKSPEED = 80; -SnowBall::SnowBall(LispReader& reader) +SnowBall::SnowBall(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("snowball"); set_direction = false; @@ -24,7 +24,7 @@ } void -SnowBall::write(LispWriter& writer) +SnowBall::write(lisp::Writer& writer) { writer.start_list("snowball"); Index: flame.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/flame.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- flame.h 20 Nov 2004 22:14:39 -0000 1.1 +++ flame.h 28 Nov 2004 14:56:51 -0000 1.2 @@ -6,9 +6,9 @@ class Flame : public BadGuy { public: - Flame(LispReader& reader); + Flame(const lisp::Lisp& reader); - void write(LispWriter& write); + void write(lisp::Writer& write); void active_action(float elapsed_time); void kill_fall(); Index: bomb.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bomb.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bomb.cpp 25 Nov 2004 00:49:34 -0000 1.3 +++ bomb.cpp 28 Nov 2004 14:56:50 -0000 1.4 @@ -18,7 +18,7 @@ } void -Bomb::write(LispWriter& ) +Bomb::write(lisp::Writer& ) { // bombs are only temporarily so don't write them out... } Index: flame.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/flame.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- flame.cpp 20 Nov 2004 22:14:39 -0000 1.1 +++ flame.cpp 28 Nov 2004 14:56:51 -0000 1.2 @@ -2,13 +2,13 @@ #include "flame.h" -Flame::Flame(LispReader& reader) +Flame::Flame(const lisp::Lisp& reader) : angle(0), radius(100), speed(2) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); - reader.read_float("radius", radius); - reader.read_float("speed", speed); + reader.get("x", start_position.x); + reader.get("y", start_position.y); + reader.get("radius", radius); + reader.get("speed", speed); bbox.set_pos(Vector(start_position.x + cos(angle) * radius, start_position.y + sin(angle) * radius)); bbox.set_size(32, 32); @@ -16,7 +16,7 @@ } void -Flame::write(LispWriter& writer) +Flame::write(lisp::Writer& writer) { writer.start_list("flame"); Index: dispenser.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- dispenser.cpp 25 Nov 2004 16:38:31 -0000 1.8 +++ dispenser.cpp 28 Nov 2004 14:56:50 -0000 1.9 @@ -6,20 +6,19 @@ #include "badguy/mrbomb.h" #include "badguy/mriceblock.h" - -Dispenser::Dispenser(LispReader& reader) +Dispenser::Dispenser(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); - reader.read_float("cycle", cycle); - reader.read_string("badguy", badguy); + reader.get("x", start_position.x); + reader.get("y", start_position.y); + reader.get("cycle", cycle); + reader.get("badguy", badguy); bbox.set_size(32, 32); sprite = sprite_manager->create("dispenser"); sprite->set_action("working"); } void -Dispenser::write(LispWriter& writer) +Dispenser::write(lisp::Writer& writer) { writer.start_list("dispenser"); Index: bomb.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bomb.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- bomb.h 20 Nov 2004 22:14:39 -0000 1.1 +++ bomb.h 28 Nov 2004 14:56:50 -0000 1.2 @@ -8,7 +8,7 @@ public: Bomb(const Vector& pos, Direction dir); - void write(LispWriter& writer); + void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); HitResponse collision_player(Player& player, const CollisionHit& hit); void active_action(float elapsed_time); Index: bouncing_snowball.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bouncing_snowball.h 25 Nov 2004 11:16:03 -0000 1.3 +++ bouncing_snowball.h 28 Nov 2004 14:56:50 -0000 1.4 @@ -6,11 +6,11 @@ class BouncingSnowball : public BadGuy { public: - BouncingSnowball(LispReader& reader); + BouncingSnowball(const lisp::Lisp& reader); BouncingSnowball(float pos_x, float pos_y, Direction d); void activate(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); protected: Index: jumpy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- jumpy.cpp 25 Nov 2004 00:49:34 -0000 1.3 +++ jumpy.cpp 28 Nov 2004 14:56:51 -0000 1.4 @@ -4,16 +4,16 @@ static const float JUMPSPEED=600; -Jumpy::Jumpy(LispReader& reader) +Jumpy::Jumpy(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("jumpy"); } void -Jumpy::write(LispWriter& writer) +Jumpy::write(lisp::Writer& writer) { writer.start_list("jumpy"); Index: spiky.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/spiky.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- spiky.cpp 25 Nov 2004 00:49:34 -0000 1.3 +++ spiky.cpp 28 Nov 2004 14:56:51 -0000 1.4 @@ -4,16 +4,16 @@ static const float WALKSPEED = 80; -Spiky::Spiky(LispReader& reader) +Spiky::Spiky(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("spiky"); } void -Spiky::write(LispWriter& writer) +Spiky::write(lisp::Writer& writer) { writer.start_list("spiky"); Index: mrbomb.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/mrbomb.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mrbomb.cpp 25 Nov 2004 16:22:05 -0000 1.6 +++ mrbomb.cpp 28 Nov 2004 14:56:51 -0000 1.7 @@ -5,10 +5,10 @@ static const float WALKSPEED = 80; -MrBomb::MrBomb(LispReader& reader) +MrBomb::MrBomb(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("mrbomb"); set_direction = false; @@ -25,7 +25,7 @@ } void -MrBomb::write(LispWriter& writer) +MrBomb::write(lisp::Writer& writer) { writer.start_list("mrbomb"); Index: mrbomb.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/mrbomb.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mrbomb.h 25 Nov 2004 16:22:05 -0000 1.3 +++ mrbomb.h 28 Nov 2004 14:56:51 -0000 1.4 @@ -6,11 +6,11 @@ class MrBomb : public BadGuy { public: - MrBomb(LispReader& reader); + MrBomb(const lisp::Lisp& reader); MrBomb(float pos_x, float pos_y, Direction d); void activate(); - void write(LispWriter& writer); + void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); protected: Index: nolok_01.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- nolok_01.cpp 26 Nov 2004 17:08:53 -0000 1.6 +++ nolok_01.cpp 28 Nov 2004 14:56:51 -0000 1.7 @@ -12,10 +12,10 @@ //TODO: Create sprite, give multiple hitpoints, limit max number of snowballs // Stop actions when pause button is hit (probably a general problem of timers) -Nolok_01::Nolok_01(LispReader& reader) +Nolok_01::Nolok_01(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); + reader.get("x", start_position.x); + reader.get("y", start_position.y); bbox.set_size(31.8, 63.8); sprite = sprite_manager->create("dummyguy"); } @@ -29,7 +29,7 @@ } void -Nolok_01::write(LispWriter& writer) +Nolok_01::write(lisp::Writer& writer) { writer.start_list("nolok01"); |
