[Super-tux-commit] supertux/src defines.h,1.48,1.49 Makefile.am,1.38,1.39 badguy.cpp,1.111,1.112 bad
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src defines.h,1.48,1.49 Makefile.am,1.38,1.39 badguy.cpp,1.111,1.112 badguy.h,1.60,1.61 camera.h,1.11,1.12 collision.cpp,1.30,1.31 gameloop.cpp,1.158,1.159 intro.cpp,1.30,1.31 leveleditor.cpp,1.143,1.144 player.cpp,1.147,1.148 player.h,1.77,1.78 scene.cpp,1.32,1.33 special.cpp,1.64,1.65 supertux.cpp,1.28,1.29 title.cpp,1.111,1.112
|
From: Tobias G. <to...@us...> - 2004-07-26 18:09:35
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28058/src Modified Files: Makefile.am badguy.cpp badguy.h camera.h collision.cpp gameloop.cpp intro.cpp leveleditor.cpp player.cpp player.h scene.cpp special.cpp supertux.cpp title.cpp Added Files: defines.h Log Message: Moved defines.h out of the library and back to src/. Made Menu independend of global MouseCursor variable. Index: scene.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- scene.cpp 20 Jul 2004 18:04:48 -0000 1.32 +++ scene.cpp 26 Jul 2004 18:09:14 -0000 1.33 @@ -20,7 +20,7 @@ #include <cstdlib> #include "scene.h" -#include "app/defines.h" +#include "defines.h" PlayerStatus player_status; Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- player.h 25 Jul 2004 19:03:36 -0000 1.77 +++ player.h 26 Jul 2004 18:09:13 -0000 1.78 @@ -29,7 +29,7 @@ #include "collision.h" #include "special/moving_object.h" #include "math/physic.h" -#include "app/defines.h" +#include "defines.h" using namespace SuperTux; Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- Makefile.am 20 Jul 2004 18:07:30 -0000 1.38 +++ Makefile.am 26 Jul 2004 18:09:13 -0000 1.39 @@ -5,14 +5,14 @@ supertux_LDADD = $(top_builddir)/lib/libsupertux.la @LIBINTL@ supertux_SOURCES = badguy.cpp badguy.h bitmask.cpp bitmask.h camera.cpp \ - camera.h collision.cpp collision.h door.cpp door.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 \ - 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 + camera.h collision.cpp collision.h door.cpp door.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 \ + 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 # EOF # INCLUDES = -I$(top_srcdir)/lib Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- special.cpp 25 Jul 2004 19:03:36 -0000 1.64 +++ special.cpp 26 Jul 2004 18:09:14 -0000 1.65 @@ -22,7 +22,7 @@ #include "SDL.h" -#include "app/defines.h" +#include "defines.h" #include "special.h" #include "camera.h" #include "gameloop.h" Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.158 retrieving revision 1.159 diff -u -d -r1.158 -r1.159 --- gameloop.cpp 26 Jul 2004 15:48:38 -0000 1.158 +++ gameloop.cpp 26 Jul 2004 18:09:13 -0000 1.159 @@ -36,7 +36,7 @@ #include <ctype.h> #endif -#include "app/defines.h" +#include "defines.h" #include "app/globals.h" #include "gameloop.h" #include "video/screen.h" Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- badguy.h 21 Jul 2004 16:51:53 -0000 1.60 +++ badguy.h 26 Jul 2004 18:09:13 -0000 1.61 @@ -29,7 +29,7 @@ #include "video/surface.h" #include "math/physic.h" #include "special/sprite.h" -#include "app/defines.h" +#include "defines.h" #include "special/moving_object.h" #include "collision.h" #include "serializable.h" --- NEW FILE: defines.h --- // $Id: defines.h,v 1.49 2004/07/26 18:09:13 tobgle Exp $ // // SuperTux // Copyright (C) 2000 Bill Kendrick <bi...@ne...> // Copyright (C) 2004 Tobias Glaesser <tob...@gm...> // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // 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. #ifndef SUPERTUX_DEFINES_H #define SUPERTUX_DEFINES_H 1 #include <config.h> /* Version: */ #ifndef VERSION #define VERSION "0.1.1" #endif enum Direction { LEFT = 0, RIGHT = 1 }; /* Direction (keyboard/joystick) states: */ #define UP 0 #define DOWN 1 /* Dying types: */ /* ---- NO 0 */ enum DyingType { DYING_NOT = 0, DYING_SQUISHED = 1, DYING_FALLING = 2 }; /* Screen-related stuff */ // +1 is needed because when tiles are wrapping around the screen there // are two partial tiles on the screen #define VISIBLE_TILES_X (25 +1) #define VISIBLE_TILES_Y (19 +1) /* Speed constraints: */ #define MAX_WALK_XM 2.3 #define MAX_RUN_XM 3.2 #define MAX_YM 20.0 #define MAX_JUMP_TIME 375 #define MAX_LIVES 99 #define WALK_SPEED 1.0 #define RUN_SPEED 1.5 #define JUMP_SPEED 1.2 /* gameplay related defines */ #define START_LIVES 4 #define MAX_FIRE_BULLETS 2 #define MAX_ICE_BULLETS 1 #define FROZEN_TIME 3000 #define YM_FOR_JUMP 6.0 #define WALK_ACCELERATION_X 0.03 #define RUN_ACCELERATION_X 0.04 #define KILL_BOUNCE_YM 8.0 #define SKID_XM 2.0 #define SKID_TIME 200 /* Size constraints: */ #define X_OFFSCREEN_DISTANCE (screen->w/2) #define Y_OFFSCREEN_DISTANCE (screen->h/2) /* Debugging */ #ifdef DEBUG #define DEBUG_MSG( msg ) { \ printf( msg ); printf("\n"); \ } #else #define DEBUG_MSG( msg ) {} #endif #define UNUSED_ARG(a) do {/* null */} while (&a == 0) #endif /*SUPERTUX_DEFINES_H*/ Index: collision.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- collision.cpp 20 Jul 2004 18:04:47 -0000 1.30 +++ collision.cpp 26 Jul 2004 18:09:13 -0000 1.31 @@ -19,7 +19,7 @@ // 02111-1307, USA. #include <cmath> -#include "app/defines.h" +#include "defines.h" #include "collision.h" #include "bitmask.h" #include "scene.h" Index: intro.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- intro.cpp 26 Jul 2004 15:48:38 -0000 1.30 +++ intro.cpp 26 Jul 2004 18:09:13 -0000 1.31 @@ -19,7 +19,7 @@ #include "intro.h" #include "app/globals.h" -#include "app/defines.h" +#include "defines.h" #include "video/font.h" #include "video/screen.h" #include "resources.h" Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.143 retrieving revision 1.144 diff -u -d -r1.143 -r1.144 --- leveleditor.cpp 25 Jul 2004 19:03:36 -0000 1.143 +++ leveleditor.cpp 26 Jul 2004 18:09:13 -0000 1.144 @@ -34,7 +34,7 @@ #include "leveleditor.h" #include "video/screen.h" -#include "app/defines.h" +#include "defines.h" #include "app/globals.h" #include "app/setup.h" #include "sector.h" Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.147 retrieving revision 1.148 diff -u -d -r1.147 -r1.148 --- player.cpp 25 Jul 2004 19:03:36 -0000 1.147 +++ player.cpp 26 Jul 2004 18:09:13 -0000 1.148 @@ -24,7 +24,7 @@ #include "gameloop.h" #include "app/globals.h" #include "player.h" -#include "app/defines.h" +#include "defines.h" #include "scene.h" #include "tile.h" #include "special/sprite.h" Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- badguy.cpp 25 Jul 2004 19:03:36 -0000 1.111 +++ badguy.cpp 26 Jul 2004 18:09:13 -0000 1.112 @@ -24,7 +24,7 @@ #include <cmath> #include "app/globals.h" -#include "app/defines.h" +#include "defines.h" #include "special/sprite_manager.h" #include "utils/lispwriter.h" #include "badguy.h" Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- title.cpp 26 Jul 2004 15:48:38 -0000 1.111 +++ title.cpp 26 Jul 2004 18:09:14 -0000 1.112 @@ -34,7 +34,7 @@ #include <ctype.h> #endif -#include "app/defines.h" +#include "defines.h" #include "app/globals.h" #include "title.h" #include "video/screen.h" Index: camera.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/camera.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- camera.h 21 Jul 2004 16:51:53 -0000 1.11 +++ camera.h 26 Jul 2004 18:09:13 -0000 1.12 @@ -23,7 +23,7 @@ #include <vector> #include <cassert> -#include "app/defines.h" +#include "defines.h" #include "math/vector.h" #include "special/game_object.h" #include "video/drawing_context.h" Index: supertux.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- supertux.cpp 25 Jul 2004 19:03:36 -0000 1.28 +++ supertux.cpp 26 Jul 2004 18:09:14 -0000 1.29 @@ -24,7 +24,7 @@ #include <exception> #include "utils/exceptions.h" -#include "app/defines.h" +#include "defines.h" #include "app/globals.h" #include "app/setup.h" #include "intro.h" |
