Updated Dev-Cpp project file, fixed a gcc 3.4 issue.

3 files changed, 226 insertions, 219 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e35a5d5..d078c71c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-06  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* The Mana World.dev, src/net/tradehandler.cpp: Updated Dev-Cpp project
+	file, fixed a gcc 3.4 issue.
+
 2006-02-06  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* src/Makefile.am, src/game.cpp, src/joystick.cpp, src/joystick.h,
diff --git a/The Mana World.dev b/The Mana World.dev
index 5dfa9aac..294e6363 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -27,7 +27,7 @@ CustomMakefile=
 IncludeVersionInfo=1
 SupportXPThemes=0
 CompilerSet=0
-CompilerSettings=0010001001001001001001
+CompilerSettings=0010001001000001001001
 
 [VersionInfo]
 Major=0
@@ -308,7 +308,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit72]
-FileName=src\gui\requesttrade.cpp
+FileName=src\gui\scrollarea.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -318,7 +318,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit73]
-FileName=src\gui\requesttrade.h
+FileName=src\gui\scrollarea.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -328,7 +328,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit74]
-FileName=src\gui\scrollarea.cpp
+FileName=src\gui\sell.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -348,7 +348,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit77]
-FileName=src\gui\sell.h
+FileName=src\gui\setup.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -358,7 +358,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit78]
-FileName=src\gui\setup.cpp
+FileName=src\gui\shop.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -368,7 +368,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit79]
-FileName=src\gui\setup.h
+FileName=src\gui\shop.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -378,7 +378,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit80]
-FileName=src\gui\shop.cpp
+FileName=src\gui\skill.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -388,7 +388,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit81]
-FileName=src\gui\shop.h
+FileName=src\gui\skill.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -398,7 +398,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit82]
-FileName=src\gui\skill.cpp
+FileName=src\gui\slider.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -408,7 +408,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit84]
-FileName=src\gui\slider.cpp
+FileName=src\gui\status.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -418,7 +418,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit85]
-FileName=src\gui\slider.h
+FileName=src\gui\status.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -428,7 +428,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit86]
-FileName=src\gui\status.cpp
+FileName=src\gui\textbox.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -438,7 +438,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit89]
-FileName=src\gui\textbox.h
+FileName=src\gui\textfield.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -448,7 +448,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit90]
-FileName=src\gui\textfield.cpp
+FileName=src\gui\trade.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -458,7 +458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit91]
-FileName=src\gui\textfield.h
+FileName=src\gui\trade.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -468,7 +468,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit92]
-FileName=src\gui\trade.cpp
+FileName=src\gui\window.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -478,7 +478,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit93]
-FileName=src\gui\trade.h
+FileName=src\gui\window.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -488,7 +488,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit94]
-FileName=src\gui\window.cpp
+FileName=src\gui\windowcontainer.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -498,9 +498,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit95]
-FileName=src\gui\window.h
+FileName=src\net\network.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -508,9 +508,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit96]
-FileName=src\gui\windowcontainer.cpp
+FileName=src\net\network.h
 CompileCpp=1
-Folder=gui/source
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -528,7 +528,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit97]
-FileName=src\net\network.cpp
+FileName=src\net\protocol.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -538,7 +538,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit98]
-FileName=src\net\network.h
+FileName=src\net\protocol.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -548,9 +548,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit99]
-FileName=src\net\protocol.cpp
+FileName=src\resources\soundeffect.h
 CompileCpp=1
-Folder=net/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -558,9 +558,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit100]
-FileName=src\net\protocol.h
+FileName=src\resources\buddylist.cpp
 CompileCpp=1
-Folder=net/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -568,7 +568,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit101]
-FileName=src\resources\soundeffect.h
+FileName=src\resources\buddylist.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -578,7 +578,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit102]
-FileName=src\resources\buddylist.cpp
+FileName=src\resources\image.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -588,7 +588,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit103]
-FileName=src\resources\buddylist.h
+FileName=src\resources\image.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -598,7 +598,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit104]
-FileName=src\resources\image.cpp
+FileName=src\resources\iteminfo.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -608,7 +608,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit106]
-FileName=src\resources\iteminfo.h
+FileName=src\resources\itemmanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -618,7 +618,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit109]
-FileName=src\resources\mapreader.cpp
+FileName=src\resources\music.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -638,7 +638,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit111]
-FileName=src\resources\music.cpp
+FileName=src\resources\resource.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -648,7 +648,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit112]
-FileName=src\resources\music.h
+FileName=src\resources\resource.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -658,7 +658,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit113]
-FileName=src\resources\resource.cpp
+FileName=src\resources\resourcemanager.cpp
 CompileCpp=1
 Folder=resources
 Link=1
@@ -668,7 +668,7 @@ BuildCmd=
 Compile=1
 
 [Unit114]
-FileName=src\resources\resource.h
+FileName=src\resources\resourcemanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -678,7 +678,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit115]
-FileName=src\resources\resourcemanager.cpp
+FileName=src\resources\soundeffect.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -688,9 +688,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit116]
-FileName=src\resources\resourcemanager.h
+FileName=src\gui\help.h
 CompileCpp=1
-Folder=resources
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -698,9 +698,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit117]
-FileName=src\resources\soundeffect.cpp
+FileName=src\gui\help.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -708,9 +708,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit118]
-FileName=src\gui\help.h
+FileName=src\gui\inttextbox.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -718,9 +718,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit119]
-FileName=src\gui\help.cpp
+FileName=src\gui\inttextbox.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -728,9 +728,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit120]
-FileName=src\gui\inttextbox.cpp
+FileName=src\gui\focushandler.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -738,9 +738,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit121]
-FileName=src\gui\inttextbox.h
+FileName=src\gui\focushandler.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -748,7 +748,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit122]
-FileName=src\gui\focushandler.h
+FileName=src\gui\popupmenu.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -758,7 +758,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit124]
-FileName=src\gui\popupmenu.h
+FileName=src\gui\browserbox.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -768,7 +768,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit125]
-FileName=src\gui\popupmenu.cpp
+FileName=src\gui\browserbox.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -778,7 +778,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit126]
-FileName=src\gui\browserbox.h
+FileName=src\gui\updatewindow.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -788,7 +788,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit127]
-FileName=src\gui\browserbox.cpp
+FileName=src\gui\updatewindow.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -798,9 +798,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit128]
-FileName=src\gui\updatewindow.h
+FileName=src\gui\box.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1198,7 +1198,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit75]
-FileName=src\gui\scrollarea.h
+FileName=src\gui\sell.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1208,7 +1208,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit76]
-FileName=src\gui\sell.cpp
+FileName=src\gui\setup.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1218,7 +1218,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit83]
-FileName=src\gui\skill.h
+FileName=src\gui\slider.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1228,7 +1228,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit87]
-FileName=src\gui\status.h
+FileName=src\gui\textbox.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1238,7 +1238,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit88]
-FileName=src\gui\textbox.cpp
+FileName=src\gui\textfield.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1248,7 +1248,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit107]
-FileName=src\resources\itemmanager.cpp
+FileName=src\resources\mapreader.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1258,7 +1258,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit108]
-FileName=src\resources\itemmanager.h
+FileName=src\resources\mapreader.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1268,7 +1268,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit123]
-FileName=src\gui\focushandler.cpp
+FileName=src\gui\popupmenu.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1278,9 +1278,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit129]
-FileName=src\gui\updatewindow.cpp
+FileName=src\gui\box.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1288,9 +1288,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit130]
-FileName=src\gui\box.cpp
+FileName=src\item.h
 CompileCpp=1
-Folder=gui/source
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1298,9 +1298,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit131]
-FileName=src\gui\box.h
+FileName=src\equipment.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1308,7 +1308,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit132]
-FileName=src\item.h
+FileName=src\equipment.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1318,7 +1318,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit133]
-FileName=src\equipment.cpp
+FileName=src\item.cpp
 CompileCpp=1
 Folder=
 Compile=1
@@ -1328,9 +1328,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit134]
-FileName=src\equipment.h
+FileName=src\gui\inventorywindow.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1338,9 +1338,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit135]
-FileName=src\item.cpp
+FileName=src\gui\inventorywindow.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1348,7 +1348,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit138]
-FileName=src\inventory.h
+FileName=src\configlistener.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1358,9 +1358,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit139]
-FileName=src\inventory.cpp
+FileName=src\graphic\imagerect.h
 CompileCpp=1
-Folder=
+Folder=graphic/header
 Compile=1
 Link=1
 Priority=1000
@@ -1368,7 +1368,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit140]
-FileName=src\configlistener.h
+FileName=src\guichanfwd.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1378,9 +1378,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit141]
-FileName=src\graphic\imagerect.h
+FileName=src\serverinfo.h
 CompileCpp=1
-Folder=graphic/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1388,7 +1388,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit142]
-FileName=src\guichanfwd.h
+FileName=src\openglgraphics.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1398,9 +1398,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit143]
-FileName=src\serverinfo.h
+FileName=src\openglgraphics.cpp
 CompileCpp=1
-Folder=header
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1408,9 +1408,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit144]
-FileName=src\openglgraphics.h
+FileName=src\gui\tabbedcontainer.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1418,9 +1418,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit145]
-FileName=src\openglgraphics.cpp
+FileName=src\gui\tabbedcontainer.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1428,9 +1428,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit146]
-FileName=src\gui\tabbedcontainer.h
+FileName=src\resources\sdlimageloader.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1438,9 +1438,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit147]
-FileName=src\gui\tabbedcontainer.cpp
+FileName=src\resources\sdlimageloader.h
 CompileCpp=1
-Folder=gui/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1448,9 +1448,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit148]
-FileName=src\resources\sdlimageloader.cpp
+FileName=src\net\messageout.cpp
 CompileCpp=1
-Folder=resources
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -1458,9 +1458,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit149]
-FileName=src\resources\sdlimageloader.h
+FileName=src\net\messageout.h
 CompileCpp=1
-Folder=resources
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -1478,7 +1478,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit150]
-FileName=src\net\messageout.cpp
+FileName=src\net\packet.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1488,7 +1488,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit151]
-FileName=src\net\messageout.h
+FileName=src\net\packet.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -1498,7 +1498,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit152]
-FileName=src\net\packet.cpp
+FileName=src\net\messagein.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1508,7 +1508,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit153]
-FileName=src\net\packet.h
+FileName=src\net\messagein.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -1518,9 +1518,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit154]
-FileName=src\net\messagein.cpp
+FileName=src\gui\menuwindow.cpp
 CompileCpp=1
-Folder=net/source
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1528,9 +1528,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit155]
-FileName=src\net\messagein.h
+FileName=src\gui\menuwindow.h
 CompileCpp=1
-Folder=net/header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1538,7 +1538,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit156]
-FileName=src\gui\menuwindow.cpp
+FileName=src\gui\ministatus.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1548,7 +1548,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit157]
-FileName=src\gui\menuwindow.h
+FileName=src\gui\ministatus.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1558,9 +1558,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit158]
-FileName=src\gui\ministatus.cpp
+FileName=src\resources\imagewriter.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1568,7 +1568,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit166]
-FileName=src\gui\connection.h
+FileName=src\gui\login.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1578,7 +1578,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit167]
-FileName=src\gui\connection.cpp
+FileName=src\gui\login.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1588,9 +1588,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit160]
-FileName=src\resources\imagewriter.cpp
+FileName=src\gui\debugwindow.h
 CompileCpp=1
-Folder=resources
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1598,9 +1598,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit161]
-FileName=src\resources\imagewriter.h
+FileName=src\gui\debugwindow.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1608,7 +1608,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit105]
-FileName=src\resources\image.h
+FileName=src\resources\itemmanager.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1618,7 +1618,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit110]
-FileName=src\resources\mapreader.h
+FileName=src\resources\music.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1628,9 +1628,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit159]
-FileName=src\gui\ministatus.h
+FileName=src\resources\imagewriter.h
 CompileCpp=1
-Folder=gui/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1638,9 +1638,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit162]
-FileName=src\gui\error.cpp
+FileName=src\gui\connection.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1648,9 +1648,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit163]
-FileName=src\gui\error.h
+FileName=src\gui\connection.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1658,7 +1658,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit164]
-FileName=src\gui\debugwindow.h
+FileName=src\gui\gccontainer.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1668,7 +1668,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit165]
-FileName=src\gui\debugwindow.cpp
+FileName=src\gui\gccontainer.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1678,7 +1678,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit168]
-FileName=src\gui\gccontainer.h
+FileName=src\gui\register.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1688,7 +1688,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit169]
-FileName=src\gui\gccontainer.cpp
+FileName=src\gui\register.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1698,9 +1698,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit170]
-FileName=src\gui\login.h
+FileName=src\tileset.h
 CompileCpp=1
-Folder=gui/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1708,9 +1708,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit171]
-FileName=src\gui\login.cpp
+FileName=src\properties.h
 CompileCpp=1
-Folder=gui/source
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1718,9 +1718,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit172]
-FileName=src\gui\register.h
+FileName=src\sprite.h
 CompileCpp=1
-Folder=gui/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1728,9 +1728,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit173]
-FileName=src\gui\register.cpp
+FileName=src\beingmanager.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1738,7 +1738,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit174]
-FileName=src\tileset.h
+FileName=src\beingmanager.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1748,7 +1748,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit176]
-FileName=src\sprite.h
+FileName=src\localplayer.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1758,9 +1758,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit177]
-FileName=src\beingmanager.cpp
+FileName=src\gui\npclistdialog.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1768,9 +1768,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit178]
-FileName=src\beingmanager.h
+FileName=src\gui\npclistdialog.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1778,9 +1778,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit136]
-FileName=src\gui\inventorywindow.h
+FileName=src\inventory.h
 CompileCpp=1
-Folder=gui/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1788,9 +1788,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit137]
-FileName=src\gui\inventorywindow.cpp
+FileName=src\inventory.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1808,9 +1808,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit175]
-FileName=src\properties.h
+FileName=src\localplayer.cpp
 CompileCpp=1
-Folder=header
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1838,7 +1838,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit179]
-FileName=src\localplayer.cpp
+FileName=src\npc.cpp
 CompileCpp=1
 Folder=
 Compile=1
@@ -1848,7 +1848,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit180]
-FileName=src\localplayer.h
+FileName=src\npc.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1858,9 +1858,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit181]
-FileName=src\gui\npclistdialog.cpp
+FileName=src\lockedarray.h
 CompileCpp=1
-Folder=gui/source
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
@@ -1868,9 +1868,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit182]
-FileName=src\gui\npclistdialog.h
+FileName=src\logindata.h
 CompileCpp=1
-Folder=gui/header
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
@@ -1878,9 +1878,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit183]
-FileName=src\npc.cpp
+FileName=src\monster.cpp
 CompileCpp=1
-Folder=
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
@@ -1888,9 +1888,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit184]
-FileName=src\npc.h
+FileName=src\monster.h
 CompileCpp=1
-Folder=header
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
@@ -1898,7 +1898,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit185]
-FileName=src\lockedarray.h
+FileName=src\player.cpp
 CompileCpp=1
 Folder=tmw
 Compile=1
@@ -1908,7 +1908,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit186]
-FileName=src\logindata.h
+FileName=src\player.h
 CompileCpp=1
 Folder=tmw
 Compile=1
@@ -1918,9 +1918,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit187]
-FileName=src\monster.cpp
+FileName=src\net\beinghandler.cpp
 CompileCpp=1
-Folder=tmw
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -1928,9 +1928,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit188]
-FileName=src\monster.h
+FileName=src\net\beinghandler.h
 CompileCpp=1
-Folder=tmw
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -1938,9 +1938,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit189]
-FileName=src\player.cpp
+FileName=src\net\buysellhandler.cpp
 CompileCpp=1
-Folder=tmw
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -1948,9 +1948,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit190]
-FileName=src\player.h
+FileName=src\net\buysellhandler.h
 CompileCpp=1
-Folder=tmw
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -1958,7 +1958,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit191]
-FileName=src\net\beinghandler.cpp
+FileName=src\net\charserverhandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -1968,7 +1968,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit192]
-FileName=src\net\beinghandler.h
+FileName=src\net\charserverhandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -1978,7 +1978,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit193]
-FileName=src\net\buysellhandler.cpp
+FileName=src\net\chathandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -1988,7 +1988,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit194]
-FileName=src\net\buysellhandler.h
+FileName=src\net\chathandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -1998,7 +1998,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit195]
-FileName=src\net\charserverhandler.cpp
+FileName=src\net\equipmenthandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2008,7 +2008,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit196]
-FileName=src\net\charserverhandler.h
+FileName=src\net\equipmenthandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2018,7 +2018,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit197]
-FileName=src\net\chathandler.cpp
+FileName=src\net\inventoryhandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2028,7 +2028,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit198]
-FileName=src\net\chathandler.h
+FileName=src\net\inventoryhandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2038,7 +2038,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit199]
-FileName=src\net\equipmenthandler.cpp
+FileName=src\net\itemhandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2048,7 +2048,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit200]
-FileName=src\net\equipmenthandler.h
+FileName=src\net\itemhandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2058,7 +2058,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit201]
-FileName=src\net\inventoryhandler.cpp
+FileName=src\net\loginhandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2068,7 +2068,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit202]
-FileName=src\net\inventoryhandler.h
+FileName=src\net\loginhandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2078,7 +2078,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit203]
-FileName=src\net\itemhandler.cpp
+FileName=src\net\maploginhandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2088,7 +2088,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit204]
-FileName=src\net\itemhandler.h
+FileName=src\net\maploginhandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2098,7 +2098,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit205]
-FileName=src\net\loginhandler.cpp
+FileName=src\net\messagehandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2108,7 +2108,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit206]
-FileName=src\net\loginhandler.h
+FileName=src\net\messagehandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2118,7 +2118,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit207]
-FileName=src\net\maploginhandler.cpp
+FileName=src\net\npchandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2128,7 +2128,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit208]
-FileName=src\net\maploginhandler.h
+FileName=src\net\npchandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2138,7 +2138,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit209]
-FileName=src\net\messagehandler.cpp
+FileName=src\net\playerhandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2148,7 +2148,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit210]
-FileName=src\net\messagehandler.h
+FileName=src\net\playerhandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2158,7 +2158,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit211]
-FileName=src\net\npchandler.cpp
+FileName=src\net\skillhandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2168,7 +2168,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit212]
-FileName=src\net\npchandler.h
+FileName=src\net\skillhandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2178,7 +2178,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit213]
-FileName=src\net\playerhandler.cpp
+FileName=src\net\tradehandler.cpp
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2188,7 +2188,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit214]
-FileName=src\net\playerhandler.h
+FileName=src\net\tradehandler.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -2198,9 +2198,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit215]
-FileName=src\net\skillhandler.cpp
+FileName=src\joystick.h
 CompileCpp=1
-Folder=net
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
@@ -2208,9 +2208,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit216]
-FileName=src\net\skillhandler.h
+FileName=src\flooritemmanager.cpp
 CompileCpp=1
-Folder=net
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
@@ -2218,9 +2218,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit217]
-FileName=src\net\tradehandler.cpp
+FileName=src\flooritemmanager.h
 CompileCpp=1
-Folder=net
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
@@ -2228,9 +2228,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit218]
-FileName=src\net\tradehandler.h
+FileName=src\joystick.cpp
 CompileCpp=1
-Folder=net
+Folder=tmw
 Compile=1
 Link=1
 Priority=1000
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 940c3e09..254ed3d1 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -66,25 +66,27 @@ void TradeHandler::handleMessage(MessageIn *msg)
     switch (msg->getId())
     {
         case SMSG_TRADE_REQUEST:
-            // If a trade window or request window is already open, send a
-            // trade cancel to any other trade request.
-            //
-            // Note that it would be nice if the server would prevent this
-            // situation, and that the requesting player would get a
-            // special message about the player being occupied.
-            if (!player_node->tradeRequestOk())
             {
-                player_node->tradeReply(false);
-                break;
+                // If a trade window or request window is already open, send a
+                // trade cancel to any other trade request.
+                //
+                // Note that it would be nice if the server would prevent this
+                // situation, and that the requesting player would get a
+                // special message about the player being occupied.
+                if (!player_node->tradeRequestOk())
+                {
+                    player_node->tradeReply(false);
+                    break;
+                }
+                
+                player_node->setTrading(true);
+                tradePartnerName = msg->readString(24);
+                ConfirmDialog *dlg;
+                dlg = new ConfirmDialog("Request for trade",
+                        tradePartnerName +
+                        " wants to trade with you, do you accept?");
+                dlg->addActionListener(&requestTradeListener);
             }
-
-            player_node->setTrading(true);
-            tradePartnerName = msg->readString(24);
-            ConfirmDialog *dlg;
-            dlg = new ConfirmDialog("Request for trade",
-                    tradePartnerName +
-                    " wants to trade with you, do you accept?");
-            dlg->addActionListener(&requestTradeListener);
             break;
 
         case SMSG_TRADE_RESPONSE: