summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mana.cbp14
-rw-r--r--src/net/manaserv/messagein.cpp4
2 files changed, 4 insertions, 14 deletions
diff --git a/mana.cbp b/mana.cbp
index c3e2e7f7..9be8a006 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -11,7 +11,6 @@
<Option object_output=".objs\ea" />
<Option type="0" />
<Option compiler="gcc" />
- <Option parameters='-u -d &quot;D:/mana/data&quot;' />
<Option projectResourceIncludeDirsRelation="0" />
<Compiler>
<Add option="-O3" />
@@ -22,6 +21,7 @@
<Add option="-DEATHENA_SUPPORT" />
</Compiler>
<Linker>
+ <Add option="-enable-auto-import" />
<Add library="guichan" />
<Add library="guichan_sdl" />
<Add library="guichan_opengl" />
@@ -80,7 +80,6 @@
<Option object_output=".objs\manaserv" />
<Option type="0" />
<Option compiler="gcc" />
- <Option parameters='-u -d &quot;D:/mana/data&quot;' />
<Option projectResourceIncludeDirsRelation="0" />
<Compiler>
<Add option="-O3" />
@@ -91,6 +90,7 @@
<Add option="-DMANASERV_SUPPORT" />
</Compiler>
<Linker>
+ <Add option="-enable-auto-import" />
<Add library="guichan" />
<Add library="guichan_sdl" />
<Add library="guichan_opengl" />
@@ -313,14 +313,8 @@
<Unit filename="src\gui\table.h" />
<Unit filename="src\gui\tablemodel.cpp" />
<Unit filename="src\gui\tablemodel.h" />
- <Unit filename="src\gui\textdialog.cpp">
- <Option target="Manaserv" />
- <Option target="Unix Manaserv" />
- </Unit>
- <Unit filename="src\gui\textdialog.h">
- <Option target="Manaserv" />
- <Option target="Unix Manaserv" />
- </Unit>
+ <Unit filename="src\gui\textdialog.cpp" />
+ <Unit filename="src\gui\textdialog.h" />
<Unit filename="src\gui\textrenderer.h" />
<Unit filename="src\gui\trade.cpp" />
<Unit filename="src\gui\trade.h" />
diff --git a/src/net/manaserv/messagein.cpp b/src/net/manaserv/messagein.cpp
index 8a7053f8..841abbcc 100644
--- a/src/net/manaserv/messagein.cpp
+++ b/src/net/manaserv/messagein.cpp
@@ -23,10 +23,6 @@
#include <enet/enet.h>
-#define MAKEWORD(low,high) \
- ((unsigned short)(((unsigned char)(low)) | \
- ((unsigned short)((unsigned char)(high))) << 8))
-
namespace ManaServ {
MessageIn::MessageIn(const char *data, unsigned int length):