[Super-tux-commit] supertux/src tile_manager.cpp,NONE,1.1 tile_manager.h,NONE,1.1 Makefile.am,1.35,1
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src tile_manager.cpp,NONE,1.1 tile_manager.h,NONE,1.1 Makefile.am,1.35,1.36 background.h,1.8,1.9 badguy.h,1.54,1.55 button.h,1.27,1.28 gameobjs.cpp,1.40,1.41 gameobjs.h,1.27,1.28 high_scores.cpp,1.20,1.21 level.h,1.57,1.58 leveleditor.cpp,1.138,1.139 leveleditor.h,1.13,1.14 menu.h,1.66,1.67 mousecursor.h,1.8,1.9 particlesystem.h,1.9,1.10 player.h,1.73,1.74 scene.h,1.31,1.32 sector.cpp,1.10,1.11 setup.cpp,1.98,1.99 special.h,1.25,1.26 sprite.h,1.13,1.14 supertux.cpp,1.22,1.23 tile.cpp,1.29,1.30 tile.h,1.28,1.29 tilemap.cpp,1.10,1.11 title.cpp,1.96,1.97 worldmap.cpp,1.86,1.87
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9380 Modified Files: Makefile.am background.h badguy.h button.h gameobjs.cpp gameobjs.h high_scores.cpp level.h leveleditor.cpp leveleditor.h menu.h mousecursor.h particlesystem.h player.h scene.h sector.cpp setup.cpp special.h sprite.h supertux.cpp tile.cpp tile.h tilemap.cpp title.cpp worldmap.cpp Added Files: tile_manager.cpp tile_manager.h Log Message: - moved tilemanager into its own class - renamed texture.h to surface.h Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- tile.cpp 14 Jun 2004 22:08:01 -0000 1.29 +++ tile.cpp 14 Jun 2004 22:45:23 -0000 1.30 @@ -21,13 +21,13 @@ #include <cassert> #include <iostream> +#include "globals.h" #include "tile.h" #include "scene.h" +#include "lispreader.h" +#include "vector.h" #include "screen/drawing_context.h" -TileManager* TileManager::instance_ = 0; -std::set<TileGroup>* TileManager::tilegroups_ = 0; - Tile::Tile() : id(-1), attributes(0), data(0), next_tile(0), anim_speed(25) { @@ -115,129 +115,5 @@ return id; } -//--------------------------------------------------------------------------- - -TileManager::TileManager() -{ - std::string filename = datadir + "/images/tilesets/supertux.stgt"; - load_tileset(filename); -} - -TileManager::~TileManager() -{ - for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; - } - - delete tilegroups_; -} - -void TileManager::load_tileset(std::string filename) -{ - if(filename == current_tileset) - return; - - // free old tiles - for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; - } - tiles.clear(); - - lisp_object_t* root_obj = lisp_read_from_file(filename); - - if (!root_obj) - st_abort("Couldn't load file", filename); - - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") == 0) - { - lisp_object_t* cur = lisp_cdr(root_obj); - int tileset_id = 0; - - while(!lisp_nil_p(cur)) - { - lisp_object_t* element = lisp_car(cur); - - if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0) - { - LispReader reader(lisp_cdr(element)); - - Tile* tile = new Tile; - int tile_id = tile->read(reader); - if(tile_id < 0) { - std::cerr - << "Warning: parse error when reading a tile, skipping.\n"; - continue; - } - - tile_id += tileset_id; - - if(tile_id >= int(tiles.size())) - tiles.resize(tile_id+1); - tiles[tile_id] = tile; - } - else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0) - { - LispReader reader(lisp_cdr(element)); - std::string filename; - reader.read_string("file", filename); - filename = datadir + "/images/tilesets/" + filename; - load_tileset(filename); - } - else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0) - { - TileGroup new_; - LispReader reader(lisp_cdr(element)); - reader.read_string("name", new_.name); - reader.read_int_vector("tiles", new_.tiles); - if(!tilegroups_) - tilegroups_ = new std::set<TileGroup>; - tilegroups_->insert(new_).first; - } - else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0) - { - LispReader reader(lisp_cdr(element)); - reader.read_int("id", tileset_id); - tileset_id *= 1000; - } - else - { - std::cerr << "Unknown symbol: " << - lisp_symbol(lisp_car(element)) << "\n"; - } - - cur = lisp_cdr(cur); - } - } - else - { - assert(0); - } - - lisp_free(root_obj); - current_tileset = filename; -} - -void -TileManager::draw_tile(DrawingContext& context, unsigned int c, - const Vector& pos, int layer) -{ - if(c == 0) - return; - - Tile& tile = get(c); - - if(!tile.images.size()) - return; - - if(tile.images.size() > 1) - { - size_t frame - = ((global_frame_counter*25) / tile.anim_speed) % tile.images.size(); - context.draw_surface(tile.images[frame], pos, layer); - } - else if (tile.images.size() == 1) - { - context.draw_surface(tile.images[0], pos, layer); - } -} +/* EOF */ Index: mousecursor.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/mousecursor.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mousecursor.h 9 Jun 2004 05:23:20 -0000 1.8 +++ mousecursor.h 14 Jun 2004 22:45:23 -0000 1.9 @@ -23,7 +23,7 @@ #include <string> #include "timer.h" -#include "screen/texture.h" +#include "screen/surface.h" #define MC_FRAME_PERIOD 800 // in ms Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- sector.cpp 14 Jun 2004 22:08:01 -0000 1.10 +++ sector.cpp 14 Jun 2004 22:45:23 -0000 1.11 @@ -24,6 +24,7 @@ #include <fstream> #include <stdexcept> +#include "globals.h" #include "sector.h" #include "lispreader.h" #include "badguy.h" Index: gameobjs.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- gameobjs.h 14 Jun 2004 22:08:01 -0000 1.27 +++ gameobjs.h 14 Jun 2004 22:45:23 -0000 1.28 @@ -23,7 +23,7 @@ #define SUPERTUX_GAMEOBJS_H #include "type.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "timer.h" #include "scene.h" #include "physic.h" Index: particlesystem.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/particlesystem.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- particlesystem.h 9 Jun 2004 05:23:20 -0000 1.9 +++ particlesystem.h 14 Jun 2004 22:45:23 -0000 1.10 @@ -22,7 +22,7 @@ #include <vector> -#include "screen/texture.h" +#include "screen/surface.h" #include "game_object.h" #include "serializable.h" Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- title.cpp 7 Jun 2004 22:43:24 -0000 1.96 +++ title.cpp 14 Jun 2004 22:45:23 -0000 1.97 @@ -37,7 +37,7 @@ #include "globals.h" #include "title.h" #include "screen/screen.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "high_scores.h" #include "menu.h" #include "timer.h" Index: leveleditor.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- leveleditor.h 3 Jun 2004 11:26:12 -0000 1.13 +++ leveleditor.h 14 Jun 2004 22:45:23 -0000 1.14 @@ -25,7 +25,7 @@ #include "screen/drawing_context.h" #include "game_object.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "level.h" #include "button.h" #include "menu.h" Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.138 retrieving revision 1.139 diff -u -d -r1.138 -r1.139 --- leveleditor.cpp 14 Jun 2004 22:08:01 -0000 1.138 +++ leveleditor.cpp 14 Jun 2004 22:45:23 -0000 1.139 @@ -44,6 +44,7 @@ #include "player.h" #include "scene.h" #include "tile.h" +#include "tile_manager.h" #include "resources.h" #include "background.h" #include "camera.h" Index: background.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- background.h 9 Jun 2004 05:23:20 -0000 1.8 +++ background.h 14 Jun 2004 22:45:23 -0000 1.9 @@ -20,7 +20,7 @@ #ifndef SUPERTUX_BACKGROUND_H #define SUPERTUX_BACKGROUND_H -#include "screen/texture.h" +#include "screen/surface.h" #include "screen/drawing_context.h" #include "game_object.h" #include "lispreader.h" Index: scene.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- scene.h 30 May 2004 01:08:49 -0000 1.31 +++ scene.h 14 Jun 2004 22:45:23 -0000 1.32 @@ -20,7 +20,7 @@ #ifndef SUPERTUX_SCENE_H #define SUPERTUX_SCENE_H -#include "screen/texture.h" +#include "screen/surface.h" #include "timer.h" #define FRAME_RATE 10 // 100 Frames per second (10ms) Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- badguy.h 14 Jun 2004 18:34:25 -0000 1.54 +++ badguy.h 14 Jun 2004 22:45:23 -0000 1.55 @@ -26,7 +26,7 @@ #include "SDL.h" #include "timer.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "physic.h" #include "sprite.h" #include "defines.h" Index: supertux.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- supertux.cpp 9 Jun 2004 05:23:20 -0000 1.22 +++ supertux.cpp 14 Jun 2004 22:45:23 -0000 1.23 @@ -34,8 +34,8 @@ #include "screen/screen.h" #include "worldmap.h" #include "resources.h" -#include "screen/texture.h" -#include "tile.h" +#include "screen/surface.h" +#include "tile_manager.h" #include "gettext.h" int main(int argc, char * argv[]) Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- menu.h 9 Jun 2004 05:23:20 -0000 1.66 +++ menu.h 14 Jun 2004 22:45:23 -0000 1.67 @@ -24,7 +24,7 @@ #include "SDL.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "timer.h" #include "type.h" #include "mousecursor.h" Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- gameobjs.cpp 14 Jun 2004 22:08:01 -0000 1.40 +++ gameobjs.cpp 14 Jun 2004 22:45:23 -0000 1.41 @@ -23,7 +23,9 @@ #include <iostream> #include <cmath> +#include "globals.h" #include "tile.h" +#include "tile_manager.h" #include "gameloop.h" #include "gameobjs.h" #include "sprite_manager.h" Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Makefile.am 7 Jun 2004 19:21:18 -0000 1.35 +++ Makefile.am 14 Jun 2004 22:45:23 -0000 1.36 @@ -11,8 +11,8 @@ screen/font.cpp \ screen/screen.h \ screen/screen.cpp \ -screen/texture.cpp \ -screen/texture.h \ +screen/surface.cpp \ +screen/surface.h \ lispwriter.h \ lispwriter.cpp \ badguy.cpp \ @@ -85,6 +85,8 @@ worldmap.h \ tile.h \ tile.cpp \ +tile_manager.h \ +tile_manager.cpp \ resources.h \ resources.cpp \ gameobjs.h \ Index: tile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- tile.h 14 Jun 2004 22:08:01 -0000 1.28 +++ tile.h 14 Jun 2004 22:45:23 -0000 1.29 @@ -21,16 +21,11 @@ #ifndef TILE_H #define TILE_H -#include <set> -#include <map> #include <vector> +#include "SDL.h" +#include "screen/surface.h" -#include "screen/texture.h" -#include "globals.h" -#include "lispreader.h" -#include "setup.h" -#include "vector.h" - +class Vector; class LispReader; /** @@ -107,54 +102,6 @@ } }; -struct TileGroup -{ - friend bool operator<(const TileGroup& lhs, const TileGroup& rhs) - { return lhs.name < rhs.name; }; - friend bool operator>(const TileGroup& lhs, const TileGroup& rhs) - { return lhs.name > rhs.name; }; - - std::string name; - std::vector<int> tiles; -}; - -class TileManager -{ - private: - TileManager(); - ~TileManager(); - - std::vector<Tile*> tiles; - static TileManager* instance_ ; - static std::set<TileGroup>* tilegroups_; - void load_tileset(std::string filename); - - std::string current_tileset; - - public: - static TileManager* instance() - { return instance_ ? instance_ : instance_ = new TileManager(); } - static void destroy_instance() - { delete instance_; instance_ = 0; } - - void draw_tile(DrawingContext& context, unsigned int id, - const Vector& pos, int layer); - - static std::set<TileGroup>* tilegroups() { if(!instance_) { instance_ = new TileManager(); } return tilegroups_ ? tilegroups_ : tilegroups_ = new std::set<TileGroup>; } - Tile& get(unsigned int id) { - - if(id < tiles.size()) - { - return *tiles[id]; - } - else - { - // Never return 0, but return the 0th tile instead so that - // user code doesn't have to check for NULL pointers all over - // the place - return *tiles[0]; - } - } -}; - #endif + +/* EOF */ Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- player.h 14 Jun 2004 21:39:58 -0000 1.73 +++ player.h 14 Jun 2004 22:45:23 -0000 1.74 @@ -25,7 +25,7 @@ #include "bitmask.h" #include "type.h" #include "timer.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "collision.h" #include "sound.h" #include "moving_object.h" --- NEW FILE: tile_manager.h --- // $Id: tile_manager.h,v 1.1 2004/06/14 22:45:23 grumbel Exp $ // // SuperTux // 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 HEADER_TILE_MANAGER_HXX #define HEADER_TILE_MANAGER_HXX #include <set> #include <vector> #include <string> class Tile; struct TileGroup { friend bool operator<(const TileGroup& lhs, const TileGroup& rhs) { return lhs.name < rhs.name; }; friend bool operator>(const TileGroup& lhs, const TileGroup& rhs) { return lhs.name > rhs.name; }; std::string name; std::vector<int> tiles; }; class TileManager { private: TileManager(); ~TileManager(); std::vector<Tile*> tiles; static TileManager* instance_ ; static std::set<TileGroup>* tilegroups_; void load_tileset(std::string filename); std::string current_tileset; public: static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); } static void destroy_instance() { delete instance_; instance_ = 0; } void draw_tile(DrawingContext& context, unsigned int id, const Vector& pos, int layer); static std::set<TileGroup>* tilegroups() { if(!instance_) { instance_ = new TileManager(); } return tilegroups_ ? tilegroups_ : tilegroups_ = new std::set<TileGroup>; } Tile& get(unsigned int id) { if(id < tiles.size()) { return *tiles[id]; } else { // Never return 0, but return the 0th tile instead so that // user code doesn't have to check for NULL pointers all over // the place return *tiles[0]; } } }; #endif /* EOF */ --- NEW FILE: tile_manager.cpp --- // $Id: tile_manager.cpp,v 1.1 2004/06/14 22:45:23 grumbel Exp $ // // SuperTux // 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. #include <assert.h> #include "screen/drawing_context.h" #include "setup.h" #include "globals.h" #include "lispreader.h" #include "tile.h" #include "tile_manager.h" TileManager* TileManager::instance_ = 0; std::set<TileGroup>* TileManager::tilegroups_ = 0; TileManager::TileManager() { std::string filename = datadir + "/images/tilesets/supertux.stgt"; load_tileset(filename); } TileManager::~TileManager() { for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { delete *i; } delete tilegroups_; } void TileManager::load_tileset(std::string filename) { if(filename == current_tileset) return; // free old tiles for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { delete *i; } tiles.clear(); lisp_object_t* root_obj = lisp_read_from_file(filename); if (!root_obj) st_abort("Couldn't load file", filename); if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") == 0) { lisp_object_t* cur = lisp_cdr(root_obj); int tileset_id = 0; while(!lisp_nil_p(cur)) { lisp_object_t* element = lisp_car(cur); if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0) { LispReader reader(lisp_cdr(element)); Tile* tile = new Tile; int tile_id = tile->read(reader); if(tile_id < 0) { std::cerr << "Warning: parse error when reading a tile, skipping.\n"; continue; } tile_id += tileset_id; if(tile_id >= int(tiles.size())) tiles.resize(tile_id+1); tiles[tile_id] = tile; } else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0) { LispReader reader(lisp_cdr(element)); std::string filename; reader.read_string("file", filename); filename = datadir + "/images/tilesets/" + filename; load_tileset(filename); } else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0) { TileGroup new_; LispReader reader(lisp_cdr(element)); reader.read_string("name", new_.name); reader.read_int_vector("tiles", new_.tiles); if(!tilegroups_) tilegroups_ = new std::set<TileGroup>; tilegroups_->insert(new_).first; } else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0) { LispReader reader(lisp_cdr(element)); reader.read_int("id", tileset_id); tileset_id *= 1000; } else { std::cerr << "Unknown symbol: " << lisp_symbol(lisp_car(element)) << "\n"; } cur = lisp_cdr(cur); } } else { assert(0); } lisp_free(root_obj); current_tileset = filename; } void TileManager::draw_tile(DrawingContext& context, unsigned int c, const Vector& pos, int layer) { if(c == 0) return; Tile& tile = get(c); if(!tile.images.size()) return; if(tile.images.size() > 1) { size_t frame = ((global_frame_counter*25) / tile.anim_speed) % tile.images.size(); context.draw_surface(tile.images[frame], pos, layer); } else if (tile.images.size() == 1) { context.draw_surface(tile.images[0], pos, layer); } } /* EOF */ Index: tilemap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tilemap.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- tilemap.cpp 14 Jun 2004 22:08:01 -0000 1.10 +++ tilemap.cpp 14 Jun 2004 22:45:23 -0000 1.11 @@ -27,6 +27,7 @@ #include "screen/drawing_context.h" #include "level.h" #include "tile.h" +#include "tile_manager.h" #include "globals.h" #include "lispreader.h" #include "lispwriter.h" Index: special.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- special.h 9 Jun 2004 05:23:20 -0000 1.25 +++ special.h 14 Jun 2004 22:45:23 -0000 1.26 @@ -24,7 +24,7 @@ #include "bitmask.h" #include "type.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "collision.h" #include "player.h" #include "physic.h" Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- sprite.h 9 Jun 2004 05:23:20 -0000 1.13 +++ sprite.h 14 Jun 2004 22:45:23 -0000 1.14 @@ -24,7 +24,7 @@ #include <vector> #include "lispreader.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "vector.h" class Sprite Index: high_scores.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- high_scores.cpp 9 Jun 2004 05:23:19 -0000 1.20 +++ high_scores.cpp 14 Jun 2004 22:45:23 -0000 1.21 @@ -28,7 +28,7 @@ #include "menu.h" #include "screen/drawing_context.h" #include "screen/screen.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "setup.h" #include "lispreader.h" Index: button.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/button.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- button.h 9 Jun 2004 05:23:20 -0000 1.27 +++ button.h 14 Jun 2004 22:45:23 -0000 1.28 @@ -23,7 +23,7 @@ #include <vector> -#include "screen/texture.h" +#include "screen/surface.h" #include "timer.h" enum ButtonState { Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- worldmap.cpp 9 Jun 2004 05:23:20 -0000 1.86 +++ worldmap.cpp 14 Jun 2004 22:45:23 -0000 1.87 @@ -24,7 +24,7 @@ #include <unistd.h> #include "globals.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "screen/screen.h" #include "screen/drawing_context.h" #include "lispreader.h" Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- setup.cpp 9 Jun 2004 05:23:19 -0000 1.98 +++ setup.cpp 14 Jun 2004 22:45:23 -0000 1.99 @@ -45,7 +45,7 @@ #include "globals.h" #include "setup.h" #include "screen/screen.h" -#include "screen/texture.h" +#include "screen/surface.h" #include "menu.h" #include "gameloop.h" #include "configfile.h" Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- level.h 9 Jun 2004 05:23:20 -0000 1.57 +++ level.h 14 Jun 2004 22:45:23 -0000 1.58 @@ -24,7 +24,7 @@ #include <map> #include <string> -#include "screen/texture.h" +#include "screen/surface.h" #include "lispreader.h" #include "musicref.h" |
