Updated project files. Warning: Dev-Cpp will now build objects in the source folder

3 files changed, 420 insertions, 121 deletions

diff --git a/ChangeLog b/ChangeLog
index 663c53b1..16171bd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-05  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* The Mana World.dev, tmw.cbp: Updated project files. Warning: Dev-Cpp
+	will now build objects in the source folder.
+
 2006-11-05  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/images/login_wallpaper.png: Reverted to standard
diff --git a/The Mana World.dev b/The Mana World.dev
index bff3b310..97e16cb0 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=The Mana World.dev
 Name=tmw
-UnitCount=239
+UnitCount=261
 Type=0
 Ver=1
 ObjFiles=
@@ -16,11 +16,11 @@ Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_imag
 IsCpp=1
 Icon=
 ExeOutput=
-ObjectOutput=obj
+ObjectOutput=
 OverrideOutput=1
 OverrideOutputName=tmw.exe
 HostApplication=
-Folders=graphic,graphic/header,graphic/source,gui,gui/header,gui/source,header,net,net/header,net/source,resources,utils
+Folders=graphic,graphic/header,graphic/source,gui,gui/header,gui/source,header,net,net/accountserver,net/chatserver,net/gameserver,net/header,net/source,resources,utils
 CommandLine=
 UseCustomMakefile=0
 CustomMakefile=
@@ -1988,26 +1988,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit195]
-FileName=src\net\maploginhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit196]
-FileName=src\net\maploginhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit197]
 FileName=src\net\messagehandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2017,7 +1997,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit198]
+[Unit196]
 FileName=src\net\messagehandler.h
 CompileCpp=1
 Folder=net/header
@@ -2027,7 +2007,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit199]
+[Unit197]
 FileName=src\net\npchandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2037,7 +2017,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit200]
+[Unit198]
 FileName=src\net\npchandler.h
 CompileCpp=1
 Folder=net/header
@@ -2047,7 +2027,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit201]
+[Unit199]
 FileName=src\net\playerhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2057,7 +2037,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit202]
+[Unit200]
 FileName=src\net\playerhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2067,7 +2047,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit203]
+[Unit201]
 FileName=src\net\skillhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2077,7 +2057,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit204]
+[Unit202]
 FileName=src\net\skillhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2087,7 +2067,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit205]
+[Unit203]
 FileName=src\net\tradehandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2097,7 +2077,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit206]
+[Unit204]
 FileName=src\net\tradehandler.h
 CompileCpp=1
 Folder=net/header
@@ -2107,7 +2087,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit207]
+[Unit205]
 FileName=src\joystick.h
 CompileCpp=1
 Folder=header
@@ -2117,7 +2097,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit208]
+[Unit206]
 FileName=src\flooritemmanager.cpp
 CompileCpp=1
 Folder=
@@ -2127,7 +2107,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit209]
+[Unit207]
 FileName=src\flooritemmanager.h
 CompileCpp=1
 Folder=header
@@ -2137,7 +2117,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit210]
+[Unit208]
 FileName=src\joystick.cpp
 CompileCpp=1
 Folder=
@@ -2147,7 +2127,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit211]
+[Unit209]
 FileName=src\gui\setup_video.h
 CompileCpp=1
 Folder=gui/header
@@ -2157,7 +2137,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit212]
+[Unit210]
 FileName=src\gui\setup_audio.h
 CompileCpp=1
 Folder=gui/header
@@ -2167,7 +2147,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit213]
+[Unit211]
 FileName=src\gui\setup_joystick.h
 CompileCpp=1
 Folder=gui/header
@@ -2177,7 +2157,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit214]
+[Unit212]
 FileName=src\gui\setup_video.cpp
 CompileCpp=1
 Folder=gui/source
@@ -2187,7 +2167,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit215]
+[Unit213]
 FileName=src\gui\setup_audio.cpp
 CompileCpp=1
 Folder=gui/source
@@ -2197,7 +2177,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit216]
+[Unit214]
 FileName=src\gui\setup_joystick.cpp
 CompileCpp=1
 Folder=gui/source
@@ -2207,7 +2187,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit217]
+[Unit215]
 FileName=src\gui\setuptab.h
 CompileCpp=1
 Folder=gui/header
@@ -2217,7 +2197,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit218]
+[Unit216]
 FileName=src\animation.h
 CompileCpp=1
 Folder=
@@ -2227,7 +2207,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit219]
+[Unit217]
 FileName=src\animation.cpp
 CompileCpp=1
 Folder=
@@ -2237,7 +2217,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit220]
+[Unit218]
 FileName=src\utils\dtor.h
 CompileCpp=1
 Folder=utils
@@ -2247,7 +2227,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit221]
+[Unit219]
 FileName=src\utils\tostring.h
 CompileCpp=1
 Folder=utils
@@ -2257,7 +2237,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit222]
+[Unit220]
 FileName=src\tmw.rc
 CompileCpp=1
 Folder=resources
@@ -2267,7 +2247,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit223]
+[Unit221]
 FileName=src\resources\spriteset.cpp
 CompileCpp=1
 Folder=resources
@@ -2277,7 +2257,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit224]
+[Unit222]
 FileName=src\resources\spriteset.h
 CompileCpp=1
 Folder=resources
@@ -2287,7 +2267,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit225]
+[Unit223]
 FileName=src\resources\openglsdlimageloader.cpp
 CompileCpp=1
 Folder=resources
@@ -2297,7 +2277,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit226]
+[Unit224]
 FileName=src\resources\openglsdlimageloader.h
 CompileCpp=1
 Folder=resources
@@ -2307,7 +2287,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit227]
+[Unit225]
 FileName=src\animatedsprite.cpp
 CompileCpp=1
 Folder=
@@ -2317,7 +2297,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit228]
+[Unit226]
 FileName=src\animatedsprite.h
 CompileCpp=1
 Folder=
@@ -2327,7 +2307,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit229]
+[Unit227]
 FileName=src\gui\hbox.cpp
 CompileCpp=1
 Folder=
@@ -2337,17 +2317,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit230]
+[Unit228]
 FileName=src\gui\hbox.h
+CompileCpp=1
 Folder=
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
-CompileCpp=1
 
-[Unit231]
+[Unit229]
 FileName=src\gui\linkhandler.h
 CompileCpp=1
 Folder=
@@ -2357,17 +2337,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit232]
+[Unit230]
 FileName=src\gui\newskill.cpp
-CompileCpp=1
 Folder=
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
+CompileCpp=1
 
-[Unit233]
+[Unit231]
 FileName=src\gui\newskill.h
 CompileCpp=1
 Folder=
@@ -2377,7 +2357,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit234]
+[Unit232]
 FileName=src\gui\vbox.cpp
 CompileCpp=1
 Folder=
@@ -2387,7 +2367,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit235]
+[Unit233]
 FileName=src\gui\vbox.h
 CompileCpp=1
 Folder=
@@ -2397,8 +2377,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit238]
-FileName=src\resources\iteminfo.cpp
+[Unit234]
+FileName=src\resources\ambientoverlay.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -2407,8 +2387,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit239]
-FileName=src\resources\iteminfo.h
+[Unit235]
+FileName=src\resources\ambientoverlay.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -2417,10 +2397,30 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit238]
+FileName=src\net\accountserver\account.cpp
+CompileCpp=1
+Folder=net/accountserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit239]
+FileName=src\net\accountserver\account.h
+CompileCpp=1
+Folder=net/accountserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit240]
-FileName=..\tmw\src\resources\iteminfo.h
+FileName=src\net\accountserver\accountserver.cpp
 CompileCpp=1
-Folder=tmw
+Folder=net/accountserver
 Compile=1
 Link=1
 Priority=1000
@@ -2458,7 +2458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit236]
-FileName=src\resources\ambientoverlay.cpp
+FileName=src\resources\iteminfo.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -2468,7 +2468,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit237]
-FileName=src\resources\ambientoverlay.h
+FileName=src\resources\iteminfo.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -2476,3 +2476,214 @@ Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
+
+[Unit241]
+FileName=src\net\accountserver\accountserver.h
+CompileCpp=1
+Folder=net/accountserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit242]
+FileName=src\net\accountserver\internal.cpp
+CompileCpp=1
+Folder=net/accountserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CPP) -c internal.cpp -o .objs/net/accountserver/internal.o $(CXXFLAGS)
+
+[Unit243]
+FileName=src\net\accountserver\internal.h
+CompileCpp=1
+Folder=net/accountserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit244]
+FileName=src\net\chatserver\chatserver.cpp
+CompileCpp=1
+Folder=net/chatserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit245]
+FileName=src\net\chatserver\chatserver.h
+CompileCpp=1
+Folder=net/chatserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit246]
+FileName=src\net\chatserver\internal.cpp
+CompileCpp=1
+Folder=net/chatserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CPP) -c internal.cpp -o .objs/net/chatserver/internal.o $(CXXFLAGS)
+
+[Unit247]
+FileName=src\net\chatserver\internal.h
+CompileCpp=1
+Folder=net/chatserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit248]
+FileName=src\net\gameserver\player.h
+CompileCpp=1
+Folder=net/gameserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit249]
+FileName=src\net\gameserver\gameserver.cpp
+CompileCpp=1
+Folder=net/gameserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit250]
+FileName=src\net\gameserver\gameserver.h
+CompileCpp=1
+Folder=net/gameserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit251]
+FileName=src\net\gameserver\internal.cpp
+CompileCpp=1
+Folder=net/gameserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CPP) -c internal.cpp -o .objs/net/gameserver/internal.o $(CXXFLAGS)
+
+[Unit252]
+FileName=src\net\gameserver\internal.h
+CompileCpp=1
+Folder=net/gameserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit253]
+FileName=src\net\gameserver\player.cpp
+CompileCpp=1
+Folder=net/gameserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit254]
+FileName=src\net\connection.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit255]
+FileName=src\net\connection.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit256]
+FileName=src\gui\serverdialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit257]
+FileName=src\gui\serverdialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit258]
+FileName=src\net\internal.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit259]
+FileName=src\net\internal.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit260]
+FileName=src\gui\widgets\dropdown.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit261]
+FileName=src\gui\widgets\dropdown.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/tmw.cbp b/tmw.cbp
index 492ace6f..dc287f78 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -21,22 +21,23 @@
 					<Add option="-DUSE_OPENGL"/>
 				</Compiler>
 				<Linker>
-					<Add option="-lguichan"/>
-					<Add option="-lguichan_sdl"/>
-					<Add option="-lguichan_opengl"/>
-					<Add option="-lwsock32"/>
-					<Add option="-lSDL_image.dll"/>
-					<Add option="-lSDL_mixer.dll"/>
-					<Add option="-lenet"/>
-					<Add option="-lmingw32"/>
-					<Add option="-lSDLmain"/>
-					<Add option="-lSDL.dll"/>
-					<Add option="-lxml2.dll"/>
-					<Add option="-lopengl32"/>
-					<Add option="-lpng12.dll"/>
-					<Add option="-lz.dll"/>
-					<Add option="-lphysfs"/>
-					<Add option="-lcurl"/>
+					<Add library="mingw32"/>
+					<Add library="enet"/>
+					<Add library="ws2_32"/>
+					<Add library="winmm"/>
+					<Add library="opengl32"/>
+					<Add library="guichan"/>
+					<Add library="guichan_sdl"/>
+					<Add library="guichan_opengl"/>
+					<Add library="SDL_image.dll"/>
+					<Add library="SDL_mixer.dll"/>
+					<Add library="SDLmain"/>
+					<Add library="SDL.dll"/>
+					<Add library="xml2.dll"/>
+					<Add library="png12.dll"/>
+					<Add library="z.dll"/>
+					<Add library="physfs"/>
+					<Add library="curl"/>
 				</Linker>
 			</Target>
 		</Build>
@@ -111,6 +112,12 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\defines.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\engine.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -247,16 +254,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\gui\char_server.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\gui\char_server.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\gui\chargedialog.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -593,6 +590,12 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\gui\selectionlistener.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\gui\sell.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -759,6 +762,16 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\gui\widgets\dropdown.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\gui\widgets\dropdown.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\gui\window.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -877,6 +890,36 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\net\accountserver\account.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\accountserver\account.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\accountserver\accountserver.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\accountserver\accountserver.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\accountserver\internal.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\accountserver\internal.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\net\beinghandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -917,6 +960,36 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\net\chatserver\chatserver.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\chatserver\chatserver.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\chatserver\internal.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\chatserver\internal.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\connection.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\connection.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\net\equipmenthandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -927,121 +1000,131 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\inventoryhandler.cpp">
+		<Unit filename="src\net\gameserver\gameserver.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\inventoryhandler.h">
+		<Unit filename="src\net\gameserver\gameserver.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\itemhandler.cpp">
+		<Unit filename="src\net\gameserver\internal.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\itemhandler.h">
+		<Unit filename="src\net\gameserver\internal.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\loginhandler.cpp">
+		<Unit filename="src\net\gameserver\player.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\loginhandler.h">
+		<Unit filename="src\net\gameserver\player.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\maploginhandler.cpp">
+		<Unit filename="src\net\internal.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\maploginhandler.h">
+		<Unit filename="src\net\internal.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\messagehandler.cpp">
+		<Unit filename="src\net\inventoryhandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\messagehandler.h">
+		<Unit filename="src\net\inventoryhandler.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\messagein.cpp">
+		<Unit filename="src\net\itemhandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\messagein.h">
+		<Unit filename="src\net\itemhandler.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\messageout.cpp">
+		<Unit filename="src\net\loginhandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\messageout.h">
+		<Unit filename="src\net\loginhandler.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\network.cpp">
+		<Unit filename="src\net\messagehandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\network.h">
+		<Unit filename="src\net\messagehandler.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\npchandler.cpp">
+		<Unit filename="src\net\messagein.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\npchandler.h">
+		<Unit filename="src\net\messagein.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\packet.cpp">
+		<Unit filename="src\net\messageout.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\packet.h">
+		<Unit filename="src\net\messageout.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\playerhandler.cpp">
+		<Unit filename="src\net\network.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\playerhandler.h">
+		<Unit filename="src\net\network.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\npchandler.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\net\npchandler.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\protocol.cpp">
+		<Unit filename="src\net\playerhandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\net\protocol.h">
+		<Unit filename="src\net\playerhandler.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>