[Super-tux-commit] supertux/src/badguy spike.cpp,NONE,1.1 spike.h,NONE,1.1 badguy.cpp,1.5,1.6 bomb.c
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src/badguy spike.cpp,NONE,1.1 spike.h,NONE,1.1 badguy.cpp,1.5,1.6 bomb.cpp,1.2,1.3 bouncing_snowball.cpp,1.3,1.4 jumpy.cpp,1.2,1.3 mrbomb.cpp,1.4,1.5 mriceblock.cpp,1.2,1.3 snowball.cpp,1.3,1.4 spiky.cpp,1.2,1.3
Update of /cvsroot/super-tux/supertux/src/badguy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7497/src/badguy Modified Files: badguy.cpp bomb.cpp bouncing_snowball.cpp jumpy.cpp mrbomb.cpp mriceblock.cpp snowball.cpp spiky.cpp Added Files: spike.cpp spike.h Log Message: implement spikes as objects and remove automake system Index: bomb.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bomb.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bomb.cpp 23 Nov 2004 16:47:26 -0000 1.2 +++ bomb.cpp 25 Nov 2004 00:49:34 -0000 1.3 @@ -9,7 +9,7 @@ { start_position = pos; bbox.set_pos(pos); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("bomb"); state = 0; timer.start(TICKINGTIME); Index: mrbomb.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/mrbomb.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mrbomb.cpp 24 Nov 2004 18:19:51 -0000 1.4 +++ mrbomb.cpp 25 Nov 2004 00:49:34 -0000 1.5 @@ -9,7 +9,7 @@ { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("mrbomb"); } @@ -17,7 +17,7 @@ { start_position.x = pos_x; start_position.y = pos_y; - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("mrbomb"); } Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/badguy.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- badguy.cpp 24 Nov 2004 23:10:05 -0000 1.5 +++ badguy.cpp 25 Nov 2004 00:49:34 -0000 1.6 @@ -25,9 +25,9 @@ if(state == STATE_INIT || state == STATE_INACTIVE) return; if(state == STATE_FALLING) { - sprite->draw(context, get_pos(), LAYER_OBJECTS, VERTICAL_FLIP); + sprite->draw(context, get_pos(), LAYER_OBJECTS, VERTICAL_FLIP); } else { - sprite->draw(context, get_pos(), LAYER_OBJECTS); + sprite->draw(context, get_pos(), LAYER_OBJECTS); } } Index: mriceblock.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/mriceblock.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mriceblock.cpp 23 Nov 2004 16:47:26 -0000 1.2 +++ mriceblock.cpp 25 Nov 2004 00:49:34 -0000 1.3 @@ -11,7 +11,7 @@ { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("mriceblock"); } Index: snowball.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/snowball.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- snowball.cpp 24 Nov 2004 18:19:51 -0000 1.3 +++ snowball.cpp 25 Nov 2004 00:49:34 -0000 1.4 @@ -8,7 +8,7 @@ { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("snowball"); } @@ -16,7 +16,7 @@ { start_position.x = pos_x; start_position.y = pos_y; - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("snowball"); } Index: jumpy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jumpy.cpp 23 Nov 2004 16:47:26 -0000 1.2 +++ jumpy.cpp 25 Nov 2004 00:49:34 -0000 1.3 @@ -8,7 +8,7 @@ { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("jumpy"); } --- NEW FILE: spike.cpp --- #include "spike.h" Spike::Spike(const Vector& pos, Direction dir) { sprite = sprite_manager->create("spike"); start_position = pos; bbox.set_pos(Vector(0, 0)); bbox.set_size(32, 32); set_direction(dir); } Spike::Spike(LispReader& reader) { sprite = sprite_manager->create("spike"); reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); bbox.set_size(32, 32); int idir = 0; reader.read_int("direction", idir); set_direction((Direction) idir); } void Spike::set_direction(Direction dir) { spikedir = dir; switch(spikedir) { case NORTH: sprite->set_action("north"); break; case SOUTH: sprite->set_action("south"); break; case WEST: sprite->set_action("west"); break; case EAST: sprite->set_action("east"); break; default: break; } } void Spike::write(LispWriter& writer) { writer.start_list("spike"); writer.write_float("x", start_position.x); writer.write_float("y", start_position.y); writer.write_int("direction", spikedir); writer.end_list("spike"); } void Spike::kill_fall() { // you can't kill a spike } void Spike::active_action(float ) { } --- NEW FILE: spike.h --- #ifndef __SPIKE_H__ #define __SPIKE_H__ #include "badguy.h" class Spike : public BadGuy { public: enum Direction { NORTH=0, SOUTH, WEST, EAST }; Spike(const Vector& pos, Direction dir); Spike(LispReader& reader); void active_action(float elapsed_time); void write(LispWriter& writer); void kill_fall(); private: void set_direction(Direction dir); Direction spikedir; }; #endif Index: bouncing_snowball.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bouncing_snowball.cpp 24 Nov 2004 17:33:49 -0000 1.3 +++ bouncing_snowball.cpp 25 Nov 2004 00:49:34 -0000 1.4 @@ -9,7 +9,7 @@ { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("bouncingsnowball"); } @@ -17,7 +17,7 @@ { start_position.x = pos_x; start_position.y = pos_y; - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("bouncingsnowball"); } Index: spiky.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/spiky.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- spiky.cpp 23 Nov 2004 16:47:26 -0000 1.2 +++ spiky.cpp 25 Nov 2004 00:49:34 -0000 1.3 @@ -8,7 +8,7 @@ { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("spiky"); } |
