added some forgotten stuff

2 files changed, 104 insertions, 93 deletions

diff --git a/The Mana World.dev b/The Mana World.dev
index 3119e3bb..08b2f97a 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=The Mana World.dev
 Name=tmw
-UnitCount=173
+UnitCount=174
 Type=0
 Ver=1
 ObjFiles=
@@ -668,7 +668,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit112]
-FileName=src\resources\iteminfo.cpp
+FileName=src\resources\iteminfo.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -678,7 +678,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit113]
-FileName=src\resources\iteminfo.h
+FileName=src\resources\itemmanager.cpp
 CompileCpp=1
 Folder=resources
 Link=1
@@ -688,7 +688,7 @@ BuildCmd=
 Compile=1
 
 [Unit114]
-FileName=src\resources\itemmanager.cpp
+FileName=src\resources\itemmanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -698,7 +698,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit115]
-FileName=src\resources\itemmanager.h
+FileName=src\resources\mapreader.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -708,7 +708,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit116]
-FileName=src\resources\mapreader.cpp
+FileName=src\resources\mapreader.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -718,7 +718,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit117]
-FileName=src\resources\mapreader.h
+FileName=src\resources\music.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -728,7 +728,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit118]
-FileName=src\resources\music.cpp
+FileName=src\resources\music.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -738,7 +738,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit119]
-FileName=src\resources\music.h
+FileName=src\resources\resource.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -748,7 +748,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit120]
-FileName=src\resources\resource.cpp
+FileName=src\resources\resource.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -758,7 +758,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit121]
-FileName=src\resources\resource.h
+FileName=src\resources\resourcemanager.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -768,7 +768,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit122]
-FileName=src\resources\resourcemanager.cpp
+FileName=src\resources\resourcemanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -778,9 +778,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit124]
-FileName=src\resources\soundeffect.cpp
+FileName=src\gui\help.h
 CompileCpp=1
-Folder=resources
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -788,9 +788,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit125]
-FileName=src\gui\help.h
+FileName=src\gui\help.cpp
 CompileCpp=1
-Folder=gui/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -798,7 +798,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit126]
-FileName=src\gui\help.cpp
+FileName=src\gui\inttextbox.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -808,9 +808,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit127]
-FileName=src\gui\inttextbox.cpp
+FileName=src\gui\inttextbox.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -818,7 +818,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit128]
-FileName=src\gui\inttextbox.h
+FileName=src\gui\focushandler.h
 CompileCpp=1
 Folder=gui/header
 Compile=1
@@ -1298,7 +1298,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit123]
-FileName=src\resources\resourcemanager.h
+FileName=src\resources\soundeffect.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1308,16 +1308,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit129]
-FileName=src\gui\focushandler.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit130]
 FileName=src\gui\focushandler.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1327,7 +1317,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit131]
+[Unit130]
 FileName=src\gui\popupmenu.h
 CompileCpp=1
 Folder=gui/header
@@ -1337,7 +1327,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit132]
+[Unit131]
 FileName=src\gui\popupmenu.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1347,7 +1337,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit133]
+[Unit132]
 FileName=src\gui\browserbox.h
 CompileCpp=1
 Folder=gui/header
@@ -1357,7 +1347,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit134]
+[Unit133]
 FileName=src\gui\browserbox.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1367,7 +1357,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit135]
+[Unit134]
 FileName=src\gui\updatewindow.h
 CompileCpp=1
 Folder=gui/header
@@ -1377,7 +1367,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit136]
+[Unit135]
 FileName=src\gui\updatewindow.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1387,7 +1377,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit137]
+[Unit136]
 FileName=src\gui\vbox.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1397,7 +1387,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit138]
+[Unit137]
 FileName=src\gui\vbox.h
 CompileCpp=1
 Folder=gui/header
@@ -1407,7 +1397,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit139]
+[Unit138]
 FileName=src\gui\box.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1417,7 +1407,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit140]
+[Unit139]
 FileName=src\gui\box.h
 CompileCpp=1
 Folder=gui/header
@@ -1427,7 +1417,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit141]
+[Unit140]
 FileName=src\item.h
 CompileCpp=1
 Folder=header
@@ -1437,7 +1427,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit142]
+[Unit141]
 FileName=src\equipment.cpp
 CompileCpp=1
 Folder=
@@ -1447,7 +1437,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit143]
+[Unit142]
 FileName=src\equipment.h
 CompileCpp=1
 Folder=header
@@ -1457,7 +1447,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit144]
+[Unit143]
 FileName=src\item.cpp
 CompileCpp=1
 Folder=
@@ -1467,7 +1457,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit145]
+[Unit144]
 FileName=src\gui\inventorywindow.h
 CompileCpp=1
 Folder=gui/header
@@ -1477,7 +1467,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit146]
+[Unit145]
 FileName=src\gui\inventorywindow.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1487,7 +1477,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit147]
+[Unit146]
 FileName=src\inventory.h
 CompileCpp=1
 Folder=header
@@ -1497,7 +1487,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit148]
+[Unit147]
 FileName=src\inventory.cpp
 CompileCpp=1
 Folder=
@@ -1507,7 +1497,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit149]
+[Unit148]
 FileName=src\configlistener.h
 CompileCpp=1
 Folder=header
@@ -1517,27 +1507,27 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit52]
-FileName=src\gui\item_amount.cpp
+[Unit149]
+FileName=src\graphic\imagerect.h
 CompileCpp=1
-Folder=gui/source
+Folder=graphic/header
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit150]
-FileName=src\graphic\imagerect.h
+[Unit52]
+FileName=src\gui\item_amount.cpp
 CompileCpp=1
-Folder=graphic/header
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit151]
+[Unit150]
 FileName=src\guichanfwd.h
 CompileCpp=1
 Folder=header
@@ -1547,7 +1537,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit152]
+[Unit151]
 FileName=src\playerinfo.h
 CompileCpp=1
 Folder=header
@@ -1557,7 +1547,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit153]
+[Unit152]
 FileName=src\serverinfo.h
 CompileCpp=1
 Folder=header
@@ -1567,7 +1557,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit154]
+[Unit153]
 FileName=src\openglgraphics.h
 CompileCpp=1
 Folder=header
@@ -1577,7 +1567,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit155]
+[Unit154]
 FileName=src\openglgraphics.cpp
 CompileCpp=1
 Folder=
@@ -1587,7 +1577,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit156]
+[Unit155]
 FileName=src\gui\tabbedcontainer.h
 CompileCpp=1
 Folder=gui/header
@@ -1597,7 +1587,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit157]
+[Unit156]
 FileName=src\gui\tabbedcontainer.cpp
 CompileCpp=1
 Folder=gui/source
@@ -1607,7 +1597,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit158]
+[Unit157]
 FileName=src\resources\sdlimageloader.cpp
 CompileCpp=1
 Folder=resources
@@ -1617,17 +1607,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit166]
-FileName=src\gui\menuwindow.cpp
+[Unit158]
+FileName=src\resources\sdlimageloader.h
 CompileCpp=1
-Folder=gui/source
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit167]
+[Unit166]
 FileName=src\gui\menuwindow.h
 CompileCpp=1
 Folder=gui/header
@@ -1637,17 +1627,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit160]
-FileName=src\net\messageout.cpp
+[Unit167]
+FileName=src\gui\ministatus.cpp
 CompileCpp=1
-Folder=net/source
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit161]
+[Unit160]
 FileName=src\net\messageout.h
 CompileCpp=1
 Folder=net/header
@@ -1657,8 +1647,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit105]
-FileName=src\net\protocol.cpp
+[Unit161]
+FileName=src\net\packet.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1667,18 +1657,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit110]
-FileName=src\resources\image.cpp
+[Unit105]
+FileName=src\net\protocol.cpp
 CompileCpp=1
-Folder=resources
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit159]
-FileName=src\resources\sdlimageloader.h
+[Unit110]
+FileName=src\resources\image.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1687,8 +1677,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit162]
-FileName=src\net\packet.cpp
+[Unit159]
+FileName=src\net\messageout.cpp
 CompileCpp=1
 Folder=net/source
 Compile=1
@@ -1697,7 +1687,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit163]
+[Unit162]
 FileName=src\net\packet.h
 CompileCpp=1
 Folder=net/header
@@ -1707,7 +1697,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit164]
+[Unit163]
 FileName=src\net\messagein.cpp
 CompileCpp=1
 Folder=net/source
@@ -1717,7 +1707,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit165]
+[Unit164]
 FileName=src\net\messagein.h
 CompileCpp=1
 Folder=net/header
@@ -1727,8 +1717,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit168]
-FileName=src\gui\ministatus.cpp
+[Unit165]
+FileName=src\gui\menuwindow.cpp
 CompileCpp=1
 Folder=gui/source
 Compile=1
@@ -1737,7 +1727,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit169]
+[Unit168]
 FileName=src\gui\ministatus.h
 CompileCpp=1
 Folder=gui/header
@@ -1747,7 +1737,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit170]
+[Unit169]
 FileName=src\resources\imagewriter.cpp
 CompileCpp=1
 Folder=resources
@@ -1757,7 +1747,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit171]
+[Unit170]
 FileName=src\resources\imagewriter.h
 CompileCpp=1
 Folder=resources
@@ -1767,7 +1757,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit173]
+[Unit171]
+FileName=src\gui\error.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit172]
 FileName=src\gui\error.h
 CompileCpp=1
 Folder=gui/header
@@ -1777,13 +1777,22 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit172]
-FileName=src\gui\error.cpp
+[Unit173]
+FileName=src\gui\debugwindow.h
 CompileCpp=1
-Folder=gui/source
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit174]
+FileName=src\gui\debugwindow.cpp
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index 1284e7bb..63d8553f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,6 +110,8 @@ tmw_SOURCES = graphic/spriteset.cpp \
 	      gui/hbox.cpp \
 	      gui/updatewindow.h \
 	      gui/updatewindow.cpp \
+	      gui/debugwindow.cpp \
+	      gui/debugwindow.h \
 	      net/messagein.cpp \
 	      net/messagein.h \
 	      net/messageout.cpp \