Cleaned Dev-Cpp project file, added new items definitions and new maps and tilesets.

2 files changed, 175 insertions, 169 deletions

diff --git a/ChangeLog b/ChangeLog
index 622f8dd1..6a6f04d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-12-12  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* The Mana World.dev, data/graphics/tiles/Makefile.am, data/items.xml,
+	data/maps/Makefile.am, data/graphics/tiles/Woodland.png,
+	data/graphics/tiles/snowset.png, data/maps/new_9-1.tmx.gz,
+	data/maps/new_10-1.tmx.gz: Cleaned Dev-Cpp project file, added new
+	items definitions and new maps and tilesets.
+
+2005-12-08  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* data/graphics/sprites/monster11.png,
+	data/graphics/sprites/monster12.png, data/graphics/sprites/monster13.png,
+	data/graphics/sprites/monster14.png, data/graphics/sprites/Makefile.am,
+	data/graphics/sprites/items.png, data/graphics/sprites/npcs.png,: Added
+	new monsters, items and npcs.
+
 2005-12-05  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/main.h, src/main.cpp: Display TMW version on Windows too.
diff --git a/The Mana World.dev b/The Mana World.dev
index 1677110c..d1ee981e 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,11 +1,11 @@
 [Project]
 FileName=The Mana World.dev
 Name=tmw
-UnitCount=176
+UnitCount=174
 Type=0
 Ver=1
 ObjFiles=
-Includes=C:\Dev-Cpp\include\SDL
+Includes=
 Libs=
 PrivateResource=The_Mana_World_private.rc
 ResourceIncludes=
@@ -298,7 +298,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit69]
-FileName=src\gui\ok_dialog.h
+FileName=src\gui\passwordfield.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -308,7 +308,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit70]
-FileName=src\gui\passwordfield.cpp
+FileName=src\gui\playerbox.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -318,7 +318,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit71]
-FileName=src\gui\passwordfield.h
+FileName=src\gui\playerbox.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -328,7 +328,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit72]
-FileName=src\gui\playerbox.cpp
+FileName=src\gui\progressbar.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -338,7 +338,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit73]
-FileName=src\gui\playerbox.h
+FileName=src\gui\progressbar.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -348,7 +348,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit74]
-FileName=src\gui\progressbar.cpp
+FileName=src\gui\radiobutton.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -368,7 +368,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit77]
-FileName=src\gui\radiobutton.h
+FileName=src\gui\requesttrade.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -378,7 +378,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit78]
-FileName=src\gui\requesttrade.cpp
+FileName=src\gui\scrollarea.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -388,7 +388,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit79]
-FileName=src\gui\requesttrade.h
+FileName=src\gui\scrollarea.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -398,7 +398,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit80]
-FileName=src\gui\scrollarea.cpp
+FileName=src\gui\sell.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -408,7 +408,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit81]
-FileName=src\gui\scrollarea.h
+FileName=src\gui\sell.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -418,7 +418,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit82]
-FileName=src\gui\sell.cpp
+FileName=src\gui\setup.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -428,7 +428,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit84]
-FileName=src\gui\setup.cpp
+FileName=src\gui\shop.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -438,7 +438,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit85]
-FileName=src\gui\setup.h
+FileName=src\gui\shop.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -448,7 +448,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit86]
-FileName=src\gui\shop.cpp
+FileName=src\gui\skill.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -458,7 +458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit89]
-FileName=src\gui\skill.h
+FileName=src\gui\slider.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -468,7 +468,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit90]
-FileName=src\gui\slider.cpp
+FileName=src\gui\status.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -478,7 +478,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit91]
-FileName=src\gui\slider.h
+FileName=src\gui\status.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -488,7 +488,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit92]
-FileName=src\gui\status.cpp
+FileName=src\gui\textbox.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -498,7 +498,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit93]
-FileName=src\gui\status.h
+FileName=src\gui\textbox.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -508,7 +508,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit94]
-FileName=src\gui\textbox.cpp
+FileName=src\gui\textfield.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -518,7 +518,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit95]
-FileName=src\gui\textbox.h
+FileName=src\gui\textfield.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -528,7 +528,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit96]
-FileName=src\gui\textfield.cpp
+FileName=src\gui\trade.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -548,7 +548,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit97]
-FileName=src\gui\textfield.h
+FileName=src\gui\trade.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -558,7 +558,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit98]
-FileName=src\gui\trade.cpp
+FileName=src\gui\window.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -568,7 +568,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit99]
-FileName=src\gui\trade.h
+FileName=src\gui\window.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -578,7 +578,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit100]
-FileName=src\gui\window.cpp
+FileName=src\gui\windowcontainer.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -588,9 +588,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit101]
-FileName=src\gui\window.h
+FileName=src\net\network.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -598,9 +598,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit102]
-FileName=src\gui\windowcontainer.cpp
+FileName=src\net\network.h
 CompileCpp=1
-Folder=gui/source
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -608,7 +608,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit103]
-FileName=src\net\network.cpp
+FileName=src\net\protocol.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -618,7 +618,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit104]
-FileName=src\net\network.h
+FileName=src\net\protocol.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -628,9 +628,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit106]
-FileName=src\net\protocol.h
+FileName=src\resources\buddylist.cpp
 CompileCpp=1
-Folder=net/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -638,7 +638,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit109]
-FileName=src\resources\buddylist.h
+FileName=src\resources\image.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -658,7 +658,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit111]
-FileName=src\resources\image.h
+FileName=src\resources\itemmanager.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -668,7 +668,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit112]
-FileName=src\resources\iteminfo.h
+FileName=src\resources\itemmanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -678,7 +678,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit113]
-FileName=src\resources\itemmanager.cpp
+FileName=src\resources\mapreader.cpp
 CompileCpp=1
 Folder=resources
 Link=1
@@ -688,7 +688,7 @@ BuildCmd=
 Compile=1
 
 [Unit114]
-FileName=src\resources\itemmanager.h
+FileName=src\resources\mapreader.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -698,7 +698,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit115]
-FileName=src\resources\mapreader.cpp
+FileName=src\resources\music.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -708,7 +708,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit116]
-FileName=src\resources\mapreader.h
+FileName=src\resources\music.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -718,7 +718,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit117]
-FileName=src\resources\music.cpp
+FileName=src\resources\resource.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -728,7 +728,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit118]
-FileName=src\resources\music.h
+FileName=src\resources\resource.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -738,7 +738,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit119]
-FileName=src\resources\resource.cpp
+FileName=src\resources\resourcemanager.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -748,7 +748,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit120]
-FileName=src\resources\resource.h
+FileName=src\resources\resourcemanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -758,7 +758,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit121]
-FileName=src\resources\resourcemanager.cpp
+FileName=src\resources\soundeffect.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -768,9 +768,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit122]
-FileName=src\resources\resourcemanager.h
+FileName=src\gui\help.h
 CompileCpp=1
-Folder=resources
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -778,9 +778,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit124]
-FileName=src\gui\help.h
+FileName=src\gui\inttextbox.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -788,9 +788,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit125]
-FileName=src\gui\help.cpp
+FileName=src\gui\inttextbox.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -798,9 +798,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit126]
-FileName=src\gui\inttextbox.cpp
+FileName=src\gui\focushandler.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -808,9 +808,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit127]
-FileName=src\gui\inttextbox.h
+FileName=src\gui\focushandler.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -818,7 +818,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit128]
-FileName=src\gui\focushandler.h
+FileName=src\gui\popupmenu.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1157,18 +1157,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit62]
-FileName=src\gui\newskill.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
 [Unit63]
-FileName=src\gui\newskill.h
+FileName=src\gui\npc.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1178,7 +1168,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit64]
-FileName=src\gui\npc.cpp
+FileName=src\gui\npc_text.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1188,7 +1178,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit65]
-FileName=src\gui\npc.h
+FileName=src\gui\npc_text.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1198,7 +1188,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit66]
-FileName=src\gui\npc_text.cpp
+FileName=src\gui\ok_dialog.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1208,7 +1198,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit67]
-FileName=src\gui\npc_text.h
+FileName=src\gui\ok_dialog.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1218,7 +1208,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit68]
-FileName=src\gui\ok_dialog.cpp
+FileName=src\gui\passwordfield.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1228,7 +1218,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit75]
-FileName=src\gui\progressbar.h
+FileName=src\gui\radiobutton.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1238,7 +1228,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit76]
-FileName=src\gui\radiobutton.cpp
+FileName=src\gui\requesttrade.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1248,7 +1238,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit83]
-FileName=src\gui\sell.h
+FileName=src\gui\setup.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1258,7 +1248,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit87]
-FileName=src\gui\shop.h
+FileName=src\gui\skill.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1268,7 +1258,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit88]
-FileName=src\gui\skill.cpp
+FileName=src\gui\slider.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1278,7 +1268,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit107]
-FileName=src\resources\soundeffect.h
+FileName=src\resources\buddylist.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1288,7 +1278,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit108]
-FileName=src\resources\buddylist.cpp
+FileName=src\resources\image.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1298,9 +1288,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit123]
-FileName=src\resources\soundeffect.cpp
+FileName=src\gui\help.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1308,7 +1298,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit129]
-FileName=src\gui\focushandler.cpp
+FileName=src\gui\popupmenu.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1318,7 +1308,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit130]
-FileName=src\gui\popupmenu.h
+FileName=src\gui\browserbox.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1328,7 +1318,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit131]
-FileName=src\gui\popupmenu.cpp
+FileName=src\gui\browserbox.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1338,7 +1328,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit132]
-FileName=src\gui\browserbox.h
+FileName=src\gui\updatewindow.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1348,7 +1338,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit133]
-FileName=src\gui\browserbox.cpp
+FileName=src\gui\updatewindow.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1358,9 +1348,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit134]
-FileName=src\gui\updatewindow.h
+FileName=src\gui\box.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1368,9 +1358,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit135]
-FileName=src\gui\updatewindow.cpp
+FileName=src\gui\box.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1378,7 +1368,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit138]
-FileName=src\item.h
+FileName=src\equipment.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1388,7 +1378,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit139]
-FileName=src\equipment.cpp
+FileName=src\item.cpp
 CompileCpp=1
 Folder=
 Compile=1
@@ -1398,9 +1388,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit140]
-FileName=src\equipment.h
+FileName=src\gui\inventorywindow.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1408,9 +1398,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit141]
-FileName=src\item.cpp
+FileName=src\gui\inventorywindow.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1418,9 +1408,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit142]
-FileName=src\gui\inventorywindow.h
+FileName=src\inventory.h
 CompileCpp=1
-Folder=gui/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1428,9 +1418,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit143]
-FileName=src\gui\inventorywindow.cpp
+FileName=src\inventory.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1438,7 +1428,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit144]
-FileName=src\inventory.h
+FileName=src\configlistener.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1448,9 +1438,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit145]
-FileName=src\inventory.cpp
+FileName=src\graphic\imagerect.h
 CompileCpp=1
-Folder=
+Folder=graphic/header
 Compile=1
 Link=1
 Priority=1000
@@ -1458,7 +1448,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit146]
-FileName=src\configlistener.h
+FileName=src\guichanfwd.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1468,9 +1458,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit147]
-FileName=src\graphic\imagerect.h
+FileName=src\playerinfo.h
 CompileCpp=1
-Folder=graphic/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1478,7 +1468,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit148]
-FileName=src\guichanfwd.h
+FileName=src\serverinfo.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1488,7 +1478,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit149]
-FileName=src\playerinfo.h
+FileName=src\openglgraphics.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1508,9 +1498,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit150]
-FileName=src\serverinfo.h
+FileName=src\openglgraphics.cpp
 CompileCpp=1
-Folder=header
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1518,9 +1508,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit151]
-FileName=src\openglgraphics.h
+FileName=src\gui\tabbedcontainer.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1528,9 +1518,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit152]
-FileName=src\openglgraphics.cpp
+FileName=src\gui\tabbedcontainer.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1538,9 +1528,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit153]
-FileName=src\gui\tabbedcontainer.h
+FileName=src\resources\sdlimageloader.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1548,9 +1538,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit154]
-FileName=src\gui\tabbedcontainer.cpp
+FileName=src\resources\sdlimageloader.h
 CompileCpp=1
-Folder=gui/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1558,9 +1548,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit155]
-FileName=src\resources\sdlimageloader.cpp
+FileName=src\net\messageout.cpp
 CompileCpp=1
-Folder=resources
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -1568,9 +1558,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit156]
-FileName=src\resources\sdlimageloader.h
+FileName=src\net\messageout.h
 CompileCpp=1
-Folder=resources
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -1578,7 +1568,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit157]
-FileName=src\net\messageout.cpp
+FileName=src\net\packet.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1588,7 +1578,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit158]
-FileName=src\net\messageout.h
+FileName=src\net\packet.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -1598,9 +1588,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit166]
-FileName=src\gui\ministatus.h
+FileName=src\resources\imagewriter.h
 CompileCpp=1
-Folder=gui/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1608,9 +1598,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit167]
-FileName=src\resources\imagewriter.cpp
+FileName=src\gui\error.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1618,7 +1608,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit160]
-FileName=src\net\packet.h
+FileName=src\net\messagein.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -1628,9 +1618,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit161]
-FileName=src\net\messagein.cpp
+FileName=src\gui\menuwindow.cpp
 CompileCpp=1
-Folder=net/source
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1638,9 +1628,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit105]
-FileName=src\net\protocol.cpp
+FileName=src\resources\soundeffect.h
 CompileCpp=1
-Folder=net/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1648,7 +1638,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit110]
-FileName=src\resources\image.cpp
+FileName=src\resources\iteminfo.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1658,7 +1648,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit159]
-FileName=src\net\packet.cpp
+FileName=src\net\messagein.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1668,9 +1658,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit162]
-FileName=src\net\messagein.h
+FileName=src\gui\menuwindow.h
 CompileCpp=1
-Folder=net/header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1678,7 +1668,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit163]
-FileName=src\gui\menuwindow.cpp
+FileName=src\gui\ministatus.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1688,7 +1678,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit164]
-FileName=src\gui\menuwindow.h
+FileName=src\gui\ministatus.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1698,9 +1688,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit165]
-FileName=src\gui\ministatus.cpp
+FileName=src\resources\imagewriter.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1708,9 +1698,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit168]
-FileName=src\resources\imagewriter.h
+FileName=src\gui\error.h
 CompileCpp=1
-Folder=resources
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1718,9 +1708,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit169]
-FileName=src\gui\error.cpp
+FileName=src\gui\debugwindow.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1728,9 +1718,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit170]
-FileName=src\gui\error.h
+FileName=src\gui\debugwindow.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1738,7 +1728,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit171]
-FileName=src\gui\debugwindow.h
+FileName=src\gui\connection.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1748,7 +1738,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit172]
-FileName=src\gui\debugwindow.cpp
+FileName=src\gui\connection.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1758,7 +1748,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit173]
-FileName=src\gui\connection.h
+FileName=src\gui\gccontainer.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1768,7 +1758,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit174]
-FileName=src\gui\connection.cpp
+FileName=src\gui\gccontainer.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1777,16 +1767,6 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit175]
-FileName=src\gui\gccontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
 [Unit176]
 FileName=src\gui\gccontainer.cpp
 CompileCpp=1
@@ -1818,9 +1798,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit136]
-FileName=src\gui\box.cpp
+FileName=src\item.h
 CompileCpp=1
-Folder=gui/source
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1828,9 +1808,19 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit137]
-FileName=src\gui\box.h
+FileName=src\equipment.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit62]
+FileName=src\gui\npc.cpp
+CompileCpp=1
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000