diff --git a/src/Makefile.am b/src/Makefile.am index 8ca8940d1..bc62387a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -91,6 +91,8 @@ supertuxkart_SOURCES = \ graphics/skid_marks.hpp \ graphics/smoke.cpp \ graphics/smoke.hpp \ + io/file_manager.cpp \ + io/file_manager.hpp \ io/xml_node.cpp \ io/xml_node.hpp \ io/xml_reader.cpp \ @@ -150,8 +152,6 @@ supertuxkart_SOURCES = \ highscores.hpp \ highscore_manager.cpp \ highscore_manager.hpp \ - file_manager.cpp \ - file_manager.hpp \ loader.cpp \ loader.hpp \ race_manager.cpp \ diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp index a54ee63d9..dde667927 100644 --- a/src/audio/sfx_manager.cpp +++ b/src/audio/sfx_manager.cpp @@ -31,10 +31,10 @@ # include #endif -#include "audio/sfx_openal.hpp" -#include "user_config.hpp" -#include "file_manager.hpp" #include "race_manager.hpp" +#include "user_config.hpp" +#include "audio/sfx_openal.hpp" +#include "io/file_manager.hpp" SFXManager* sfx_manager= NULL; diff --git a/src/audio/sfx_openal.cpp b/src/audio/sfx_openal.cpp index 7f745ac70..c4a4fdeaa 100644 --- a/src/audio/sfx_openal.cpp +++ b/src/audio/sfx_openal.cpp @@ -34,8 +34,8 @@ #include #include -#include "file_manager.hpp" #include "user_config.hpp" +#include "io/file_manager.hpp" SFXOpenAL::SFXOpenAL(ALuint buffer, bool positional, float rolloff, float gain) : SFXBase() { diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp index a7d0dcdc4..89e7851ca 100644 --- a/src/audio/sound_manager.cpp +++ b/src/audio/sound_manager.cpp @@ -31,9 +31,9 @@ #endif #include "user_config.hpp" -#include "file_manager.hpp" #include "audio/music_ogg.hpp" #include "audio/sfx_openal.hpp" +#include "io/file_manager.hpp" #include "utils/string_utils.hpp" SoundManager* sound_manager= NULL; diff --git a/src/challenges/unlock_manager.cpp b/src/challenges/unlock_manager.cpp index 1da50d15a..d35c86534 100644 --- a/src/challenges/unlock_manager.cpp +++ b/src/challenges/unlock_manager.cpp @@ -24,9 +24,9 @@ #include #include "race_manager.hpp" -#include "file_manager.hpp" #include "user_config.hpp" #include "challenges/challenge_data.hpp" +#include "io/file_manager.hpp" #include "utils/string_utils.hpp" UnlockManager* unlock_manager=0; diff --git a/src/grand_prix_data.cpp b/src/grand_prix_data.cpp index a84d03a91..742ac52fd 100644 --- a/src/grand_prix_data.cpp +++ b/src/grand_prix_data.cpp @@ -20,8 +20,8 @@ #include #include -#include "file_manager.hpp" #include "grand_prix_data.hpp" +#include "io/file_manager.hpp" #include "lisp/parser.hpp" #include "lisp/lisp.hpp" #include "tracks/track_manager.hpp" diff --git a/src/grand_prix_manager.cpp b/src/grand_prix_manager.cpp index 1d5041d67..e4e816771 100644 --- a/src/grand_prix_manager.cpp +++ b/src/grand_prix_manager.cpp @@ -21,7 +21,7 @@ #include -#include "file_manager.hpp" +#include "io/file_manager.hpp" #include "utils/string_utils.hpp" GrandPrixManager *grand_prix_manager = NULL; diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index e4675d298..aac795427 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -22,7 +22,7 @@ using namespace core; #include "user_config.hpp" -#include "file_manager.hpp" +#include "io/file_manager.hpp" IrrDriver *irr_driver = NULL; diff --git a/src/gui/credits_menu.cpp b/src/gui/credits_menu.cpp index b81502164..7503f546f 100644 --- a/src/gui/credits_menu.cpp +++ b/src/gui/credits_menu.cpp @@ -17,18 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "credits_menu.hpp" +#include "gui/credits_menu.hpp" #include #include #include -#if defined(WIN32) && !defined(__CYGWIN__) -# define strdup _strdup -#endif -#include "file_manager.hpp" #include "gui/menu_manager.hpp" #include "gui/widget_manager.hpp" +#include "io/file_manager.hpp" #include "utils/translation.hpp" enum WidgetTokens diff --git a/src/gui/font.cpp b/src/gui/font.cpp index eaa7de9bd..4a0ecc62e 100644 --- a/src/gui/font.cpp +++ b/src/gui/font.cpp @@ -19,9 +19,9 @@ #include -#include "file_manager.hpp" #include "user_config.hpp" #include "gui/font.hpp" +#include "io/file_manager.hpp" #include "utils/string_utils.hpp" Font* font_gui; diff --git a/src/highscore_manager.cpp b/src/highscore_manager.cpp index 51054a02b..55b614565 100644 --- a/src/highscore_manager.cpp +++ b/src/highscore_manager.cpp @@ -23,8 +23,8 @@ #include #include "race_manager.hpp" -#include "file_manager.hpp" #include "user_config.hpp" +#include "io/file_manager.hpp" #include "lisp/parser.hpp" #include "lisp/writer.hpp" #include "utils/string_utils.hpp" diff --git a/src/ide/vc9/supertuxkart.sln b/src/ide/vc9/supertuxkart.sln index aad396929..ee939a19e 100644 --- a/src/ide/vc9/supertuxkart.sln +++ b/src/ide/vc9/supertuxkart.sln @@ -13,27 +13,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enet", "enet.vcproj", "{B0E EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - irrlicht-debug|Win32 = irrlicht-debug|Win32 + debug|Win32 = debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Debug|Win32.Build.0 = Debug|Win32 - {B1BC2764-1A43-4800-A654-788B0D05EDA2}.irrlicht-debug|Win32.ActiveCfg = irrlicht-debug|Win32 - {B1BC2764-1A43-4800-A654-788B0D05EDA2}.irrlicht-debug|Win32.Build.0 = irrlicht-debug|Win32 + {B1BC2764-1A43-4800-A654-788B0D05EDA2}.debug|Win32.ActiveCfg = Debug|Win32 + {B1BC2764-1A43-4800-A654-788B0D05EDA2}.debug|Win32.Build.0 = Debug|Win32 {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Release|Win32.ActiveCfg = Release|Win32 {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Release|Win32.Build.0 = Release|Win32 - {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Debug|Win32.ActiveCfg = Debug|Win32 - {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Debug|Win32.Build.0 = Debug|Win32 - {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.irrlicht-debug|Win32.ActiveCfg = Release|Win32 - {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.irrlicht-debug|Win32.Build.0 = Release|Win32 + {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.debug|Win32.ActiveCfg = Release|Win32 + {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.debug|Win32.Build.0 = Release|Win32 {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Release|Win32.ActiveCfg = Release|Win32 {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Release|Win32.Build.0 = Release|Win32 - {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Debug|Win32.ActiveCfg = Release|Win32 - {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Debug|Win32.Build.0 = Release|Win32 - {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.irrlicht-debug|Win32.ActiveCfg = Release|Win32 - {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.irrlicht-debug|Win32.Build.0 = Release|Win32 + {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.debug|Win32.ActiveCfg = Release|Win32 + {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.debug|Win32.Build.0 = Release|Win32 {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Release|Win32.ActiveCfg = Release|Win32 {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj index df64e4f83..5565ae68d 100644 --- a/src/ide/vc9/supertuxkart.vcproj +++ b/src/ide/vc9/supertuxkart.vcproj @@ -17,7 +17,7 @@ - - - - - - - - - - - - - - - - - - - - - @@ -840,6 +748,10 @@ + + @@ -871,10 +783,6 @@ RelativePath="../../../src\explosion.hpp" > - - @@ -1522,6 +1430,10 @@ + + diff --git a/src/file_manager.cpp b/src/io/file_manager.cpp similarity index 94% rename from src/file_manager.cpp rename to src/io/file_manager.cpp index b17d0498f..2674963d5 100644 --- a/src/file_manager.cpp +++ b/src/io/file_manager.cpp @@ -18,7 +18,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "file_manager.hpp" +#include "io/file_manager.hpp" #include #include @@ -30,25 +30,19 @@ # ifndef __CYGWIN__ # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) // Some portabilty defines -# define access _access -# define F_OK 04 # endif # define CONFIGDIR "." #else # define CONFIGDIR ".supertuxkart" #endif -#ifdef HAVE_IRRLICHT -# include "irrlicht.h" -#endif +#include "irrlicht.h" // ul.h includes windows.h, so this define is necessary #define _WINSOCKAPI_ #include #include "btBulletDynamicsCommon.h" -#ifdef HAVE_IRRLICHT -# include "graphics/irr_driver.hpp" -#endif +#include "graphics/irr_driver.hpp" #include "material_manager.hpp" #include "utils/string_utils.hpp" @@ -97,11 +91,8 @@ FileManager* file_manager = 0; */ FileManager::FileManager() { -#ifdef HAVE_IRRLICHT - // m_device = createDevice(video::EDT_NULL); m_file_system = m_device->getFileSystem(); -#endif m_is_full_path = false; if ( getenv ( "SUPERTUXKART_DATADIR" ) != NULL ) @@ -109,17 +100,9 @@ FileManager::FileManager() #ifdef __APPLE__ else if( macSetBundlePathIfRelevant( m_root_dir ) ) { /* nothing to do */ } #endif -#ifdef HAVE_IRRLICHT else if(m_file_system->existFile("data/stk_config.data")) -#else - else if ( access ( "data/stk_config.data", F_OK ) == 0 ) -#endif m_root_dir = "." ; -#ifdef HAVE_IRRLICHT else if(m_file_system->existFile("../data/stk_config.data")) -#else - else if ( access ( "../data/stk_config.data", F_OK ) == 0 ) -#endif m_root_dir = ".." ; else #ifdef SUPERTUXKART_DATADIR @@ -135,9 +118,7 @@ FileManager::FileManager() pushTextureSearchPath(m_root_dir+"/data/textures"); pushModelSearchPath (m_root_dir+"/data/models" ); pushMusicSearchPath (m_root_dir+"/data/music" ); -#ifdef HAVE_IRRLICHT m_file_system->addFolderFileArchive("data/models"); -#endif // Add more paths from the STK_MUSIC_PATH environment variable if(getenv("SUPERTUXKART_MUSIC_PATH")!=NULL) { @@ -183,14 +164,12 @@ FileManager::FileManager() /** Remove the dummy file system (which is called from IrrDriver before * creating the actual device. */ -#ifdef HAVE_IRRLICHT void FileManager::dropFileSystem() { m_device->drop(); } // dropFileSystem -#endif + //----------------------------------------------------------------------------- -#ifdef HAVE_IRRLICHT /** This function is used to re-initialise the file-manager after reading in * the user configuration data. */ @@ -201,66 +180,49 @@ void FileManager::setDevice(IrrlichtDevice *device) // file_manager has a pointer to the file system. m_file_system = m_device->getFileSystem(); } // reInit -#endif + //----------------------------------------------------------------------------- FileManager::~FileManager() { popMusicSearchPath(); popModelSearchPath(); popTextureSearchPath(); -#ifdef HAVE_IRRLICHT // m_file_system is ref-counted, so no delete/drop necessary. m_file_system = NULL; m_device->drop(); -#endif } // ~FileManager //----------------------------------------------------------------------------- -#ifdef HAVE_IRRLICHT XMLReader *FileManager::getXMLReader(const std::string &f) { io::IXMLReader *r = m_file_system->createXMLReader(f.c_str()); return new XMLReader(r); } // getXMLReader -#endif + //----------------------------------------------------------------------------- void FileManager::pushModelSearchPath(const std::string& path) { m_model_search_path.push_back(path); -#ifdef HAVE_IRRLICHT m_file_system->addFolderFileArchive(path.c_str()); -#endif } // pushModelSearchPath //----------------------------------------------------------------------------- void FileManager::pushTextureSearchPath(const std::string& path) { m_texture_search_path.push_back(path); -#ifdef HAVE_IRRLICHT m_file_system->addFolderFileArchive(path.c_str()); -#endif } // pushTextureSearchPath //----------------------------------------------------------------------------- - - bool FileManager::findFile(std::string& full_path, const std::string& fname, const std::vector& search_path) const { -#ifndef HAVE_IRRLICHT - struct stat mystat; -#endif - for(std::vector::const_reverse_iterator i = search_path.rbegin(); i != search_path.rend(); ++i) { full_path = *i + "/" + fname; -#ifdef HAVE_IRRLICHT if(m_file_system->existFile(full_path.c_str())) return true; -#else - if(stat(full_path.c_str(), &mystat) >= 0) return true; -#endif } full_path=""; return false; diff --git a/src/file_manager.hpp b/src/io/file_manager.hpp similarity index 93% rename from src/file_manager.hpp rename to src/io/file_manager.hpp index 9e573eaea..78541c1cd 100644 --- a/src/file_manager.hpp +++ b/src/io/file_manager.hpp @@ -23,16 +23,13 @@ #include #include -#ifdef HAVE_IRRLICHT -# include "irrlicht.h" - using namespace irr; +#include "irrlicht.h" +using namespace irr; #include "io/xml_reader.hpp" -#endif class FileManager { private: -#ifdef HAVE_IRRLICHT /** Handle to irrlicht's file systems. */ io::IFileSystem *m_file_system; /** Pointer to the irrlicht device. This is necessary before reInit is @@ -40,7 +37,6 @@ private: * for details. */ IrrlichtDevice *m_device; -#endif bool m_is_full_path; std::string m_root_dir; std::vector m_texture_search_path, @@ -56,14 +52,9 @@ private: public: FileManager(); ~FileManager(); -#ifdef HAVE_IRRLICHT void setDevice(IrrlichtDevice *device); void dropFileSystem(); XMLReader *getXMLReader(const std::string &f); -// io::IXMLWriter *getXMLWriter(const std::string &f) - //{ return m_file_system->createXMLWriter(f.c_str());} - -#endif std::string getHomeDir () const; std::string getTrackDir () const; diff --git a/src/items/attachment_manager.cpp b/src/items/attachment_manager.cpp index 9bcd17de7..1bad6d4d9 100644 --- a/src/items/attachment_manager.cpp +++ b/src/items/attachment_manager.cpp @@ -18,8 +18,9 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "items/attachment_manager.hpp" -#include "file_manager.hpp" + #include "loader.hpp" +#include "io/file_manager.hpp" AttachmentManager *attachment_manager = 0; diff --git a/src/items/item_manager.cpp b/src/items/item_manager.cpp index c90caa61b..57f9d10e5 100644 --- a/src/items/item_manager.cpp +++ b/src/items/item_manager.cpp @@ -22,11 +22,11 @@ #include #include "user_config.hpp" -#include "file_manager.hpp" #include "loader.hpp" #include "material_manager.hpp" #include "material.hpp" #include "graphics/irr_driver.hpp" +#include "io/file_manager.hpp" #include "items/item_manager.hpp" #include "items/bubblegumitem.hpp" #include "karts/kart.hpp" diff --git a/src/items/powerup_manager.cpp b/src/items/powerup_manager.cpp index 6177957a8..ed690a980 100644 --- a/src/items/powerup_manager.cpp +++ b/src/items/powerup_manager.cpp @@ -23,10 +23,10 @@ #include #include -#include "file_manager.hpp" #include "material_manager.hpp" #include "material.hpp" #include "graphics/irr_driver.hpp" +#include "io/file_manager.hpp" #include "items/bowling.hpp" #include "items/cake.hpp" #include "items/plunger.hpp" diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index 883258e2f..b1189beab 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -27,9 +27,8 @@ #include #include "bullet/Demos/OpenGL/GL_ShapeDrawer.h" + #include "loader.hpp" -#include "items/item_manager.hpp" -#include "file_manager.hpp" #include "user_config.hpp" #include "material_manager.hpp" #include "audio/sound_manager.hpp" @@ -41,6 +40,8 @@ #include "graphics/smoke.hpp" #include "gui/menu_manager.hpp" #include "gui/race_gui.hpp" +#include "io/file_manager.hpp" +#include "items/item_manager.hpp" #include "karts/kart_model.hpp" #include "karts/kart_properties_manager.hpp" #include "network/race_state.hpp" diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp index f5d56365d..aab89931b 100644 --- a/src/karts/kart_model.cpp +++ b/src/karts/kart_model.cpp @@ -19,12 +19,12 @@ #include "karts/kart_model.hpp" -#include "file_manager.hpp" #include "loader.hpp" #include "stk_config.hpp" #include "user_config.hpp" #include "graphics/irr_driver.hpp" #include "graphics/mesh_tools.hpp" +#include "io/file_manager.hpp" #include "utils/constants.hpp" #include "utils/ssg_help.hpp" diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp index 29373ecc8..356c26c2d 100644 --- a/src/karts/kart_properties.cpp +++ b/src/karts/kart_properties.cpp @@ -24,10 +24,10 @@ #include #include "material_manager.hpp" #include "loader.hpp" -#include "file_manager.hpp" #include "stk_config.hpp" #include "user_config.hpp" #include "karts/kart_model.hpp" +#include "io/file_manager.hpp" #include "lisp/parser.hpp" #include "lisp/lisp.hpp" #include "utils/ssg_help.hpp" diff --git a/src/karts/kart_properties_manager.cpp b/src/karts/kart_properties_manager.cpp index 6190f9b9e..902bd9cce 100644 --- a/src/karts/kart_properties_manager.cpp +++ b/src/karts/kart_properties_manager.cpp @@ -23,11 +23,11 @@ #include #include -#include "file_manager.hpp" #include "stk_config.hpp" #include "user_config.hpp" #include "callback_manager.hpp" #include "challenges/unlock_manager.hpp" +#include "io/file_manager.hpp" #include "karts/kart_properties.hpp" #include "utils/string_utils.hpp" diff --git a/src/loader.cpp b/src/loader.cpp index 3ec511fbd..d6a1a9e5f 100644 --- a/src/loader.cpp +++ b/src/loader.cpp @@ -34,9 +34,9 @@ #include "loader.hpp" #include "material_manager.hpp" -#include "file_manager.hpp" #include "material.hpp" #include "graphics/moving_texture.hpp" +#include "io/file_manager.hpp" #include "physics/moving_physics.hpp" Loader* loader = 0; diff --git a/src/main.cpp b/src/main.cpp index 738e9c394..60c2bd62a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,7 +46,6 @@ #include "user_config.hpp" #include "race_manager.hpp" -#include "file_manager.hpp" #include "loader.hpp" #include "main_loop.hpp" #include "material_manager.hpp" @@ -59,13 +58,12 @@ #include "audio/sound_manager.hpp" #include "audio/sfx_manager.hpp" #include "challenges/unlock_manager.hpp" -#ifdef HAVE_IRRLICHT -# include "graphics/irr_driver.hpp" -#endif +#include "graphics/irr_driver.hpp" #include "graphics/scene.hpp" #include "gui/menu_manager.hpp" #include "gui/menu_manager.hpp" #include "gui/widget_manager.hpp" +#include "io/file_manager.hpp" #include "items/attachment_manager.hpp" #include "items/item_manager.hpp" #include "items/projectile_manager.hpp" @@ -440,13 +438,8 @@ void InitTuxkart() // unlock manager is needed when reading the config file unlock_manager = new UnlockManager(); user_config = new UserConfig(); -#ifdef HAVE_IRRLICHT irr_driver = new IrrDriver(); -#endif loader = new Loader(); -#ifndef HAVE_IRRLICHT - loader->setCreateStateCallback(getAppState); -#endif sound_manager = new SoundManager(); sfx_manager = new SFXManager(); // The order here can be important, e.g. KartPropertiesManager needs @@ -514,9 +507,7 @@ void CleanTuxKart() if(translations) delete translations; if(file_manager) delete file_manager; if(stk_scene) delete stk_scene; -#ifdef HAVE_IRRLICHT if(irr_driver) delete irr_driver; -#endif } //============================================================================= @@ -553,9 +544,6 @@ int main(int argc, char *argv[] ) //FIXME: this needs a better organization inputDriver = new SDLDriver (); -#ifndef HAVE_IRRLICHT - ssgInit(); -#endif main_loop = new MainLoop(); // loadMaterials needs ssgLoadTextures (internally), which can diff --git a/src/material.cpp b/src/material.cpp index 2a592e8de..f160429d8 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -21,9 +21,9 @@ #include -#include "file_manager.hpp" #include "stk_config.hpp" #include "graphics/irr_driver.hpp" +#include "io/file_manager.hpp" #include "io/xml_node.hpp" #include "utils/string_utils.hpp" diff --git a/src/material_manager.cpp b/src/material_manager.cpp index 76c89ef19..fcc53796b 100644 --- a/src/material_manager.cpp +++ b/src/material_manager.cpp @@ -22,8 +22,8 @@ #include #include -#include "file_manager.hpp" #include "material.hpp" +#include "io/file_manager.hpp" #include "io/xml_node.hpp" #include "utils/string_utils.hpp" diff --git a/src/modes/world.cpp b/src/modes/world.cpp index 4392cd25b..aab06f360 100644 --- a/src/modes/world.cpp +++ b/src/modes/world.cpp @@ -23,7 +23,6 @@ #include #include -#include "file_manager.hpp" #include "race_manager.hpp" #include "user_config.hpp" #include "callback_manager.hpp" @@ -36,6 +35,7 @@ #include "graphics/camera.hpp" #include "graphics/scene.hpp" #include "gui/menu_manager.hpp" +#include "io/file_manager.hpp" #include "items/item_manager.hpp" #include "items/projectile_manager.hpp" #include "karts/auto_kart.hpp" diff --git a/src/physics/moving_physics.cpp b/src/physics/moving_physics.cpp index 9715d0032..85eb9f449 100644 --- a/src/physics/moving_physics.cpp +++ b/src/physics/moving_physics.cpp @@ -28,10 +28,10 @@ using namespace irr; #define _WINSOCKAPI_ #include -#include "file_manager.hpp" #include "graphics/irr_driver.hpp" #include "graphics/mesh_tools.hpp" #include "graphics/scene.hpp" +#include "io/file_manager.hpp" #include "io/xml_node.hpp" #include "modes/world.hpp" #include "tracks/track.hpp" diff --git a/src/stk_config.cpp b/src/stk_config.cpp index 5703aabec..da030bd48 100644 --- a/src/stk_config.cpp +++ b/src/stk_config.cpp @@ -23,7 +23,7 @@ #include #include -#include "file_manager.hpp" +#include "io/file_manager.hpp" #include "lisp/parser.hpp" #include "audio/music_information.hpp" diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 788140c31..ca2efb5c3 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -24,10 +24,8 @@ #include #define _WINSOCKAPI_ #include -#ifdef HAVE_IRRLICHT #include "irrlicht.h" -#endif -#include "file_manager.hpp" + #include "loader.hpp" #include "stk_config.hpp" #include "material_manager.hpp" @@ -37,6 +35,7 @@ #include "graphics/irr_driver.hpp" #include "graphics/mesh_tools.hpp" #include "graphics/scene.hpp" +#include "io/file_manager.hpp" #include "io/xml_node.hpp" #include "items/item.hpp" #include "items/item_manager.hpp" diff --git a/src/tracks/track_manager.cpp b/src/tracks/track_manager.cpp index 327bab34c..02853182b 100644 --- a/src/tracks/track_manager.cpp +++ b/src/tracks/track_manager.cpp @@ -17,17 +17,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "file_manager.hpp" +#include "tracks/track_manager.hpp" #include #include #include #include -#include "track_manager.hpp" -#include "track.hpp" #include "stk_config.hpp" #include "audio/sound_manager.hpp" +#include "io/file_manager.hpp" +#include "tracks/track.hpp" TrackManager* track_manager = 0; diff --git a/src/user_config.cpp b/src/user_config.cpp index cfd2297b6..c40e82f3a 100644 --- a/src/user_config.cpp +++ b/src/user_config.cpp @@ -40,8 +40,8 @@ #include "stk_config.hpp" #include "actionmap.hpp" #include "race_manager.hpp" -#include "file_manager.hpp" #include "challenges/unlock_manager.hpp" +#include "io/file_manager.hpp" #include "lisp/lisp.hpp" #include "lisp/parser.hpp" #include "lisp/writer.hpp" diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp index 7365cf3a2..1e09bcfd7 100644 --- a/src/utils/translation.cpp +++ b/src/utils/translation.cpp @@ -18,8 +18,9 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "translation.hpp" -#include "file_manager.hpp" +#include "utils/translation.hpp" + +#include "io/file_manager.hpp" Translations* translations=NULL;