ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for wip-tracks and wip-karts directories, which are only

Browse Source 
used when artist debug mode is enabled.
This commit is contained in:
hiker 2014-12-15 11:10:54 +11:00
parent f48f20da94
commit eba7d709c1
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/io/file_manager.cpp
View File

@ -200,7 +200,13 @@ FileManager::FileManager()
checkAndCreateGPDir(); checkAndCreateGPDir();
redirectOutput(); redirectOutput();
} // FileManager
// ----------------------------------------------------------------------------
/** Detects where the assets are stored.
*/
void FileManager::discoverPaths()
{
// We can't use _() here, since translations will only be initalised // We can't use _() here, since translations will only be initalised
// after the filemanager (to get the path to the tranlsations from it) // after the filemanager (to get the path to the tranlsations from it)
for(unsigned int i=0; i<m_root_dirs.size(); i++) for(unsigned int i=0; i<m_root_dirs.size(); i++)
@ -226,6 +232,16 @@ FileManager::FileManager()
TrackManager::addTrackSearchDir(m_root_dirs[i]+"tracks/"); TrackManager::addTrackSearchDir(m_root_dirs[i]+"tracks/");
if(fileExists(m_root_dirs[i]+"karts/")) if(fileExists(m_root_dirs[i]+"karts/"))
KartPropertiesManager::addKartSearchDir(m_root_dirs[i]+"karts/"); KartPropertiesManager::addKartSearchDir(m_root_dirs[i]+"karts/");
// If artist debug mode is enabled, add
// work-in-progress tracks and karts
if (UserConfigParams::m_artist_debug_mode)
{
if(fileExists(m_root_dirs[i] + "wip-tracks/"))
TrackManager::addTrackSearchDir(m_root_dirs[i] + "wip-tracks/");
if(fileExists(m_root_dirs[i] + "wip-karts/"))
KartPropertiesManager::addKartSearchDir(m_root_dirs[i] + "wip-karts/");
}
for(unsigned int j=ASSET_MIN; j<=ASSET_MAX; j++) for(unsigned int j=ASSET_MIN; j<=ASSET_MAX; j++)
{ {
if(!dir_found[j] && fileExists(m_root_dirs[i]+m_subdir_name[j])) if(!dir_found[j] && fileExists(m_root_dirs[i]+m_subdir_name[j]))
@ -253,7 +269,7 @@ FileManager::FileManager()
Log::fatal("[FileManager]", "Not all assets found - aborting."); Log::fatal("[FileManager]", "Not all assets found - aborting.");
} // FileManager } // discoverPaths
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** Remove the dummy file system (which is called from IrrDriver before /** Remove the dummy file system (which is called from IrrDriver before
@ -274,8 +290,8 @@ void FileManager::reInit()
m_file_system->grab(); m_file_system->grab();
// Note that we can't push the texture search path in the constructor // Note that we can't push the texture search path in the constructor
// since this also adds a file archive to te file system - and // since this also adds a file archive to the file system - and
// m_file_system is deleted (in irr_driver) after // m_file_system is deleted (in irr_driver)
pushTextureSearchPath(m_subdir_name[TEXTURE]); pushTextureSearchPath(m_subdir_name[TEXTURE]);
if(fileExists(m_subdir_name[TEXTURE]+"deprecated/")) if(fileExists(m_subdir_name[TEXTURE]+"deprecated/"))
pushTextureSearchPath(m_subdir_name[TEXTURE]+"deprecated/"); pushTextureSearchPath(m_subdir_name[TEXTURE]+"deprecated/");

1
src/io/file_manager.hpp
View File

@ -107,6 +107,7 @@ public:
FileManager(); FileManager();
~FileManager(); ~FileManager();
void reInit(); void reInit();
void discoverPaths();
void dropFileSystem(); void dropFileSystem();
static void addRootDirs(const std::string &roots); static void addRootDirs(const std::string &roots);
io::IXMLReader *createXMLReader(const std::string &filename); io::IXMLReader *createXMLReader(const std::string &filename);