From 110af2b7ae50507f6074f348c5f3e1cfe7456ef7 Mon Sep 17 00:00:00 2001
From: hikerstk <hikerstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Tue, 4 Jan 2011 05:47:49 +0000
Subject: [PATCH] Removed/replaced getKartFile/Dir functions in file_manager,
 which should solve issues with addon karts not being found or textures not
 correctly loaded.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/io/file_manager.cpp       | 17 -----------------
 src/io/file_manager.hpp       |  3 ---
 src/karts/kart_properties.cpp |  6 +++---
 src/main.cpp                  |  4 ++--
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index 068933f6b..31015e8c6 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -329,11 +329,6 @@ std::string FileManager::getGUIDir() const
 {
     return m_root_dir+"/data/gui/";
 }
-//-----------------------------------------------------------------------------
-std::string FileManager::getKartDir() const
-{
-    return m_root_dir+"/data/karts/";
-}   // getKartDir
 
 //-----------------------------------------------------------------------------
 std::string FileManager::getTranslationDir() const
@@ -347,18 +342,6 @@ std::vector<std::string> FileManager::getMusicDirs() const
     return m_music_search_path;
 }   // getMusicDirs
 
-//-----------------------------------------------------------------------------
-std::string FileManager::getKartFile(const std::string& fname,
-                                     const std::string& kart_name) const
-{
-    // kart file are in data/karts/KARTNAME/KARTNAME.ext
-    // but if a kart name is supplied use it (which is necessary
-    // e.g. to load a model from a kart directory
-    std::string basename = (kart_name!="") ? kart_name
-                           : StringUtils::removeExtension(fname);
-    return getKartDir()+basename+"/"+fname;
-}   // getKartFile
-
 //-----------------------------------------------------------------------------
 std::string FileManager::getDataFile(const std::string& fname) const
 {
diff --git a/src/io/file_manager.hpp b/src/io/file_manager.hpp
index efaebecb1..1d67bffaa 100644
--- a/src/io/file_manager.hpp
+++ b/src/io/file_manager.hpp
@@ -88,14 +88,11 @@ public:
                                     std::string addons_type);
     bool removeDirectory(char const *name);
 #endif
-    std::string getKartDir       () const;
     std::string getDataDir       () const;
     std::string getTranslationDir() const;
     std::string getGUIDir        () const;
     std::vector<std::string>getMusicDirs() const;
     std::string getTextureFile   (const std::string& fname) const;
-    std::string getKartFile      (const std::string& fname,
-                                  const std::string& kart="") const;
     std::string getDataFile      (const std::string& fname) const;
     std::string getHighscoreFile (const std::string& fname) const;
     std::string getChallengeFile (const std::string& fname) const;
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index 5b4d8935d..0feb27bbf 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -152,9 +152,9 @@ void KartProperties::load(const std::string &filename, const std::string &node)
 
 
     // Load material
-    std::string materials_file = file_manager->getKartFile("materials.xml",getIdent());
-    file_manager->pushModelSearchPath(file_manager->getKartFile("", getIdent()));
-    file_manager->pushTextureSearchPath(file_manager->getKartFile("", getIdent()));
+    std::string materials_file = m_root+"/materials.xml";
+    file_manager->pushModelSearchPath  (m_root);
+    file_manager->pushTextureSearchPath(m_root);
 
     // addShared makes sure that these textures/material infos stay in memory
     material_manager->addSharedMaterial(materials_file);
diff --git a/src/main.cpp b/src/main.cpp
index 85a03568f..e67b474e8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -339,8 +339,8 @@ int handleCmdLine(int argc, char **argv)
         }
         else if( (!strcmp(argv[i], "--kart") && i+1<argc ))
         {
-            std::string filename=file_manager->getKartFile(std::string(argv[i+1])+".tkkf");
-            if(filename!="")
+            const KartProperties *prop = kart_properties_manager->getKart(argv[i+1]);
+            if(prop)
             {
                 UserConfigParams::m_default_kart = argv[i+1];