Some fixes to browser font loading and updates to DevCpp project file

2 files changed, 94 insertions, 94 deletions

diff --git a/The Mana World.dev b/The Mana World.dev
index de9edbc8..b97db722 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -11,7 +11,7 @@ PrivateResource=The_Mana_World_private.rc
 ResourceIncludes=
 MakeIncludes=
 Compiler=-Dmain=SDL_main_@@_
-CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_-DUSE_OPENGL_@@_
+CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_
 Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-llibxml2_@@_-lopengl32_@@_-lphysfs_@@_
 IsCpp=1
 Icon=The Mana World.ico
@@ -308,7 +308,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit69]
-FileName=src\gui\newskill.h
+FileName=src\gui\npc_text.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -318,7 +318,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit70]
-FileName=src\gui\npc.cpp
+FileName=src\gui\ok_dialog.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -328,7 +328,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit71]
-FileName=src\gui\npc.h
+FileName=src\gui\ok_dialog.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -338,7 +338,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit72]
-FileName=src\gui\npc_text.cpp
+FileName=src\gui\passwordfield.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -348,7 +348,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit73]
-FileName=src\gui\npc_text.h
+FileName=src\gui\passwordfield.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -358,7 +358,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit74]
-FileName=src\gui\ok_dialog.cpp
+FileName=src\gui\playerbox.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -378,7 +378,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit77]
-FileName=src\gui\passwordfield.h
+FileName=src\gui\progressbar.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -388,7 +388,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit78]
-FileName=src\gui\playerbox.cpp
+FileName=src\gui\radiobutton.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -398,7 +398,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit79]
-FileName=src\gui\playerbox.h
+FileName=src\gui\radiobutton.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -408,7 +408,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit80]
-FileName=src\gui\progressbar.cpp
+FileName=src\gui\requesttrade.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -418,7 +418,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit81]
-FileName=src\gui\progressbar.h
+FileName=src\gui\requesttrade.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -428,7 +428,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit82]
-FileName=src\gui\radiobutton.cpp
+FileName=src\gui\scrollarea.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -438,7 +438,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit84]
-FileName=src\gui\requesttrade.cpp
+FileName=src\gui\sell.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -448,7 +448,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit85]
-FileName=src\gui\requesttrade.h
+FileName=src\gui\sell.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -458,7 +458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit86]
-FileName=src\gui\scrollarea.cpp
+FileName=src\gui\setup.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -468,7 +468,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit89]
-FileName=src\gui\sell.h
+FileName=src\gui\shop.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -478,7 +478,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit90]
-FileName=src\gui\setup.cpp
+FileName=src\gui\skill.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -488,7 +488,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit91]
-FileName=src\gui\setup.h
+FileName=src\gui\skill.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -498,7 +498,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit92]
-FileName=src\gui\shop.cpp
+FileName=src\gui\slider.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -508,7 +508,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit93]
-FileName=src\gui\shop.h
+FileName=src\gui\slider.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -518,7 +518,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit94]
-FileName=src\gui\skill.cpp
+FileName=src\gui\stats.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -528,7 +528,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit95]
-FileName=src\gui\skill.h
+FileName=src\gui\stats.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -538,7 +538,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit96]
-FileName=src\gui\slider.cpp
+FileName=src\gui\status.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -558,7 +558,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit97]
-FileName=src\gui\slider.h
+FileName=src\gui\status.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -568,7 +568,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit98]
-FileName=src\gui\stats.cpp
+FileName=src\gui\textbox.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -578,7 +578,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit99]
-FileName=src\gui\stats.h
+FileName=src\gui\textbox.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -588,7 +588,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit100]
-FileName=src\gui\status.cpp
+FileName=src\gui\textfield.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -598,7 +598,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit101]
-FileName=src\gui\status.h
+FileName=src\gui\textfield.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -608,7 +608,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit102]
-FileName=src\gui\textbox.cpp
+FileName=src\gui\trade.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -618,7 +618,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit103]
-FileName=src\gui\textbox.h
+FileName=src\gui\trade.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -628,7 +628,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit104]
-FileName=src\gui\textfield.cpp
+FileName=src\gui\window.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -638,7 +638,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit105]
-FileName=src\gui\textfield.h
+FileName=src\gui\window.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -648,7 +648,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit106]
-FileName=src\gui\trade.cpp
+FileName=src\gui\windowcontainer.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -658,9 +658,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit109]
-FileName=src\gui\window.h
+FileName=src\net\network.h
 CompileCpp=1
-Folder=gui
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -678,9 +678,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit110]
-FileName=src\gui\windowcontainer.cpp
+FileName=src\net\protocol.cpp
 CompileCpp=1
-Folder=gui
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -688,7 +688,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit111]
-FileName=src\net\win2mac.h
+FileName=src\net\protocol.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -698,7 +698,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit112]
-FileName=src\net\network.cpp
+FileName=src\net\win2linux.h
 CompileCpp=1
 Folder=net
 Compile=1
@@ -708,7 +708,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit113]
-FileName=src\net\network.h
+FileName=src\net\win2mac.cpp
 CompileCpp=1
 Folder=net
 Link=1
@@ -718,9 +718,9 @@ BuildCmd=
 Compile=1
 
 [Unit114]
-FileName=src\net\protocol.cpp
+FileName=src\resources\soundeffect.h
 CompileCpp=1
-Folder=net
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -728,9 +728,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit115]
-FileName=src\net\protocol.h
+FileName=src\resources\buddylist.cpp
 CompileCpp=1
-Folder=net
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -738,9 +738,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit116]
-FileName=src\net\win2linux.h
+FileName=src\resources\buddylist.h
 CompileCpp=1
-Folder=net
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -748,9 +748,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit117]
-FileName=src\net\win2mac.cpp
+FileName=src\resources\image.cpp
 CompileCpp=1
-Folder=net
+Folder=resources
 Compile=1
 Link=1
 Priority=1000
@@ -758,7 +758,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit118]
-FileName=src\resources\soundeffect.h
+FileName=src\resources\image.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -768,7 +768,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit119]
-FileName=src\resources\buddylist.cpp
+FileName=src\resources\iteminfo.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -778,7 +778,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit120]
-FileName=src\resources\buddylist.h
+FileName=src\resources\iteminfo.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -788,7 +788,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit121]
-FileName=src\resources\image.cpp
+FileName=src\resources\itemmanager.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -798,7 +798,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit122]
-FileName=src\resources\image.h
+FileName=src\resources\itemmanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -808,7 +808,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit124]
-FileName=src\resources\iteminfo.h
+FileName=src\resources\mapreader.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -818,7 +818,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit125]
-FileName=src\resources\itemmanager.cpp
+FileName=src\resources\music.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -828,7 +828,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit126]
-FileName=src\resources\itemmanager.h
+FileName=src\resources\music.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -838,7 +838,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit127]
-FileName=src\resources\mapreader.cpp
+FileName=src\resources\resource.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -848,7 +848,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit128]
-FileName=src\resources\mapreader.h
+FileName=src\resources\resource.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1188,7 +1188,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit62]
-FileName=src\gui\menu.cpp
+FileName=src\gui\minimap.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1198,7 +1198,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit63]
-FileName=src\gui\menu.h
+FileName=src\gui\minimap.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1208,7 +1208,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit64]
-FileName=src\gui\menuitem.cpp
+FileName=src\gui\newskill.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1218,7 +1218,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit65]
-FileName=src\gui\menuitem.h
+FileName=src\gui\newskill.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1228,7 +1228,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit66]
-FileName=src\gui\minimap.cpp
+FileName=src\gui\npc.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1238,7 +1238,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit67]
-FileName=src\gui\minimap.h
+FileName=src\gui\npc.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1248,7 +1248,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit68]
-FileName=src\gui\newskill.cpp
+FileName=src\gui\npc_text.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1258,7 +1258,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit75]
-FileName=src\gui\ok_dialog.h
+FileName=src\gui\playerbox.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1268,7 +1268,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit76]
-FileName=src\gui\passwordfield.cpp
+FileName=src\gui\progressbar.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1278,7 +1278,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit83]
-FileName=src\gui\radiobutton.h
+FileName=src\gui\scrollarea.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1288,7 +1288,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit87]
-FileName=src\gui\scrollarea.h
+FileName=src\gui\setup.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1298,7 +1298,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit88]
-FileName=src\gui\sell.cpp
+FileName=src\gui\shop.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1308,9 +1308,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit107]
-FileName=src\gui\trade.h
+FileName=src\net\win2mac.h
 CompileCpp=1
-Folder=gui
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -1318,9 +1318,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit108]
-FileName=src\gui\window.cpp
+FileName=src\net\network.cpp
 CompileCpp=1
-Folder=gui
+Folder=net
 Compile=1
 Link=1
 Priority=1000
@@ -1328,7 +1328,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit123]
-FileName=src\resources\iteminfo.cpp
+FileName=src\resources\mapreader.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1338,7 +1338,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit129]
-FileName=src\resources\music.cpp
+FileName=src\resources\resourcemanager.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1348,7 +1348,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit130]
-FileName=src\resources\music.h
+FileName=src\resources\resourcemanager.h
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1358,7 +1358,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit131]
-FileName=src\resources\resource.cpp
+FileName=src\resources\soundeffect.cpp
 CompileCpp=1
 Folder=resources
 Compile=1
@@ -1368,9 +1368,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit132]
-FileName=src\resources\resource.h
+FileName=src\gui\help.h
 CompileCpp=1
-Folder=resources
+Folder=gui
 Compile=1
 Link=1
 Priority=1000
@@ -1378,9 +1378,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit133]
-FileName=src\resources\resourcemanager.cpp
+FileName=src\gui\help.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui
 Compile=1
 Link=1
 Priority=1000
@@ -1388,9 +1388,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit134]
-FileName=src\resources\resourcemanager.h
+FileName=src\gui\inttextbox.cpp
 CompileCpp=1
-Folder=resources
+Folder=gui
 Compile=1
 Link=1
 Priority=1000
@@ -1398,9 +1398,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit135]
-FileName=src\resources\soundeffect.cpp
+FileName=src\gui\inttextbox.h
 CompileCpp=1
-Folder=resources
+Folder=gui
 Compile=1
 Link=1
 Priority=1000
@@ -1408,7 +1408,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit136]
-FileName=src\gui\help.h
+FileName=src\gui\focushandler.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1418,7 +1418,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit137]
-FileName=src\gui\help.cpp
+FileName=src\gui\focushandler.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1428,7 +1428,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit138]
-FileName=src\gui\inttextbox.cpp
+FileName=src\gui\popupmenu.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1438,7 +1438,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit139]
-FileName=src\gui\inttextbox.h
+FileName=src\gui\popupmenu.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1448,7 +1448,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit140]
-FileName=src\gui\focushandler.h
+FileName=src\gui\browserbox.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -1458,7 +1458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit141]
-FileName=src\gui\focushandler.cpp
+FileName=src\gui\browserbox.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 8db0d339..96747fd5 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -41,7 +41,7 @@ BrowserBox::BrowserBox(unsigned int mode):
     {
 #ifdef USE_OPENGL
         browserFont = new gcn::ImageFont(
-                TMW_DATADIR "data/graphics/gui/browserfont.png",
+                "data/graphics/gui/browserfont.png",
                 " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567"
                 "89:@!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`");
 #else