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

Move particles into a new subdirectory

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7460 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-01-17 01:04:23 +00:00
parent e0f27de3d1
commit 685cbd1c14
12 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/nitro.xml → data/gfx/nitro.xml
View File

0
data/rain.xml → data/gfx/rain.xml
View File

0
data/smoke.xml → data/gfx/smoke.xml
View File

0
data/smoke_brown.xml → data/gfx/smoke_brown.xml
View File

0
data/smoke_red.xml → data/gfx/smoke_red.xml
View File

0
data/smoke_yellow.xml → data/gfx/smoke_yellow.xml
View File

0
data/snow.xml → data/gfx/snow.xml
View File

0
data/splash.xml → data/gfx/splash.xml
View File

2
src/graphics/particle_kind_manager.cpp
View File

@ -53,7 +53,7 @@ ParticleKind* ParticleKindManager::getParticles(const char* name)
{ {
try try
{ {
ParticleKind* newkind = new ParticleKind(file_manager->getDataFile(name)); ParticleKind* newkind = new ParticleKind(file_manager->getGfxFile(name));
m_kinds[name] = newkind; m_kinds[name] = newkind;
return newkind; return newkind;
} }

6
src/io/file_manager.cpp
View File

@ -356,7 +356,11 @@ std::string FileManager::getDataFile(const std::string& fname) const
{ {
return m_root_dir+"/data/"+fname; return m_root_dir+"/data/"+fname;
} // getDataFile } // getDataFile
//-----------------------------------------------------------------------------
std::string FileManager::getGfxFile(const std::string& fname) const
{
return m_root_dir+"/data/gfx/"+fname;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** If the directory specified in path does not exist, it is created. /** If the directory specified in path does not exist, it is created.
* \params path Directory to test. * \params path Directory to test.

3
src/io/file_manager.hpp
View File

@ -98,9 +98,10 @@ public:
std::string getDataFile (const std::string& fname) const; std::string getDataFile (const std::string& fname) const;
std::string getHighscoreFile (const std::string& fname) const; std::string getHighscoreFile (const std::string& fname) const;
std::string getChallengeFile (const std::string& fname) const; std::string getChallengeFile (const std::string& fname) const;
std::string getTutorialFile (const std::string& fname) const; std::string getTutorialFile (const std::string& fname) const;
std::string getLogFile (const std::string& fname) const; std::string getLogFile (const std::string& fname) const;
std::string getItemFile (const std::string& fname) const; std::string getItemFile (const std::string& fname) const;
std::string getGfxFile (const std::string& fname) const;
std::string getMusicFile (const std::string& fname) const; std::string getMusicFile (const std::string& fname) const;
std::string getSFXFile (const std::string& fname) const; std::string getSFXFile (const std::string& fname) const;
std::string getFontFile (const std::string& fname) const; std::string getFontFile (const std::string& fname) const;

2
src/karts/kart.cpp
View File

@ -1477,7 +1477,7 @@ void Kart::loadData()
try try
{ {
m_nitro = new ParticleEmitter( m_nitro = new ParticleEmitter(
new ParticleKind(file_manager->getDataFile("nitro.xml")), new ParticleKind(file_manager->getGfxFile("nitro.xml")),
position, getNode()); position, getNode());
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)