From 7dfda9e304812d8cd4d3d68e62b384c75f7f094e Mon Sep 17 00:00:00 2001 From: hikerstk Date: Fri, 27 Feb 2009 01:32:09 +0000 Subject: [PATCH] Minor bugfixes for linux compilation. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3204 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/Makefile.am | 2 +- src/file_manager.cpp | 22 +++++++++++----------- src/io/xml_reader.hpp | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 683f19501..3c79b3fa0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 \ diff --git a/src/file_manager.cpp b/src/file_manager.cpp index 3eb860952..70ab0b114 100644 --- a/src/file_manager.cpp +++ b/src/file_manager.cpp @@ -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) diff --git a/src/io/xml_reader.hpp b/src/io/xml_reader.hpp index a2cde83d2..fe332518a 100755 --- a/src/io/xml_reader.hpp +++ b/src/io/xml_reader.hpp @@ -41,4 +41,5 @@ public: const XMLNode *getNode(unsigned int n) const; }; // XMLReader #endif -#endif \ No newline at end of file +#endif +