[Super-tux-commit] supertux/src Makefile.am,1.44,1.45 collision.cpp,1.32,1.33 gameloop.cpp,1.194,1.1
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src Makefile.am,1.44,1.45 collision.cpp,1.32,1.33 gameloop.cpp,1.194,1.195 leveleditor.cpp,1.166,1.167 player.h,1.92,1.93 resources.cpp,1.55,1.56 sector.cpp,1.37,1.38 sector.h,1.21,1.22 worldmap.cpp,1.130,1.131 badguy.cpp,1.135,NONE badguy.h,1.64,NONE bitmask.cpp,1.4,NONE bitmask.h,1.4,NONE
|
From: Matze B. <mat...@us...> - 2004-11-20 22:38:58
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11994/src Modified Files: Makefile.am collision.cpp gameloop.cpp leveleditor.cpp player.h resources.cpp sector.cpp sector.h worldmap.cpp Removed Files: badguy.cpp badguy.h bitmask.cpp bitmask.h Log Message: forgot to update makefiles Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- player.h 20 Nov 2004 22:14:38 -0000 1.92 +++ player.h 20 Nov 2004 22:38:35 -0000 1.93 @@ -21,7 +21,6 @@ #include "SDL.h" -#include "bitmask.h" #include "timer.h" #include "video/surface.h" #include "collision.h" Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- sector.cpp 20 Nov 2004 22:14:39 -0000 1.37 +++ sector.cpp 20 Nov 2004 22:38:35 -0000 1.38 @@ -29,7 +29,6 @@ #include "app/globals.h" #include "sector.h" #include "utils/lispreader.h" -#include "badguy.h" #include "gameobjs.h" #include "camera.h" #include "background.h" Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- worldmap.cpp 20 Nov 2004 22:14:39 -0000 1.130 +++ worldmap.cpp 20 Nov 2004 22:38:35 -0000 1.131 @@ -40,6 +40,7 @@ #include "resources.h" #include "app/gettext.h" #include "misc.h" +#include "scene.h" #define map_message_TIME 2.8 Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.194 retrieving revision 1.195 diff -u -d -r1.194 -r1.195 --- gameloop.cpp 20 Nov 2004 22:14:38 -0000 1.194 +++ gameloop.cpp 20 Nov 2004 22:38:35 -0000 1.195 @@ -46,7 +46,6 @@ #include "app/setup.h" #include "high_scores.h" #include "gui/menu.h" -#include "badguy.h" #include "sector.h" #include "player.h" #include "level.h" --- badguy.cpp DELETED --- --- bitmask.h DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- Makefile.am 20 Nov 2004 22:14:37 -0000 1.44 +++ Makefile.am 20 Nov 2004 22:38:35 -0000 1.45 @@ -5,12 +5,13 @@ supertux_LDADD = $(top_builddir)/lib/libsupertux.la @LIBINTL@ -supertux_SOURCES = badguy.cpp badguy.h bitmask.cpp bitmask.h camera.cpp \ +supertux_SOURCES = camera.cpp \ camera.h collision.cpp collision.h intro.cpp intro.h \ - gameloop.cpp gameloop.h high_scores.cpp high_scores.h interactive_object.cpp \ - interactive_object.h level.cpp level.h level_subset.cpp level_subset.h leveleditor.cpp \ - leveleditor.h particlesystem.cpp particlesystem.h player.cpp player.h scene.cpp \ - scene.h special.cpp special.h supertux.cpp title.cpp title.h worldmap.cpp \ + gameloop.cpp gameloop.h high_scores.cpp high_scores.h \ + level.cpp level.h level_subset.cpp level_subset.h \ + leveleditor.cpp leveleditor.h particlesystem.cpp \ + particlesystem.h player.cpp player.h scene.cpp \ + scene.h supertux.cpp title.cpp title.h worldmap.cpp \ worldmap.h tile.h tile.cpp tile_manager.h tile_manager.cpp resources.h \ resources.cpp gameobjs.h gameobjs.cpp background.h background.cpp tilemap.h \ tilemap.cpp serializable.h sector.cpp sector.h misc.h misc.cpp defines.h \ @@ -19,10 +20,24 @@ object/coin.h object/coin.cpp \ object/block.h object/block.cpp \ object/platform.h object/platform.cpp \ - object/door.h object/door.cpp \ object/fireworks.h object/fireworks.cpp \ - object/bullet.h object/bullet.cpp + object/bullet.h object/bullet.cpp \ + object/specialriser.h object/specialriser.cpp \ + object/star.h object/star.cpp \ + object/oneup.h object/oneup.cpp \ + object/flower.h object/flower.cpp \ + object/growup.h object/growup.cpp \ + badguy/badguy.h badguy/badguy.cpp \ + badguy/bomb.h badguy/bomb.cpp \ + badguy/bouncing_snowball.h badguy/bouncing_snowball.cpp\ + badguy/flame.h badguy/flame.cpp \ + badguy/jumpy.h badguy/jumpy.cpp \ + badguy/mrbomb.h badguy/mrbomb.cpp \ + badguy/mriceblock.h badguy/mriceblock.cpp \ + badguy/snowball.h badguy/snowball.cpp \ + badguy/spiky.h badguy/spiky.cpp \ + trigger/trigger_base.h trigger/trigger_base.cpp \ + trigger/door.h trigger/door.cpp \ + trigger/sequence_trigger.h trigger/sequence_trigger.cpp -# EOF # INCLUDES = -I$(top_srcdir)/lib -noinst_HEADERS = misc.h Index: sector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- sector.h 20 Nov 2004 22:14:39 -0000 1.21 +++ sector.h 20 Nov 2004 22:38:35 -0000 1.22 @@ -24,16 +24,18 @@ #include <vector> #include "math/vector.h" -#include "badguy.h" #include "audio/musicref.h" #include "video/drawing_context.h" +#include "defines.h" using namespace SuperTux; namespace SuperTux { class GameObject; class LispReader; +class LispWriter; class Sprite; +class Rectangle; } class InteractiveObject; Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.166 retrieving revision 1.167 diff -u -d -r1.166 -r1.167 --- leveleditor.cpp 20 Nov 2004 22:14:38 -0000 1.166 +++ leveleditor.cpp 20 Nov 2004 22:38:35 -0000 1.167 @@ -36,7 +36,6 @@ #include "sector.h" #include "background.h" #include "gameloop.h" -#include "badguy.h" #include "gameobjs.h" #include "camera.h" --- badguy.h DELETED --- Index: collision.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- collision.cpp 20 Nov 2004 22:14:38 -0000 1.32 +++ collision.cpp 20 Nov 2004 22:38:35 -0000 1.33 @@ -23,7 +23,6 @@ #include <cmath> #include "defines.h" #include "collision.h" -#include "bitmask.h" #include "scene.h" #include "sector.h" #include "tilemap.h" --- bitmask.cpp DELETED --- Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- resources.cpp 20 Nov 2004 22:14:38 -0000 1.55 +++ resources.cpp 20 Nov 2004 22:38:35 -0000 1.56 @@ -26,10 +26,8 @@ #include "gui/button.h" #include "scene.h" #include "player.h" -#include "badguy.h" #include "gameobjs.h" #include "resources.h" -#include "badguy_specs.h" Surface* img_waves[3]; Surface* img_water; @@ -157,9 +155,6 @@ ice_tux->arms = sprite_manager->create("big-tux-arms"); ice_tux->feet = sprite_manager->create("big-tux-feet"); - /* Load Bad Guys resources */ - badguyspecs_manager = new BadGuySpecsManager(datadir + "/badguys.strf"); - /* Water: */ img_water = new Surface(datadir + "/images/shared/water.png", false); |
