summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-14 20:26:09 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-14 20:26:09 +0000
commit6c1e52274a4842ea1ab24ed6a1fd19c6126597b7 (patch)
tree8de296620eddd505cc177c33808dcad7c196ce4e /src
parentdba629be42361f2b805c46e102dbed861e3fb049 (diff)
downloadmana-client-6c1e52274a4842ea1ab24ed6a1fd19c6126597b7.tar.gz
mana-client-6c1e52274a4842ea1ab24ed6a1fd19c6126597b7.tar.bz2
mana-client-6c1e52274a4842ea1ab24ed6a1fd19c6126597b7.tar.xz
mana-client-6c1e52274a4842ea1ab24ed6a1fd19c6126597b7.zip
Fixed resource loading on Windows.
Diffstat (limited to 'src')
-rw-r--r--src/resources/image.cpp4
-rw-r--r--src/resources/resourcemanager.cpp19
2 files changed, 3 insertions, 20 deletions
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;