Updated project files

3 files changed, 284 insertions, 200 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b8e5f74..5fe346c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-30  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* The Mana World.dev, tmw.cbp: Updated project files.
+
 2006-11-29  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/resources/equipment.h: Made getSprite return a constant reference
diff --git a/The Mana World.dev b/The Mana World.dev
index fa5a6090..1c1bd279 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=The Mana World.dev
 Name=tmw
-UnitCount=245
+UnitCount=251
 Type=0
 Ver=1
 ObjFiles=
@@ -588,7 +588,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit103]
-FileName=src\resources\itemmanager.cpp
+FileName=src\resources\mapreader.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -598,7 +598,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit104]
-FileName=src\resources\itemmanager.h
+FileName=src\resources\mapreader.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -608,7 +608,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit106]
-FileName=src\resources\mapreader.h
+FileName=src\resources\music.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -618,7 +618,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit109]
-FileName=src\resources\resource.cpp
+FileName=src\resources\resourcemanager.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -638,7 +638,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit111]
-FileName=src\resources\resourcemanager.cpp
+FileName=src\resources\soundeffect.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -648,9 +648,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit112]
-FileName=src\resources\resourcemanager.h
+FileName=src\gui\help.h
 CompileCpp=1
-Folder=resources
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -658,9 +658,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit113]
-FileName=src\resources\soundeffect.cpp
+FileName=src\gui\help.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui/source
 Link=1
 Priority=1000
 OverrideBuildCmd=0
@@ -668,9 +668,9 @@ BuildCmd=
 Compile=1
 
 [Unit114]
-FileName=src\gui\help.h
+FileName=src\gui\inttextbox.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -678,9 +678,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit115]
-FileName=src\gui\help.cpp
+FileName=src\gui\inttextbox.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -688,9 +688,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit116]
-FileName=src\gui\inttextbox.cpp
+FileName=src\gui\focushandler.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -698,9 +698,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit117]
-FileName=src\gui\inttextbox.h
+FileName=src\gui\focushandler.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -708,7 +708,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit118]
-FileName=src\gui\focushandler.h
+FileName=src\gui\popupmenu.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -718,7 +718,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit119]
-FileName=src\gui\focushandler.cpp
+FileName=src\gui\popupmenu.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -728,7 +728,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit120]
-FileName=src\gui\popupmenu.h
+FileName=src\gui\browserbox.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -738,7 +738,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit121]
-FileName=src\gui\popupmenu.cpp
+FileName=src\gui\browserbox.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -748,7 +748,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit122]
-FileName=src\gui\browserbox.h
+FileName=src\gui\updatewindow.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -758,9 +758,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit124]
-FileName=src\gui\updatewindow.h
+FileName=src\gui\box.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -768,9 +768,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit125]
-FileName=src\gui\updatewindow.cpp
+FileName=src\gui\box.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -778,9 +778,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit126]
-FileName=src\gui\box.cpp
+FileName=src\item.h
 CompileCpp=1
-Folder=gui/source
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -788,9 +788,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit127]
-FileName=src\gui\box.h
+FileName=src\equipment.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -798,7 +798,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit128]
-FileName=src\item.h
+FileName=src\equipment.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1248,7 +1248,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit107]
-FileName=src\resources\music.cpp
+FileName=src\resources\resource.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1258,7 +1258,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit108]
-FileName=src\resources\music.h
+FileName=src\resources\resource.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1268,7 +1268,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit123]
-FileName=src\gui\browserbox.cpp
+FileName=src\gui\updatewindow.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1278,7 +1278,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit129]
-FileName=src\equipment.cpp
+FileName=src\item.cpp
 CompileCpp=1
 Folder=
 Compile=1
@@ -1288,9 +1288,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit130]
-FileName=src\equipment.h
+FileName=src\gui\inventorywindow.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1298,9 +1298,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit131]
-FileName=src\item.cpp
+FileName=src\gui\inventorywindow.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1308,9 +1308,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit132]
-FileName=src\gui\inventorywindow.h
+FileName=src\inventory.h
 CompileCpp=1
-Folder=gui/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1318,9 +1318,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit133]
-FileName=src\gui\inventorywindow.cpp
+FileName=src\inventory.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1328,7 +1328,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit134]
-FileName=src\inventory.h
+FileName=src\configlistener.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1338,9 +1338,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit135]
-FileName=src\inventory.cpp
+FileName=src\graphic\imagerect.h
 CompileCpp=1
-Folder=
+Folder=graphic/header
 Compile=1
 Link=1
 Priority=1000
@@ -1348,7 +1348,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit138]
-FileName=src\guichanfwd.h
+FileName=src\openglgraphics.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1358,9 +1358,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit139]
-FileName=src\serverinfo.h
+FileName=src\openglgraphics.cpp
 CompileCpp=1
-Folder=header
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1368,9 +1368,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit140]
-FileName=src\openglgraphics.h
+FileName=src\gui\tabbedcontainer.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1378,9 +1378,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit141]
-FileName=src\openglgraphics.cpp
+FileName=src\gui\tabbedcontainer.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1388,9 +1388,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit142]
-FileName=src\gui\tabbedcontainer.h
+FileName=src\resources\sdlimageloader.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1398,9 +1398,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit143]
-FileName=src\gui\tabbedcontainer.cpp
+FileName=src\resources\sdlimageloader.h
 CompileCpp=1
-Folder=gui/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1408,9 +1408,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit144]
-FileName=src\resources\sdlimageloader.cpp
+FileName=src\net\messageout.cpp
 CompileCpp=1
-Folder=resources
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -1418,9 +1418,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit145]
-FileName=src\resources\sdlimageloader.h
+FileName=src\net\messageout.h
 CompileCpp=1
-Folder=resources
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -1428,7 +1428,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit146]
-FileName=src\net\messageout.cpp
+FileName=src\net\packet.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1438,7 +1438,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit147]
-FileName=src\net\messageout.h
+FileName=src\net\packet.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -1448,7 +1448,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit148]
-FileName=src\net\packet.cpp
+FileName=src\net\messagein.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1458,7 +1458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit149]
-FileName=src\net\packet.h
+FileName=src\net\messagein.h
 CompileCpp=1
 Folder=net/header
 Compile=1
@@ -1478,9 +1478,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit150]
-FileName=src\net\messagein.cpp
+FileName=src\gui\menuwindow.cpp
 CompileCpp=1
-Folder=net/source
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1488,9 +1488,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit151]
-FileName=src\net\messagein.h
+FileName=src\gui\menuwindow.h
 CompileCpp=1
-Folder=net/header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1498,7 +1498,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit152]
-FileName=src\gui\menuwindow.cpp
+FileName=src\gui\ministatus.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1508,7 +1508,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit153]
-FileName=src\gui\menuwindow.h
+FileName=src\gui\ministatus.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1518,9 +1518,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit154]
-FileName=src\gui\ministatus.cpp
+FileName=src\resources\imagewriter.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1528,9 +1528,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit155]
-FileName=src\gui\ministatus.h
+FileName=src\resources\imagewriter.h
 CompileCpp=1
-Folder=gui/header
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -1538,9 +1538,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit156]
-FileName=src\resources\imagewriter.cpp
+FileName=src\gui\debugwindow.h
 CompileCpp=1
-Folder=resources
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1548,9 +1548,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit157]
-FileName=src\resources\imagewriter.h
+FileName=src\gui\debugwindow.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1558,7 +1558,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit158]
-FileName=src\gui\debugwindow.h
+FileName=src\gui\connection.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1568,9 +1568,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit166]
-FileName=src\gui\register.h
+FileName=src\tileset.h
 CompileCpp=1
-Folder=gui/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1578,9 +1578,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit167]
-FileName=src\gui\register.cpp
+FileName=src\properties.h
 CompileCpp=1
-Folder=gui/source
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1588,7 +1588,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit160]
-FileName=src\gui\connection.h
+FileName=src\gui\gccontainer.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1598,7 +1598,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit161]
-FileName=src\gui\connection.cpp
+FileName=src\gui\gccontainer.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1608,7 +1608,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit105]
-FileName=src\resources\mapreader.cpp
+FileName=src\resources\music.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1618,7 +1618,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit110]
-FileName=src\resources\resource.h
+FileName=src\resources\resourcemanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1628,7 +1628,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit159]
-FileName=src\gui\debugwindow.cpp
+FileName=src\gui\connection.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1638,7 +1638,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit162]
-FileName=src\gui\gccontainer.h
+FileName=src\gui\login.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1648,7 +1648,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit163]
-FileName=src\gui\gccontainer.cpp
+FileName=src\gui\login.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1658,7 +1658,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit164]
-FileName=src\gui\login.h
+FileName=src\gui\register.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1668,7 +1668,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit165]
-FileName=src\gui\login.cpp
+FileName=src\gui\register.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1678,7 +1678,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit168]
-FileName=src\tileset.h
+FileName=src\sprite.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1688,9 +1688,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit169]
-FileName=src\properties.h
+FileName=src\beingmanager.cpp
 CompileCpp=1
-Folder=header
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1698,7 +1698,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit170]
-FileName=src\sprite.h
+FileName=src\beingmanager.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1708,7 +1708,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit171]
-FileName=src\beingmanager.cpp
+FileName=src\localplayer.cpp
 CompileCpp=1
 Folder=
 Compile=1
@@ -1718,7 +1718,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit172]
-FileName=src\beingmanager.h
+FileName=src\localplayer.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1728,9 +1728,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit173]
-FileName=src\localplayer.cpp
+FileName=src\gui\npclistdialog.cpp
 CompileCpp=1
-Folder=
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1738,9 +1738,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit174]
-FileName=src\localplayer.h
+FileName=src\gui\npclistdialog.h
 CompileCpp=1
-Folder=header
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1748,9 +1748,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit176]
-FileName=src\gui\npclistdialog.h
+FileName=src\npc.h
 CompileCpp=1
-Folder=gui/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1758,9 +1758,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit177]
-FileName=src\npc.cpp
+FileName=src\lockedarray.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1768,7 +1768,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit178]
-FileName=src\npc.h
+FileName=src\logindata.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1778,7 +1778,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit136]
-FileName=src\configlistener.h
+FileName=src\guichanfwd.h
 CompileCpp=1
 Folder=header
 Compile=1
@@ -1788,9 +1788,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit137]
-FileName=src\graphic\imagerect.h
+FileName=src\serverinfo.h
 CompileCpp=1
-Folder=graphic/header
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1808,9 +1808,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit175]
-FileName=src\gui\npclistdialog.cpp
+FileName=src\npc.cpp
 CompileCpp=1
-Folder=gui/source
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1838,26 +1838,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit179]
-FileName=src\lockedarray.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit180]
-FileName=src\logindata.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit181]
 FileName=src\monster.cpp
 CompileCpp=1
 Folder=
@@ -1867,7 +1847,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit182]
+[Unit180]
 FileName=src\monster.h
 CompileCpp=1
 Folder=header
@@ -1877,7 +1857,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit183]
+[Unit181]
 FileName=src\player.cpp
 CompileCpp=1
 Folder=
@@ -1887,7 +1867,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit184]
+[Unit182]
 FileName=src\player.h
 CompileCpp=1
 Folder=header
@@ -1897,7 +1877,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit185]
+[Unit183]
 FileName=src\net\beinghandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -1907,7 +1887,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit186]
+[Unit184]
 FileName=src\net\beinghandler.h
 CompileCpp=1
 Folder=net/header
@@ -1917,7 +1897,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit187]
+[Unit185]
 FileName=src\net\buysellhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -1927,7 +1907,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit188]
+[Unit186]
 FileName=src\net\buysellhandler.h
 CompileCpp=1
 Folder=net/header
@@ -1937,7 +1917,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit189]
+[Unit187]
 FileName=src\net\charserverhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -1947,7 +1927,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit190]
+[Unit188]
 FileName=src\net\charserverhandler.h
 CompileCpp=1
 Folder=net/header
@@ -1957,7 +1937,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit191]
+[Unit189]
 FileName=src\net\chathandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -1967,7 +1947,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit192]
+[Unit190]
 FileName=src\net\chathandler.h
 CompileCpp=1
 Folder=net/header
@@ -1977,7 +1957,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit193]
+[Unit191]
 FileName=src\net\equipmenthandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -1987,7 +1967,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit194]
+[Unit192]
 FileName=src\net\equipmenthandler.h
 CompileCpp=1
 Folder=net/header
@@ -1997,7 +1977,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit195]
+[Unit193]
 FileName=src\net\inventoryhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2007,7 +1987,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit196]
+[Unit194]
 FileName=src\net\inventoryhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2017,7 +1997,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit197]
+[Unit195]
 FileName=src\net\itemhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2027,7 +2007,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit198]
+[Unit196]
 FileName=src\net\itemhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2037,7 +2017,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit199]
+[Unit197]
 FileName=src\net\loginhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2047,7 +2027,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit200]
+[Unit198]
 FileName=src\net\loginhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2057,7 +2037,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit201]
+[Unit199]
 FileName=src\net\maploginhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2067,7 +2047,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit202]
+[Unit200]
 FileName=src\net\maploginhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2077,7 +2057,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit203]
+[Unit201]
 FileName=src\net\messagehandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2087,7 +2067,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit204]
+[Unit202]
 FileName=src\net\messagehandler.h
 CompileCpp=1
 Folder=net/header
@@ -2097,7 +2077,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit205]
+[Unit203]
 FileName=src\net\npchandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2107,7 +2087,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit206]
+[Unit204]
 FileName=src\net\npchandler.h
 CompileCpp=1
 Folder=net/header
@@ -2117,7 +2097,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit207]
+[Unit205]
 FileName=src\net\playerhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2127,7 +2107,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit208]
+[Unit206]
 FileName=src\net\playerhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2137,7 +2117,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit209]
+[Unit207]
 FileName=src\net\skillhandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2147,7 +2127,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit210]
+[Unit208]
 FileName=src\net\skillhandler.h
 CompileCpp=1
 Folder=net/header
@@ -2157,7 +2137,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit211]
+[Unit209]
 FileName=src\net\tradehandler.cpp
 CompileCpp=1
 Folder=net/source
@@ -2167,7 +2147,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit212]
+[Unit210]
 FileName=src\net\tradehandler.h
 CompileCpp=1
 Folder=net/header
@@ -2177,7 +2157,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit213]
+[Unit211]
 FileName=src\joystick.h
 CompileCpp=1
 Folder=header
@@ -2187,7 +2167,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit214]
+[Unit212]
 FileName=src\flooritemmanager.cpp
 CompileCpp=1
 Folder=
@@ -2197,7 +2177,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit215]
+[Unit213]
 FileName=src\flooritemmanager.h
 CompileCpp=1
 Folder=header
@@ -2207,7 +2187,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit216]
+[Unit214]
 FileName=src\joystick.cpp
 CompileCpp=1
 Folder=
@@ -2217,7 +2197,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit217]
+[Unit215]
 FileName=src\gui\setup_video.h
 CompileCpp=1
 Folder=gui/header
@@ -2227,7 +2207,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit218]
+[Unit216]
 FileName=src\gui\setup_audio.h
 CompileCpp=1
 Folder=gui/header
@@ -2237,7 +2217,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit219]
+[Unit217]
 FileName=src\gui\setup_joystick.h
 CompileCpp=1
 Folder=gui/header
@@ -2247,7 +2227,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit220]
+[Unit218]
 FileName=src\gui\setup_video.cpp
 CompileCpp=1
 Folder=gui/source
@@ -2257,7 +2237,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit221]
+[Unit219]
 FileName=src\gui\setup_audio.cpp
 CompileCpp=1
 Folder=gui/source
@@ -2267,7 +2247,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit222]
+[Unit220]
 FileName=src\gui\setup_joystick.cpp
 CompileCpp=1
 Folder=gui/source
@@ -2277,7 +2257,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit223]
+[Unit221]
 FileName=src\gui\setuptab.h
 CompileCpp=1
 Folder=gui/header
@@ -2287,7 +2267,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit224]
+[Unit222]
 FileName=src\animation.h
 CompileCpp=1
 Folder=header
@@ -2297,7 +2277,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit225]
+[Unit223]
 FileName=src\animation.cpp
 CompileCpp=1
 Folder=
@@ -2307,7 +2287,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit226]
+[Unit224]
 FileName=src\utils\dtor.h
 CompileCpp=1
 Folder=utils
@@ -2317,7 +2297,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit227]
+[Unit225]
 FileName=src\utils\tostring.h
 CompileCpp=1
 Folder=utils
@@ -2327,7 +2307,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit228]
+[Unit226]
 FileName=src\tmw.rc
 CompileCpp=1
 Folder=resources
@@ -2337,7 +2317,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit229]
+[Unit227]
 FileName=src\resources\spriteset.cpp
 CompileCpp=1
 Folder=resources
@@ -2347,17 +2327,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit230]
+[Unit228]
 FileName=src\resources\spriteset.h
+CompileCpp=1
 Folder=resources
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
-CompileCpp=1
 
-[Unit231]
+[Unit229]
 FileName=src\resources\openglsdlimageloader.cpp
 CompileCpp=1
 Folder=resources
@@ -2367,17 +2347,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit232]
+[Unit230]
 FileName=src\resources\openglsdlimageloader.h
-CompileCpp=1
 Folder=resources
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
+CompileCpp=1
 
-[Unit233]
+[Unit231]
 FileName=src\animatedsprite.cpp
 CompileCpp=1
 Folder=
@@ -2387,7 +2367,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit234]
+[Unit232]
 FileName=src\animatedsprite.h
 CompileCpp=1
 Folder=header
@@ -2397,7 +2377,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit235]
+[Unit233]
 FileName=src\resources\iteminfo.cpp
 CompileCpp=1
 Folder=
@@ -2407,7 +2387,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit236]
+[Unit234]
 FileName=src\resources\ambientoverlay.cpp
 CompileCpp=1
 Folder=resources
@@ -2417,7 +2397,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit237]
+[Unit235]
 FileName=src\resources\ambientoverlay.h
 CompileCpp=1
 Folder=resources
@@ -2427,7 +2407,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit238]
+[Unit236]
 FileName=src\gui\shoplistbox.cpp
 CompileCpp=1
 Folder=gui/source
@@ -2437,7 +2417,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit239]
+[Unit237]
 FileName=src\gui\shoplistbox.h
 CompileCpp=1
 Folder=gui/header
@@ -2447,7 +2427,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit240]
+[Unit238]
 FileName=src\action.cpp
 CompileCpp=1
 Folder=
@@ -2457,7 +2437,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit241]
+[Unit239]
 FileName=src\action.h
 CompileCpp=1
 Folder=header
@@ -2467,7 +2447,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit242]
+[Unit240]
 FileName=src\utils\xml.cpp
 CompileCpp=1
 Folder=utils
@@ -2477,7 +2457,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit243]
+[Unit241]
 FileName=src\utils\xml.h
 CompileCpp=1
 Folder=utils
@@ -2487,7 +2467,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit244]
+[Unit242]
 FileName=src\resources\spritedef.cpp
 CompileCpp=1
 Folder=resources
@@ -2497,7 +2477,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit245]
+[Unit243]
 FileName=src\resources\spritedef.h
 CompileCpp=1
 Folder=resources
@@ -2507,3 +2487,83 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit244]
+FileName=src\resources\monsterdb.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit245]
+FileName=src\resources\monsterdb.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit246]
+FileName=src\resources\monsterinfo.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit247]
+FileName=src\resources\monsterinfo.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit248]
+FileName=src\resources\itemdb.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit249]
+FileName=src\resources\itemdb.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit250]
+FileName=src\resources\equipmentdb.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit251]
+FileName=src\resources\equipmentdb.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/tmw.cbp b/tmw.cbp
index 29e27240..fdb01479 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1194,6 +1194,26 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\resources\monsterdb.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\resources\monsterdb.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\resources\monsterinfo.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\resources\monsterinfo.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\resources\music.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>