summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--The Mana World.dev214
-rw-r--r--src/graphic/graphic.h2
-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.h6
-rw-r--r--src/main.h2
-rw-r--r--src/resources/resourcemanager.cpp3
7 files changed, 143 insertions, 86 deletions
diff --git a/The Mana World.dev b/The Mana World.dev
index e98ccade..2c93e5e6 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,7 +1,7 @@
[Project]
FileName=The Mana World.dev
Name=tmw
-UnitCount=90
+UnitCount=96
Type=0
Ver=1
ObjFiles=
@@ -33,7 +33,7 @@ CompilerSettings=0010001001001000001101
Major=0
Minor=0
Release=8
-Build=807
+Build=818
LanguageID=1033
CharsetID=1252
CompanyName=The Mana World Development Team
@@ -442,18 +442,8 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit42]
-FileName=src\graphic\image.h
-CompileCpp=1
-Folder=graphic
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
[Unit43]
-FileName=src\gui\setup.h
+FileName=src\gui\setup.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -463,7 +453,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit44]
-FileName=src\gui\setup.cpp
+FileName=src\gui\checkbox.h
CompileCpp=1
Folder=gui
Compile=1
@@ -473,7 +463,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit46]
-FileName=src\gui\button.cpp
+FileName=src\gui\button.h
CompileCpp=1
Folder=gui
Compile=1
@@ -483,7 +473,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit47]
-FileName=src\gui\button.h
+FileName=src\gui\checkbox.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -493,7 +483,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit48]
-FileName=src\gui\checkbox.cpp
+FileName=src\gui\window.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -503,7 +493,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit45]
-FileName=src\gui\checkbox.h
+FileName=src\gui\button.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -513,16 +503,6 @@ OverrideBuildCmd=0
BuildCmd=
[Unit49]
-FileName=src\gui\window.cpp
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
FileName=src\gui\window.h
CompileCpp=1
Folder=gui
@@ -532,7 +512,7 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit51]
+[Unit50]
FileName=src\gui\progressbar.cpp
CompileCpp=1
Folder=gui
@@ -542,7 +522,7 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit52]
+[Unit51]
FileName=src\gui\progressbar.h
CompileCpp=1
Folder=gui
@@ -552,7 +532,7 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit53]
+[Unit52]
FileName=src\gui\textfield.cpp
CompileCpp=1
Folder=gui
@@ -562,7 +542,7 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit54]
+[Unit53]
FileName=src\gui\textfield.h
CompileCpp=1
Folder=gui
@@ -572,7 +552,7 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit55]
+[Unit54]
FileName=src\gui\passwordfield.cpp
CompileCpp=1
Folder=gui
@@ -582,7 +562,7 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit56]
+[Unit55]
FileName=src\gui\passwordfield.h
CompileCpp=1
Folder=gui
@@ -592,10 +572,10 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit57]
-FileName=src\graphic\image.cpp
+[Unit56]
+FileName=src\configuration.cpp
CompileCpp=1
-Folder=graphic
+Folder=
Compile=1
Link=1
Priority=1000
@@ -603,9 +583,9 @@ OverrideBuildCmd=0
BuildCmd=
[Unit58]
-FileName=src\configuration.cpp
+FileName=src\gui\buy.cpp
CompileCpp=1
-Folder=
+Folder=gui
Compile=1
Link=1
Priority=1000
@@ -613,9 +593,9 @@ OverrideBuildCmd=0
BuildCmd=
[Unit59]
-FileName=src\configuration.h
+FileName=src\gui\buy.h
CompileCpp=1
-Folder=
+Folder=gui
Compile=1
Link=1
Priority=1000
@@ -623,7 +603,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit60]
-FileName=src\gui\buy.cpp
+FileName=src\gui\slider.h
CompileCpp=1
Folder=gui
Compile=1
@@ -633,7 +613,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit61]
-FileName=src\gui\buy.h
+FileName=src\gui\slider.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -643,7 +623,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit62]
-FileName=src\gui\slider.h
+FileName=src\gui\ok_dialog.h
CompileCpp=1
Folder=gui
Compile=1
@@ -653,7 +633,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit63]
-FileName=src\gui\slider.cpp
+FileName=src\gui\ok_dialog.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -663,7 +643,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit65]
-FileName=src\gui\ok_dialog.cpp
+FileName=src\gui\status.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -673,27 +653,27 @@ OverrideBuildCmd=0
BuildCmd=
[Unit66]
-FileName=small_icon.rc
+FileName=src\gui\status.h
CompileCpp=1
-Folder=resources
+Folder=gui
Compile=1
-Link=0
+Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit64]
-FileName=src\gui\ok_dialog.h
+FileName=small_icon.rc
CompileCpp=1
-Folder=gui
+Folder=resources
Compile=1
-Link=1
+Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit67]
-FileName=src\gui\status.cpp
+FileName=src\gui\buysell.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -703,7 +683,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit68]
-FileName=src\gui\status.h
+FileName=src\gui\buysell.h
Folder=gui
Compile=1
Link=1
@@ -713,7 +693,7 @@ BuildCmd=
CompileCpp=1
[Unit69]
-FileName=src\gui\buysell.cpp
+FileName=src\gui\radiobutton.h
CompileCpp=1
Folder=gui
Compile=1
@@ -723,7 +703,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit70]
-FileName=src\gui\buysell.h
+FileName=src\gui\scrollarea.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -733,7 +713,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit71]
-FileName=src\gui\radiobutton.h
+FileName=src\gui\scrollarea.h
CompileCpp=1
Folder=gui
Compile=1
@@ -743,7 +723,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit72]
-FileName=src\gui\scrollarea.cpp
+FileName=src\gui\radiobutton.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -753,7 +733,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit73]
-FileName=src\gui\scrollarea.h
+FileName=src\gui\sell.h
CompileCpp=1
Folder=gui
Compile=1
@@ -763,7 +743,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit74]
-FileName=src\gui\radiobutton.cpp
+FileName=src\gui\sell.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -773,7 +753,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit75]
-FileName=src\gui\sell.h
+FileName=src\gui\allegroinput.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -783,7 +763,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit76]
-FileName=src\gui\sell.cpp
+FileName=src\gui\allegroinput.h
CompileCpp=1
Folder=gui
Compile=1
@@ -813,7 +793,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit77]
-FileName=src\gui\allegroinput.cpp
+FileName=src\gui\npc_text.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -823,7 +803,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit78]
-FileName=src\gui\allegroinput.h
+FileName=src\gui\npc_text.h
CompileCpp=1
Folder=gui
Compile=1
@@ -833,7 +813,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit79]
-FileName=src\gui\npc_text.cpp
+FileName=src\gui\listbox.h
CompileCpp=1
Folder=gui
Compile=1
@@ -843,7 +823,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit80]
-FileName=src\gui\npc_text.h
+FileName=src\gui\listbox.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -853,7 +833,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit81]
-FileName=src\gui\listbox.h
+FileName=src\gui\textbox.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -863,7 +843,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit82]
-FileName=src\gui\listbox.cpp
+FileName=src\gui\textbox.h
CompileCpp=1
Folder=gui
Compile=1
@@ -873,7 +853,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit84]
-FileName=src\gui\textbox.h
+FileName=src\gui\windowcontainer.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -883,7 +863,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit83]
-FileName=src\gui\textbox.cpp
+FileName=src\gui\windowcontainer.h
CompileCpp=1
Folder=gui
Compile=1
@@ -893,7 +873,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit85]
-FileName=src\gui\windowcontainer.h
+FileName=src\gui\playerbox.h
CompileCpp=1
Folder=gui
Compile=1
@@ -903,7 +883,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit86]
-FileName=src\gui\windowcontainer.cpp
+FileName=src\gui\playerbox.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -913,7 +893,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit87]
-FileName=src\gui\playerbox.h
+FileName=src\gui\confirm_dialog.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -923,7 +903,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit88]
-FileName=src\gui\playerbox.cpp
+FileName=src\gui\confirm_dialog.h
CompileCpp=1
Folder=gui
Compile=1
@@ -933,9 +913,9 @@ OverrideBuildCmd=0
BuildCmd=
[Unit89]
-FileName=src\gui\confirm_dialog.cpp
+FileName=src\resources\image.cpp
CompileCpp=1
-Folder=gui
+Folder=resources
Compile=1
Link=1
Priority=1000
@@ -943,7 +923,77 @@ OverrideBuildCmd=0
BuildCmd=
[Unit90]
-FileName=src\gui\confirm_dialog.h
+FileName=src\resources\image.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit91]
+FileName=src\resources\resource.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit92]
+FileName=src\resources\resource.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit93]
+FileName=src\resources\resourcemanager.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit94]
+FileName=src\resources\resourcemanager.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit95]
+FileName=src\graphic\spriteset.cpp
+CompileCpp=1
+Folder=graphic
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit96]
+FileName=src\graphic\spriteset.h
+CompileCpp=1
+Folder=graphic
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=src\gui\setup.h
CompileCpp=1
Folder=gui
Compile=1
@@ -952,3 +1002,13 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
+[Unit57]
+FileName=src\configuration.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
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"
diff --git a/src/main.h b/src/main.h
index bd85463d..66508e8e 100644
--- a/src/main.h
+++ b/src/main.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) {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-04 02:06:20 +0000