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

Minor bugfixes for linux compilation.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3204 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-02-27 01:32:09 +00:00
parent 62bc9990ca
commit 7dfda9e304
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -74,7 +74,7 @@ supertuxkart_SOURCES = \
graphics/camera.cpp \
graphics/camera.hpp \
graphics/irr_driver.cpp \
graphics/irr_driver.cpp \
graphics/irr_driver.hpp \
graphics/mesh_tools.hpp \
graphics/mesh_tools.cpp \
graphics/nitro.cpp \

22
src/file_manager.cpp
View File

@ -88,9 +88,9 @@ bool macSetBundlePathIfRelevant(std::string& data_dir)
FileManager* file_manager = 0;
/** With irrlicht the constructor creates a NULL device. This is necessary to
* handle the Chicken/egg problem with irrlicht: access to the file system
* is given from the device, but we can't create the device before reading
* the user_config file (for resolution, fullscreen). So we create a dummy
* handle the Chicken/egg problem with irrlicht: access to the file system
* is given from the device, but we can't create the device before reading
* the user_config file (for resolution, fullscreen). So we create a dummy
* device here to begin with, which is then later (once the real device
* exists) changed in reInit().
*
@ -98,9 +98,9 @@ FileManager* file_manager = 0;
FileManager::FileManager()
{
#ifdef HAVE_IRRLICHT
//
m_device = createDevice(video::EDT_NULL);
m_file_system = m_device->getFileSystem();
//
m_device = createDevice(video::EDT_NULL);
m_file_system = m_device->getFileSystem();
#endif
m_is_full_path = false;
@ -217,11 +217,11 @@ FileManager::~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
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)

3
src/io/xml_reader.hpp
View File

@ -41,4 +41,5 @@ public:
const XMLNode *getNode(unsigned int n) const;
}; // XMLReader
#endif
#endif
#endif