From 6c1e52274a4842ea1ab24ed6a1fd19c6126597b7 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 14 Jan 2005 20:26:09 +0000 Subject: Fixed resource loading on Windows. --- src/resources/image.cpp | 4 +++- src/resources/resourcemanager.cpp | 19 ------------------- 2 files changed, 3 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/resources/image.cpp b/src/resources/image.cpp index b7739351..c786c784 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -37,9 +37,11 @@ Image::~Image() Image* Image::load(const std::string &filePath) { +#ifdef __DEBUG + std::cout << "Image::load(" << filePath << ")\n"; +#endif // Attempt to use SDL_Image to load the file. //image = IMG_Load(filePath.c_str()); - std::cout << "Attempting to load image from " << filePath << std::endl; BITMAP *image = load_bitmap(filePath.c_str(), NULL); // Check if the file was opened and return the appropriate value. diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 838dcd6b..94dc3e9d 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -93,26 +93,7 @@ Resource* ResourceManager::get(const E_RESOURCE_TYPE &type, // Set the filePath variable to the appropriate value // this is only if we're not using a packed file. -#ifdef WIN32 - // Flip all of the idPath '/' to '\' - unsigned int begPos = 0; - unsigned int endPos = idPath.find("/"); - std::stringstream result; - - // Loop through and replace all the characters. - while (endPos != std::string::npos) { - result << idPath.substr(begPos, endPos - begPos); - result << "\\"; - - begPos = endPos + 1; - endPos = (unsigned int)idPath.find("/"); - } - - filePath = std::string(programPath) + std::string("\\data\\") + - std::string(result.str()); -#else filePath = std::string(programPath) + std::string("/data/") + idPath; -#endif Resource *resource = NULL; -- cgit v1.2.3-70-g09d2