summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--The Mana World.dev56
-rw-r--r--src/astar.h6
-rw-r--r--src/being.cpp1
-rw-r--r--src/being.h2
-rw-r--r--src/graphic/graphic.cpp1
-rw-r--r--src/gui/login.cpp1
-rw-r--r--src/gui/login.h12
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h2
-rw-r--r--src/net/network.h3
-rw-r--r--src/net/protocol.cpp10
-rw-r--r--src/net/protocol.h10
12 files changed, 47 insertions, 59 deletions
diff --git a/The Mana World.dev b/The Mana World.dev
index 566e7127..188c13ab 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,7 +1,7 @@
[Project]
FileName=The Mana World.dev
Name=tmw
-UnitCount=96
+UnitCount=94
Type=0
Ver=1
ObjFiles=
@@ -10,9 +10,9 @@ Libs=
PrivateResource=The_Mana_World_private.rc
ResourceIncludes=
MakeIncludes=
-Compiler=
+Compiler=-Dmain=SDL_main_@@_
CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_
-Linker=-lguichan_@@_-lguichan_allegro_@@_-lalleg_@@_-lwsock32_@@_-lSDL_mixer_@@_-lSDL_@@_
+Linker=-lguichan_@@_-lguichan_sdl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_
IsCpp=1
Icon=The Mana World.ico
ExeOutput=
@@ -36,7 +36,7 @@ Release=8
<<<<<<< The Mana World.dev
Build=809
=======
-Build=875
+Build=904
>>>>>>> 1.76
LanguageID=1033
CharsetID=1252
@@ -757,7 +757,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit75]
-FileName=src\gui\allegroinput.cpp
+FileName=src\gui\npc_text.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -767,7 +767,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit76]
-FileName=src\gui\allegroinput.h
+FileName=src\gui\npc_text.h
CompileCpp=1
Folder=gui
Compile=1
@@ -797,7 +797,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit77]
-FileName=src\gui\npc_text.cpp
+FileName=src\gui\listbox.h
CompileCpp=1
Folder=gui
Compile=1
@@ -807,7 +807,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit78]
-FileName=src\gui\npc_text.h
+FileName=src\gui\listbox.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -817,7 +817,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit79]
-FileName=src\gui\listbox.h
+FileName=src\gui\textbox.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -827,7 +827,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit80]
-FileName=src\gui\listbox.cpp
+FileName=src\gui\textbox.h
CompileCpp=1
Folder=gui
Compile=1
@@ -837,7 +837,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit81]
-FileName=src\gui\textbox.cpp
+FileName=src\gui\windowcontainer.h
CompileCpp=1
Folder=gui
Compile=1
@@ -847,7 +847,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit82]
-FileName=src\gui\textbox.h
+FileName=src\gui\windowcontainer.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -857,7 +857,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit84]
-FileName=src\gui\windowcontainer.cpp
+FileName=src\gui\playerbox.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -867,7 +867,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit83]
-FileName=src\gui\windowcontainer.h
+FileName=src\gui\playerbox.h
CompileCpp=1
Folder=gui
Compile=1
@@ -877,7 +877,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit85]
-FileName=src\gui\playerbox.h
+FileName=src\gui\confirm_dialog.cpp
CompileCpp=1
Folder=gui
Compile=1
@@ -887,7 +887,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit86]
-FileName=src\gui\playerbox.cpp
+FileName=src\gui\confirm_dialog.h
CompileCpp=1
Folder=gui
Compile=1
@@ -897,9 +897,9 @@ OverrideBuildCmd=0
BuildCmd=
[Unit87]
-FileName=src\gui\confirm_dialog.cpp
+FileName=src\resources\image.cpp
CompileCpp=1
-Folder=gui
+Folder=resources
Compile=1
Link=1
Priority=1000
@@ -907,9 +907,9 @@ OverrideBuildCmd=0
BuildCmd=
[Unit88]
-FileName=src\gui\confirm_dialog.h
+FileName=src\resources\image.h
CompileCpp=1
-Folder=gui
+Folder=resources
Compile=1
Link=1
Priority=1000
@@ -917,7 +917,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit89]
-FileName=src\resources\image.cpp
+FileName=src\resources\resource.cpp
CompileCpp=1
Folder=resources
Compile=1
@@ -927,7 +927,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit90]
-FileName=src\resources\image.h
+FileName=src\resources\resource.h
CompileCpp=1
Folder=resources
Compile=1
@@ -937,7 +937,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit91]
-FileName=src\resources\resource.cpp
+FileName=src\resources\resourcemanager.cpp
CompileCpp=1
Folder=resources
Compile=1
@@ -947,7 +947,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit92]
-FileName=src\resources\resource.h
+FileName=src\resources\resourcemanager.h
CompileCpp=1
Folder=resources
Compile=1
@@ -957,9 +957,9 @@ OverrideBuildCmd=0
BuildCmd=
[Unit93]
-FileName=src\resources\resourcemanager.cpp
+FileName=src\graphic\spriteset.cpp
CompileCpp=1
-Folder=resources
+Folder=graphic
Compile=1
Link=1
Priority=1000
@@ -967,9 +967,9 @@ OverrideBuildCmd=0
BuildCmd=
[Unit94]
-FileName=src\resources\resourcemanager.h
+FileName=src\graphic\spriteset.h
CompileCpp=1
-Folder=resources
+Folder=graphic
Compile=1
Link=1
Priority=1000
diff --git a/src/astar.h b/src/astar.h
index e5cc3809..feafb7d7 100644
--- a/src/astar.h
+++ b/src/astar.h
@@ -1,10 +1,6 @@
#ifndef _ASTAR_H
#define _ASTAR_H
-#ifdef WIN32
- #pragma warning (disable:4312)
-#endif
-
#include "map.h"
#include "being.h"
@@ -19,7 +15,7 @@ extern int G_cost[MAP_WIDTH+1][MAP_HEIGHT+1];
void ReadPath(int pathfinderID,int currentX,int currentY, int pixelsPerFrame);
int ReadPathX(int pathfinderID,int pathLocation);
int ReadPathY(int pathfinderID,int pathLocation);
-void RenderScreen (bool stepByStep=false);
+void RenderScreen (bool stepByStep = false);
PATH_NODE *find_path(int pathfinderID,int startingX, int startingY, int targetX, int targetY);
void ReadPath(int pathfinderID);
diff --git a/src/being.cpp b/src/being.cpp
index 095a48ca..18b78289 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -22,7 +22,6 @@
*/
#include <stdio.h>
-
#include "astar.h"
#include "being.h"
diff --git a/src/being.h b/src/being.h
index ce6b8433..072cc9ae 100644
--- a/src/being.h
+++ b/src/being.h
@@ -24,7 +24,7 @@
#ifndef _TMW_BEING_H
#define _TMW_BEING_H
-#include "./net/protocol.h"
+#include "net/protocol.h"
#include <list>
struct PATH_NODE {
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 5ee5df87..e444ba7a 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -26,6 +26,7 @@
#include "../gui/textfield.h"
#include "../gui/status.h"
#include "../main.h"
+#include "../being.h"
SDL_Surface *screen;
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index b5104204..b0ee3076 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -29,6 +29,7 @@
#include "passwordfield.h"
#include "ok_dialog.h"
#include "../graphic/graphic.h"
+#include "../main.h"
LoginDialog::LoginDialog():
Window("Login")
diff --git a/src/gui/login.h b/src/gui/login.h
index 4acec971..43c9d23a 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -24,18 +24,10 @@
#ifndef _TMW_LOGIN_H
#define _TMW_LOGIN_H
-#ifdef WIN32
- #pragma warning (disable:4312)
-#endif
-
-#include "../main.h"
-#include "../log.h"
-#include "../net/network.h"
-#include "gui.h"
+#include <guichan.hpp>
+#include <string>
#include "window.h"
-extern Configuration config;
-
/**
* The login dialog.
*
diff --git a/src/main.cpp b/src/main.cpp
index c1d64426..17307209 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -262,7 +262,7 @@ void exit_engine() {
}
/** Main */
-int main() {
+int main(int argc, char *argv[]) {
init_engine();
SDL_Event event;
diff --git a/src/main.h b/src/main.h
index d88ceb13..9444f75b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -24,9 +24,9 @@
#ifndef _TMW_MAIN_H
#define _TMW_MAIN_H
-#include "configuration.h"
#include "gui/login.h"
#include "gui/gui.h"
+#include "configuration.h"
#include "graphic/spriteset.h"
#include "resources/image.h"
#include "log.h"
diff --git a/src/net/network.h b/src/net/network.h
index 73b6c9ef..2564c801 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -27,8 +27,7 @@
#ifndef WIN32
#include "win2linux.h"
#else
-#include "allegro.h"
-#include "winalleg.h"
+#include <winsock.h>
#endif
#include <stdio.h>
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
index 6a519a0f..bca630b1 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.cpp
@@ -21,7 +21,17 @@
* $Id$
*/
+#include "../main.h"
+#include "../being.h"
#include "protocol.h"
+#include "network.h"
+
+#ifdef WIN32
+#include <windows.h>
+#else
+#include "win2linux.h"
+#endif
+
short packet_lengths[] = {
10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 4cc66356..11eee3a9 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -24,16 +24,6 @@
#ifndef _TMW_PROTOCOL_H
#define _TMW_PROTOCOL_H
-#include "../main.h"
-#include "../being.h"
-
-#ifdef WIN32
-#include <windows.h>
-#else
-#include "win2linux.h"
-#endif
-
-
/** Packet length by id */
short get_length(short id);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-15 11:49:16 +0000