diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphic/graphic.h | 2 | ||||
| -rw-r--r-- | src/graphic/spriteset.cpp (renamed from src/graphic/image.cpp) | 2 | ||||
| -rw-r--r-- | src/graphic/spriteset.h (renamed from src/graphic/image.h) | 0 | ||||
| -rw-r--r-- | src/gui/inventory.h | 6 | ||||
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 3 |
6 files changed, 6 insertions, 9 deletions
diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h index 063410cf..f9a5b4e7 100644 --- a/src/graphic/graphic.h +++ b/src/graphic/graphic.h @@ -40,7 +40,7 @@ #include "../gui/npc.h" #include "../gui/status.h" #include "../resources/resourcemanager.h" -#include "image.h" +#include "spriteset.h" #include <allegro.h> #define TILE_SIZE 32 diff --git a/src/graphic/image.cpp b/src/graphic/spriteset.cpp index 44b611f6..31e84e9d 100644 --- a/src/graphic/image.cpp +++ b/src/graphic/spriteset.cpp @@ -21,7 +21,7 @@ * $Id$ */ -#include "image.h" +#include "spriteset.h" Spriteset::Spriteset(Image *img, int width, int height) { diff --git a/src/graphic/image.h b/src/graphic/spriteset.h index b732d4cf..b732d4cf 100644 --- a/src/graphic/image.h +++ b/src/graphic/spriteset.h diff --git a/src/gui/inventory.h b/src/gui/inventory.h index 87a99b07..7e7b7963 100644 --- a/src/gui/inventory.h +++ b/src/gui/inventory.h @@ -24,16 +24,12 @@ #ifndef _INVENTORY_H #define _INVENTORY_H -#ifdef WIN32 - #pragma warning (disable:4312) -#endif - #include <allegro.h> #include "../main.h" #include "../game.h" #include "../log.h" #include "../net/network.h" -#include "../graphic/image.h" +#include "../graphic/spriteset.h" #include "gui.h" #include "window.h" @@ -34,7 +34,7 @@ #include "configuration.h" #include "gui/login.h" #include "gui/gui.h" -#include "graphic/image.h" +#include "graphic/spriteset.h" #include "resources/image.h" #include "log.h" #include "game.h" diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 3a7b3897..838dcd6b 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -25,6 +25,7 @@ #include "image.h" #include "resourcemanager.h" #include <iostream> +#include <sstream> #ifdef WIN32 #include <direct.h> @@ -96,7 +97,7 @@ Resource* ResourceManager::get(const E_RESOURCE_TYPE &type, // Flip all of the idPath '/' to '\' unsigned int begPos = 0; unsigned int endPos = idPath.find("/"); - std::strstream result; + std::stringstream result; // Loop through and replace all the characters. while (endPos != std::string::npos) { |