summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aethyra.cbp377
-rw-r--r--src/effectmanager.cpp2
-rw-r--r--src/gui/buddywindow.cpp83
-rw-r--r--src/gui/minimap.cpp4
-rw-r--r--src/gui/newskill.cpp193
-rw-r--r--src/gui/smileycontainer.h2
-rw-r--r--src/gui/smileyshortcutcontainer.h3
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/gui/widgets/adjustingcontainer.cpp279
-rw-r--r--src/gui/widgets/adjustingcontainer.hpp235
10 files changed, 64 insertions, 1116 deletions
diff --git a/aethyra.cbp b/aethyra.cbp
index efc735c9..f24a28a6 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -24,6 +24,7 @@
<Add library="SDL_image" />
<Add library="SDL_mixer" />
<Add library="SDL_net" />
+ <Add library="SDL_ttf" />
<Add library="mingw32" />
<Add library="SDLmain" />
<Add library="SDL.dll" />
@@ -66,315 +67,25 @@
<Add alias="All" targets="default;" />
</VirtualTargets>
<Compiler>
- <Add directory="..\..\..\..\..\..\mingw\include\SDL" />
+ <Add option="-fexpensive-optimizations" />
+ <Add option="-O3" />
+ <Add option="-O2" />
+ <Add option="-O1" />
+ <Add option="-O" />
+ <Add option="-W" />
+ <Add option="-Wall" />
+ <Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include\SDL" />
+ <Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include" />
</Compiler>
-<<<<<<< HEAD:aethyra.cbp
- <Unit filename="src/animatedsprite.cpp" />
- <Unit filename="src/animatedsprite.h" />
- <Unit filename="src/animationparticle.cpp" />
- <Unit filename="src/animationparticle.h" />
- <Unit filename="src/being.cpp" />
- <Unit filename="src/being.h" />
- <Unit filename="src/beingmanager.cpp" />
- <Unit filename="src/beingmanager.h" />
- <Unit filename="src/configlistener.h" />
- <Unit filename="src/configuration.cpp" />
- <Unit filename="src/configuration.h" />
- <Unit filename="src/engine.cpp" />
- <Unit filename="src/engine.h" />
- <Unit filename="src/equipment.cpp" />
- <Unit filename="src/equipment.h" />
- <Unit filename="src/floor_item.cpp" />
- <Unit filename="src/floor_item.h" />
- <Unit filename="src/flooritemmanager.cpp" />
- <Unit filename="src/flooritemmanager.h" />
- <Unit filename="src/game.cpp" />
- <Unit filename="src/game.h" />
- <Unit filename="src/graphics.cpp" />
- <Unit filename="src/graphics.h" />
- <Unit filename="src/gui/box.cpp" />
- <Unit filename="src/gui/box.h" />
- <Unit filename="src/gui/browserbox.cpp" />
- <Unit filename="src/gui/browserbox.h" />
- <Unit filename="src/gui/button.cpp" />
- <Unit filename="src/gui/button.h" />
- <Unit filename="src/gui/buy.cpp" />
- <Unit filename="src/gui/buy.h" />
- <Unit filename="src/gui/buysell.cpp" />
- <Unit filename="src/gui/buysell.h" />
- <Unit filename="src/gui/chargedialog.cpp" />
- <Unit filename="src/gui/chargedialog.h" />
- <Unit filename="src/gui/char_select.cpp" />
- <Unit filename="src/gui/char_select.h" />
- <Unit filename="src/gui/char_server.cpp" />
- <Unit filename="src/gui/char_server.h" />
- <Unit filename="src/gui/chat.cpp" />
- <Unit filename="src/gui/chat.h" />
- <Unit filename="src/gui/chatinput.cpp" />
- <Unit filename="src/gui/chatinput.h" />
- <Unit filename="src/gui/checkbox.cpp" />
- <Unit filename="src/gui/checkbox.h" />
- <Unit filename="src/gui/confirm_dialog.cpp" />
- <Unit filename="src/gui/confirm_dialog.h" />
- <Unit filename="src/gui/connection.cpp" />
- <Unit filename="src/gui/connection.h" />
- <Unit filename="src/gui/debugwindow.cpp" />
- <Unit filename="src/gui/debugwindow.h" />
- <Unit filename="src/gui/equipmentwindow.cpp" />
- <Unit filename="src/gui/equipmentwindow.h" />
- <Unit filename="src/gui/focushandler.cpp" />
- <Unit filename="src/gui/focushandler.h" />
- <Unit filename="src/gui/gccontainer.cpp" />
- <Unit filename="src/gui/gccontainer.h" />
- <Unit filename="src/gui/gui.cpp" />
- <Unit filename="src/gui/gui.h" />
- <Unit filename="src/gui/hbox.cpp" />
- <Unit filename="src/gui/hbox.h" />
- <Unit filename="src/gui/help.cpp" />
- <Unit filename="src/gui/help.h" />
- <Unit filename="src/gui/inttextbox.cpp" />
- <Unit filename="src/gui/inttextbox.h" />
- <Unit filename="src/gui/inventorywindow.cpp" />
- <Unit filename="src/gui/inventorywindow.h" />
- <Unit filename="src/gui/itemcontainer.cpp" />
- <Unit filename="src/gui/itemcontainer.h" />
- <Unit filename="src/gui/itemshortcutcontainer.cpp" />
- <Unit filename="src/gui/itemshortcutcontainer.h" />
- <Unit filename="src/gui/itemshortcutwindow.cpp" />
- <Unit filename="src/gui/itemshortcutwindow.h" />
- <Unit filename="src/gui/item_amount.cpp" />
- <Unit filename="src/gui/item_amount.h" />
- <Unit filename="src/gui/linkhandler.h" />
- <Unit filename="src/gui/listbox.cpp" />
- <Unit filename="src/gui/listbox.h" />
- <Unit filename="src/gui/login.cpp" />
- <Unit filename="src/gui/login.h" />
- <Unit filename="src/gui/menuwindow.cpp" />
- <Unit filename="src/gui/menuwindow.h" />
- <Unit filename="src/gui/minimap.cpp" />
- <Unit filename="src/gui/minimap.h" />
- <Unit filename="src/gui/ministatus.cpp" />
- <Unit filename="src/gui/ministatus.h" />
- <Unit filename="src/gui/npc_text.cpp" />
- <Unit filename="src/gui/npc_text.h" />
- <Unit filename="src/gui/npclistdialog.cpp" />
- <Unit filename="src/gui/npclistdialog.h" />
- <Unit filename="src/gui/ok_dialog.cpp" />
- <Unit filename="src/gui/ok_dialog.h" />
- <Unit filename="src/gui/passwordfield.cpp" />
- <Unit filename="src/gui/passwordfield.h" />
- <Unit filename="src/gui/playerbox.cpp" />
- <Unit filename="src/gui/playerbox.h" />
- <Unit filename="src/gui/popupmenu.cpp" />
- <Unit filename="src/gui/popupmenu.h" />
- <Unit filename="src/gui/progressbar.cpp" />
- <Unit filename="src/gui/progressbar.h" />
- <Unit filename="src/gui/radiobutton.cpp" />
- <Unit filename="src/gui/radiobutton.h" />
- <Unit filename="src/gui/register.cpp" />
- <Unit filename="src/gui/register.h" />
- <Unit filename="src/gui/scrollarea.cpp" />
- <Unit filename="src/gui/scrollarea.h" />
- <Unit filename="src/gui/sell.cpp" />
- <Unit filename="src/gui/sell.h" />
- <Unit filename="src/gui/setup.cpp" />
- <Unit filename="src/gui/setup.h" />
- <Unit filename="src/gui/setup_audio.cpp" />
- <Unit filename="src/gui/setup_audio.h" />
- <Unit filename="src/gui/setup_joystick.cpp" />
- <Unit filename="src/gui/setup_joystick.h" />
- <Unit filename="src/gui/setup_keyboard.cpp" />
- <Unit filename="src/gui/setup_keyboard.h" />
- <Unit filename="src/gui/setup_players.cpp" />
- <Unit filename="src/gui/setup_players.h" />
- <Unit filename="src/gui/setup_video.cpp" />
- <Unit filename="src/gui/setup_video.h" />
- <Unit filename="src/gui/setuptab.h" />
- <Unit filename="src/gui/shop.cpp" />
- <Unit filename="src/gui/shop.h" />
- <Unit filename="src/gui/shoplistbox.cpp" />
- <Unit filename="src/gui/shoplistbox.h" />
- <Unit filename="src/gui/skill.cpp" />
- <Unit filename="src/gui/skill.h" />
- <Unit filename="src/gui/slider.cpp" />
- <Unit filename="src/gui/slider.h" />
- <Unit filename="src/gui/status.cpp" />
- <Unit filename="src/gui/status.h" />
- <Unit filename="src/gui/tabbedcontainer.cpp" />
- <Unit filename="src/gui/tabbedcontainer.h" />
- <Unit filename="src/gui/table.cpp" />
- <Unit filename="src/gui/table.h" />
- <Unit filename="src/gui/table_model.cpp" />
- <Unit filename="src/gui/table_model.h" />
- <Unit filename="src/gui/textbox.cpp" />
- <Unit filename="src/gui/textbox.h" />
- <Unit filename="src/gui/textfield.cpp" />
- <Unit filename="src/gui/textfield.h" />
- <Unit filename="src/gui/trade.cpp" />
- <Unit filename="src/gui/trade.h" />
- <Unit filename="src/gui/updatewindow.cpp" />
- <Unit filename="src/gui/updatewindow.h" />
- <Unit filename="src/gui/vbox.cpp" />
- <Unit filename="src/gui/vbox.h" />
- <Unit filename="src/gui/viewport.cpp" />
- <Unit filename="src/gui/viewport.h" />
- <Unit filename="src/gui/widgets/dropdown.cpp"/>
- <Unit filename="src/gui/widgets/dropdown.h" />
- <Unit filename="src/gui/widgets/resizegrip.cpp" />
- <Unit filename="src/gui/widgets/resizegrip.h" />
- <Unit filename="src/gui/window.cpp" />
- <Unit filename="src/gui/window.h" />
- <Unit filename="src/gui/windowcontainer.cpp" />
- <Unit filename="src/gui/windowcontainer.h" />
- <Unit filename="src/guichanfwd.h" />
- <Unit filename="src/imageparticle.cpp" />
- <Unit filename="src/imageparticle.h" />
- <Unit filename="src/inventory.cpp" />
- <Unit filename="src/inventory.h" />
- <Unit filename="src/item.cpp" />
- <Unit filename="src/item.h" />
- <Unit filename="src/itemshortcut.cpp" />
- <Unit filename="src/itemshortcut.h" />
- <Unit filename="src/joystick.cpp" />
- <Unit filename="src/joystick.h" />
- <Unit filename="src/keyboardconfig.cpp" />
- <Unit filename="src/keyboardconfig.h" />
- <Unit filename="src/localplayer.cpp" />
- <Unit filename="src/localplayer.h" />
- <Unit filename="src/lockedarray.h" />
- <Unit filename="src/log.cpp" />
- <Unit filename="src/log.h" />
- <Unit filename="src/logindata.h" />
- <Unit filename="src/main.cpp" />
- <Unit filename="src/main.h" />
- <Unit filename="src/map.cpp" />
- <Unit filename="src/map.h" />
- <Unit filename="src/monster.cpp" />
- <Unit filename="src/monster.h" />
- <Unit filename="src/net/beinghandler.cpp" />
- <Unit filename="src/net/beinghandler.h" />
- <Unit filename="src/net/buysellhandler.cpp" />
- <Unit filename="src/net/buysellhandler.h" />
- <Unit filename="src/net/charserverhandler.cpp" />
- <Unit filename="src/net/charserverhandler.h" />
- <Unit filename="src/net/chathandler.cpp" />
- <Unit filename="src/net/chathandler.h" />
- <Unit filename="src/net/equipmenthandler.cpp" />
- <Unit filename="src/net/equipmenthandler.h" />
- <Unit filename="src/net/inventoryhandler.cpp" />
- <Unit filename="src/net/inventoryhandler.h" />
- <Unit filename="src/net/itemhandler.cpp" />
- <Unit filename="src/net/itemhandler.h" />
- <Unit filename="src/net/loginhandler.cpp" />
- <Unit filename="src/net/loginhandler.h" />
- <Unit filename="src/net/maploginhandler.cpp" />
- <Unit filename="src/net/maploginhandler.h" />
- <Unit filename="src/net/messagehandler.cpp" />
- <Unit filename="src/net/messagehandler.h" />
- <Unit filename="src/net/messagein.cpp" />
- <Unit filename="src/net/messagein.h" />
- <Unit filename="src/net/messageout.cpp" />
- <Unit filename="src/net/messageout.h" />
- <Unit filename="src/net/network.cpp" />
- <Unit filename="src/net/network.h" />
- <Unit filename="src/net/npchandler.cpp" />
- <Unit filename="src/net/npchandler.h" />
- <Unit filename="src/net/partyhandler.cpp"/>
- <Unit filename="src/net/partyhandler.h" />
- <Unit filename="src/net/playerhandler.cpp" />
- <Unit filename="src/net/playerhandler.h" />
- <Unit filename="src/net/protocol.cpp" />
- <Unit filename="src/net/protocol.h" />
- <Unit filename="src/net/skillhandler.cpp" />
- <Unit filename="src/net/skillhandler.h" />
- <Unit filename="src/net/tradehandler.cpp" />
- <Unit filename="src/net/tradehandler.h" />
- <Unit filename="src/npc.cpp" />
- <Unit filename="src/npc.h" />
- <Unit filename="src/openglgraphics.cpp" />
- <Unit filename="src/openglgraphics.h" />
- <Unit filename="src/particle.cpp" />
- <Unit filename="src/particle.h" />
- <Unit filename="src/particleemitter.cpp" />
- <Unit filename="src/particleemitter.h" />
- <Unit filename="src/party.cpp" />
- <Unit filename="src/party.h" />
- <Unit filename="src/player.cpp" />
- <Unit filename="src/player.h" />
- <Unit filename="src/player_relations.cpp" />
- <Unit filename="src/player_relations.h" />
- <Unit filename="src/properties.h" />
- <Unit filename="src/recorder.cpp" />
- <Unit filename="src/recorder.h" />
- <Unit filename="src/resources/action.cpp" />
- <Unit filename="src/resources/action.h" />
- <Unit filename="src/resources/ambientoverlay.cpp" />
- <Unit filename="src/resources/ambientoverlay.h" />
- <Unit filename="src/resources/animation.cpp" />
- <Unit filename="src/resources/animation.h" />
- <Unit filename="src/resources/buddylist.cpp"/>
- <Unit filename="src/resources/buddylist.h" />
- <Unit filename="src/resources/dye.cpp" />
- <Unit filename="src/resources/dye.h" />
- <Unit filename="src/resources/image.cpp" />
- <Unit filename="src/resources/image.h" />
- <Unit filename="src/resources/imageloader.cpp" />
- <Unit filename="src/resources/imageloader.h" />
- <Unit filename="src/resources/imageset.cpp" />
- <Unit filename="src/resources/imageset.h" />
- <Unit filename="src/resources/imagewriter.cpp" />
- <Unit filename="src/resources/imagewriter.h" />
- <Unit filename="src/resources/itemdb.cpp" />
- <Unit filename="src/resources/itemdb.h" />
- <Unit filename="src/resources/iteminfo.cpp" />
- <Unit filename="src/resources/iteminfo.h" />
- <Unit filename="src/resources/mapreader.cpp" />
- <Unit filename="src/resources/mapreader.h" />
- <Unit filename="src/resources/monsterdb.cpp" />
- <Unit filename="src/resources/monsterdb.h" />
- <Unit filename="src/resources/monsterinfo.cpp" />
- <Unit filename="src/resources/monsterinfo.h" />
- <Unit filename="src/resources/music.cpp" />
- <Unit filename="src/resources/music.h" />
- <Unit filename="src/resources/npcdb.cpp" />
- <Unit filename="src/resources/npcdb.h" />
- <Unit filename="src/resources/resource.cpp" />
- <Unit filename="src/resources/resource.h" />
- <Unit filename="src/resources/resourcemanager.cpp" />
- <Unit filename="src/resources/resourcemanager.h" />
- <Unit filename="src/resources/soundeffect.cpp" />
- <Unit filename="src/resources/soundeffect.h" />
- <Unit filename="src/resources/spritedef.cpp" />
- <Unit filename="src/resources/spritedef.h" />
- <Unit filename="src/serverinfo.h" />
- <Unit filename="src/simpleanimation.cpp" />
- <Unit filename="src/simpleanimation.h" />
- <Unit filename="src/sound.cpp" />
- <Unit filename="src/sound.h" />
- <Unit filename="src/sprite.h" />
- <Unit filename="src/text.cpp" />
- <Unit filename="src/text.h" />
- <Unit filename="src/textmanager.cpp" />
- <Unit filename="src/textmanager.h" />
- <Unit filename="src/textparticle.cpp" />
- <Unit filename="src/textparticle.h" />
- <Unit filename="src/tileset.h" />
- <Unit filename="src/aethyra.rc">
+ <Linker>
+ <Add option="-s" />
+ <Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\dll" />
+ </Linker>
+ <Unit filename="src\SDLMain.h" />
+ <Unit filename="src\aethyra.rc">
<Option compilerVar="WINDRES" />
- <Option target="&lt;{~None~}&gt;" />
+ <Option target="default" />
</Unit>
- <Unit filename="src/utils/base64.cpp" />
- <Unit filename="src/utils/base64.h" />
- <Unit filename="src/utils/dtor.h" />
- <Unit filename="src/utils/fastsqrt.h" />
- <Unit filename="src/utils/strprintf.cpp" />
- <Unit filename="src/utils/strprintf.h" />
- <Unit filename="src/utils/tostring.h" />
- <Unit filename="src/utils/xml.cpp" />
- <Unit filename="src/utils/xml.h" />
- <Unit filename="src/winver.h">
- <Option target="unix" />
-=======
<Unit filename="src\animatedsprite.cpp" />
<Unit filename="src\animatedsprite.h" />
<Unit filename="src\animationparticle.cpp" />
@@ -386,10 +97,13 @@
<Unit filename="src\configlistener.h" />
<Unit filename="src\configuration.cpp" />
<Unit filename="src\configuration.h" />
+ <Unit filename="src\effectmanager.cpp" />
+ <Unit filename="src\effectmanager.h" />
<Unit filename="src\engine.cpp" />
<Unit filename="src\engine.h" />
<Unit filename="src\equipment.cpp" />
<Unit filename="src\equipment.h" />
+ <Unit filename="src\extensions.h" />
<Unit filename="src\floor_item.cpp" />
<Unit filename="src\floor_item.h" />
<Unit filename="src\flooritemmanager.cpp" />
@@ -402,10 +116,10 @@
<Unit filename="src\gui\box.h" />
<Unit filename="src\gui\browserbox.cpp" />
<Unit filename="src\gui\browserbox.h" />
- <Unit filename="src\gui\buddywindow.cpp" />
- <Unit filename="src\gui\buddywindow.h" />
<Unit filename="src\gui\button.cpp" />
<Unit filename="src\gui\button.h" />
+ <Unit filename="src\gui\buttonbox.cpp" />
+ <Unit filename="src\gui\buttonbox.h" />
<Unit filename="src\gui\buy.cpp" />
<Unit filename="src\gui\buy.h" />
<Unit filename="src\gui\buysell.cpp" />
@@ -414,14 +128,14 @@
<Unit filename="src\gui\char_select.h" />
<Unit filename="src\gui\char_server.cpp" />
<Unit filename="src\gui\char_server.h" />
- <Unit filename="src\gui\chargedialog.cpp" />
- <Unit filename="src\gui\chargedialog.h" />
<Unit filename="src\gui\chat.cpp" />
<Unit filename="src\gui\chat.h" />
<Unit filename="src\gui\chatinput.cpp" />
<Unit filename="src\gui\chatinput.h" />
<Unit filename="src\gui\checkbox.cpp" />
<Unit filename="src\gui\checkbox.h" />
+ <Unit filename="src\gui\colour.cpp" />
+ <Unit filename="src\gui\colour.h" />
<Unit filename="src\gui\confirm_dialog.cpp" />
<Unit filename="src\gui\confirm_dialog.h" />
<Unit filename="src\gui\connection.cpp" />
@@ -463,8 +177,6 @@
<Unit filename="src\gui\minimap.h" />
<Unit filename="src\gui\ministatus.cpp" />
<Unit filename="src\gui\ministatus.h" />
- <Unit filename="src\gui\newskill.cpp" />
- <Unit filename="src\gui\newskill.h" />
<Unit filename="src\gui\npc_text.cpp" />
<Unit filename="src\gui\npc_text.h" />
<Unit filename="src\gui\npclistdialog.cpp" />
@@ -485,13 +197,14 @@
<Unit filename="src\gui\register.h" />
<Unit filename="src\gui\scrollarea.cpp" />
<Unit filename="src\gui\scrollarea.h" />
- <Unit filename="src\gui\selectionlistener.h" />
<Unit filename="src\gui\sell.cpp" />
<Unit filename="src\gui\sell.h" />
<Unit filename="src\gui\setup.cpp" />
<Unit filename="src\gui\setup.h" />
<Unit filename="src\gui\setup_audio.cpp" />
<Unit filename="src\gui\setup_audio.h" />
+ <Unit filename="src\gui\setup_colours.cpp" />
+ <Unit filename="src\gui\setup_colours.h" />
<Unit filename="src\gui\setup_joystick.cpp" />
<Unit filename="src\gui\setup_joystick.h" />
<Unit filename="src\gui\setup_keyboard.cpp" />
@@ -505,10 +218,22 @@
<Unit filename="src\gui\shop.h" />
<Unit filename="src\gui\shoplistbox.cpp" />
<Unit filename="src\gui\shoplistbox.h" />
+ <Unit filename="src\gui\shortcutcontainer.cpp" />
+ <Unit filename="src\gui\shortcutcontainer.h" />
+ <Unit filename="src\gui\shortcutwindow.cpp" />
+ <Unit filename="src\gui\shortcutwindow.h" />
<Unit filename="src\gui\skill.cpp" />
<Unit filename="src\gui\skill.h" />
<Unit filename="src\gui\slider.cpp" />
<Unit filename="src\gui\slider.h" />
+ <Unit filename="src\gui\smileycontainer.cpp" />
+ <Unit filename="src\gui\smileycontainer.h" />
+ <Unit filename="src\gui\smileyshortcutcontainer.cpp" />
+ <Unit filename="src\gui\smileyshortcutcontainer.h" />
+ <Unit filename="src\gui\smileywindow.cpp" />
+ <Unit filename="src\gui\smileywindow.h" />
+ <Unit filename="src\gui\speechbubble.cpp" />
+ <Unit filename="src\gui\speechbubble.h" />
<Unit filename="src\gui\status.cpp" />
<Unit filename="src\gui\status.h" />
<Unit filename="src\gui\tabbedcontainer.cpp" />
@@ -523,12 +248,16 @@
<Unit filename="src\gui\textfield.h" />
<Unit filename="src\gui\trade.cpp" />
<Unit filename="src\gui\trade.h" />
+ <Unit filename="src\gui\truetypefont.cpp" />
+ <Unit filename="src\gui\truetypefont.h" />
<Unit filename="src\gui\updatewindow.cpp" />
<Unit filename="src\gui\updatewindow.h" />
<Unit filename="src\gui\vbox.cpp" />
<Unit filename="src\gui\vbox.h" />
<Unit filename="src\gui\viewport.cpp" />
<Unit filename="src\gui\viewport.h" />
+ <Unit filename="src\gui\widgets\dropdown.cpp" />
+ <Unit filename="src\gui\widgets\dropdown.h" />
<Unit filename="src\gui\widgets\resizegrip.cpp" />
<Unit filename="src\gui\widgets\resizegrip.h" />
<Unit filename="src\gui\window.cpp" />
@@ -588,7 +317,8 @@
<Unit filename="src\net\network.h" />
<Unit filename="src\net\npchandler.cpp" />
<Unit filename="src\net\npchandler.h" />
- <Unit filename="src\net\packet.h" />
+ <Unit filename="src\net\partyhandler.cpp" />
+ <Unit filename="src\net\partyhandler.h" />
<Unit filename="src\net\playerhandler.cpp" />
<Unit filename="src\net\playerhandler.h" />
<Unit filename="src\net\protocol.cpp" />
@@ -603,14 +333,22 @@
<Unit filename="src\openglgraphics.h" />
<Unit filename="src\particle.cpp" />
<Unit filename="src\particle.h" />
+ <Unit filename="src\particlecontainer.cpp" />
+ <Unit filename="src\particlecontainer.h" />
<Unit filename="src\particleemitter.cpp" />
<Unit filename="src\particleemitter.h" />
<Unit filename="src\particleemitterprop.h" />
+ <Unit filename="src\party.cpp" />
+ <Unit filename="src\party.h" />
<Unit filename="src\player.cpp" />
<Unit filename="src\player.h" />
<Unit filename="src\player_relations.cpp" />
<Unit filename="src\player_relations.h" />
+ <Unit filename="src\position.cpp" />
+ <Unit filename="src\position.h" />
<Unit filename="src\properties.h" />
+ <Unit filename="src\recorder.cpp" />
+ <Unit filename="src\recorder.h" />
<Unit filename="src\resources\action.cpp" />
<Unit filename="src\resources\action.h" />
<Unit filename="src\resources\ambientoverlay.cpp" />
@@ -619,6 +357,8 @@
<Unit filename="src\resources\animation.h" />
<Unit filename="src\resources\buddylist.cpp" />
<Unit filename="src\resources\buddylist.h" />
+ <Unit filename="src\resources\colordb.cpp" />
+ <Unit filename="src\resources\colordb.h" />
<Unit filename="src\resources\dye.cpp" />
<Unit filename="src\resources\dye.h" />
<Unit filename="src\resources\image.cpp" />
@@ -666,28 +406,25 @@
<Unit filename="src\textparticle.cpp" />
<Unit filename="src\textparticle.h" />
<Unit filename="src\tileset.h" />
- <Unit filename="src\tmw.rc">
- <Option compilerVar="CPP" />
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:tmw.cbp
- </Unit>
<Unit filename="src\utils\base64.cpp" />
<Unit filename="src\utils\base64.h" />
- <Unit filename="src\utils\colorconversion.cpp" />
- <Unit filename="src\utils\colorconversion.h" />
<Unit filename="src\utils\dtor.h" />
<Unit filename="src\utils\fastsqrt.h" />
+ <Unit filename="src\utils\mutex.h" />
<Unit filename="src\utils\strprintf.cpp" />
<Unit filename="src\utils\strprintf.h" />
<Unit filename="src\utils\tostring.h" />
<Unit filename="src\utils\trim.h" />
<Unit filename="src\utils\xml.cpp" />
<Unit filename="src\utils\xml.h" />
+ <Unit filename="src\vector.cpp" />
<Unit filename="src\vector.h" />
<Unit filename="src\winver.h" />
<Extensions>
<code_completion />
<envvars />
<debugger />
+ <lib_finder disable_auto="1" />
</Extensions>
</Project>
</CodeBlocks_project_file>
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 89bbf8f5..1fdf87e8 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -44,7 +44,7 @@ EffectManager::EffectManager()
for_each_xml_child_node(node, root)
{
- int id;
+ //int id;
if (xmlStrEqual(node->name, BAD_CAST "effect"))
{
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
deleted file mode 100644
index 14a941a5..00000000
--- a/src/gui/buddywindow.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
- *
- * This file is part of The Mana World.
- *
- * The Mana World is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * The Mana World is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "buddywindow.h"
-
-#include <guichan/widgets/listbox.hpp>
-
-#include "button.h"
-#include "chat.h"
-#include "scrollarea.h"
-
-#include "../resources/buddylist.h"
-
-extern ChatWindow *chatWindow;
-
-BuddyWindow::BuddyWindow():
- Window("Buddy")
-{
- setContentSize(124, 202);
-
- mBuddyList = new BuddyList();
-
- mListbox = new gcn::ListBox();
- mListbox->setListModel(mBuddyList);
-
- ScrollArea *scrollArea = new ScrollArea(mListbox);
- scrollArea->setDimension(gcn::Rectangle(
- 7, 5, 110, 170));
- add(scrollArea);
-
- Button *talk = new Button("Talk", "Talk", this);
- Button *remove = new Button("Remove", "Remove", this);
- Button *cancel = new Button("Cancel", "Cancel", this);
-
- talk->setPosition(2,180);
- remove->setPosition(talk->getWidth()+2,180);
- cancel->setPosition(talk->getWidth()+remove->getWidth()+2,180);
-
- add(talk);
- add(remove);
- add(cancel);
-}
-
-void BuddyWindow::action(const gcn::ActionEvent &event)
-{
- if (event.getId() == "Talk") {
- int selected = mListbox->getSelected();
- if ( selected > -1 )
- {
- std::string who = mBuddyList->getElementAt(selected);
- chatWindow->setInputText(who +": ");
- }
- }
- else if (event.getId() == "Remove") {
- int selected = mListbox->getSelected();
- if ( selected > -1 )
- {
- std::string who = mBuddyList->getElementAt(selected);
- mBuddyList->removeBuddy(who);
- }
- }
- else if (event.getId() == "Cancel") {
- setVisible(false);
- }
-}
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index fc00ad18..fddd5199 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -84,8 +84,8 @@ void Minimap::draw(gcn::Graphics *graphics)
if (mMapImage->getWidth() > a.width ||
mMapImage->getHeight() > a.height)
{
- mapOriginX = ((a.width) / 2) - (player_node->mX * mProportion);
- mapOriginY = ((a.height) / 2) - (player_node->mY * mProportion);
+ mapOriginX = (int) (((a.width) / 2) - (player_node->mX * mProportion));
+ mapOriginY = (int) (((a.height) / 2) - (player_node->mY * mProportion));
const int minOriginX = a.width - mMapImage->getWidth();
const int minOriginY = a.height - mMapImage->getHeight();
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
deleted file mode 100644
index 20fc01bd..00000000
--- a/src/gui/newskill.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
- *
- * This file is part of The Mana World.
- *
- * The Mana World is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * The Mana World is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
- /* This file implements the new skill dialog for use under the latest
- * version of the skill system as of 2005/02/20
- */
-
-#include "newskill.h"
-
-#include <guichan/widgets/label.hpp>
-
-#include "button.h"
-#include "progressbar.h"
-
-#include "../graphics.h"
-
-const char *skill_name[] = {
- // 0-99
- // weapon skills 0-9
- "Short Blades", "Long Blades", "Hammers", "Archery", "Whip",
- "Staves", "Throwing", "Piercing", "Hand to Hand", NULL,
- // magic skills 10-19
- "Epyri (Fire)", "Merene (Water)", "Geon (Earth)", "Izurial (Air)",
- "Lumine (Light)", "Tenebrae (Dark)", "Chronos (Time)", "Teless (Space)",
- "Gen (Mana)", NULL,
- // craft skills 20-29
- "Metalworking", "Woodworking", "Jeweler", "Cook", "Tailor",
- "Alchemist", "Artisan", "Synthesis", NULL, NULL,
- // general skills 30-39
- "Running", "Searching", "Sneak", "Trading", "Intimidate",
- "Athletics", NULL, NULL, NULL,NULL,
- // combat skills 40-49
- "Dodge", "Accuracy", "Critical", "Block", "Parry", "Diehard", "Magic Aura",
- "Counter", NULL, NULL,
- // resistance skills 50-59
- "Poison", "Silence", "Petrify", "Paralyze", "Blind", "Slow", "Zombie",
- "Critical", NULL, NULL,
- // element reistance 60-69
- "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)",
- "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", NULL,
- NULL,
- // hunting skills 70-79
- "Insects", "Birds", "Lizards", "Amorphs", "Undead", "Machines", "Arcana",
- "Humanoids", "Plantoids", NULL,
- // stats 80-89
- "Strength", "Fortitude", "Vitality", "Menality", "Awareness", "Mana",
- "Dexterity", NULL, NULL, NULL,
- // unused (reserved) 90-99
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-
-
-NewSkillDialog::NewSkillDialog():
- Window("Skills")
-{
- startPoint = 0;
- for (int i = 0; i < N_SKILL_CAT_SIZE; i++)
- {
- mSkillLabel[i] = new gcn::Label("Empty ");
- mSkillLevel[i] = new gcn::Label("00000");
- mSkillbar[i] = new ProgressBar(0.0f,100,15,0,0,255);
- mSkillLevel[i]->setAlignment(Graphics::RIGHT);
- add(mSkillLabel[i],40,5+i*25);
- add(mSkillLevel[i],150,5+i*25);
- add(mSkillbar[i],180,5+i*25);
- }
- // initialize the skills
- for (int i = 0; i < N_SKILL; i++)
- {
- mPlayerSkill[i].level = 0;
- mPlayerSkill[i].exp = 0;
- }
- resetNSD();
-
- // create controls
- Button *catButton[N_SKILL_CAT];
- catButton[0] = new Button("Weapons", "g1", this);
- catButton[1] = new Button("Magic", "g2", this);
- catButton[2] = new Button("Craft", "g3", this);
- catButton[3] = new Button("General", "g4", this);
- catButton[4] = new Button("Combat", "g5", this);
- catButton[5] = new Button("E. Resist", "g6", this);
- catButton[6] = new Button("S. Resist", "g7", this);
- catButton[7] = new Button("Hunting", "g8", this);
- catButton[8] = new Button("Stat", "g9", this);
-
- setContentSize(350, 250);
-
- for (int i = 0; i < 9; ++i) {
- catButton[i]->setDimension(gcn::Rectangle(0, 0, 60, 20));
- catButton[i]->setPosition(290, 20 * i);
- add(catButton[i]);
- }
-
- Button *closeButton = new Button("Close", "close", this);
- closeButton->setDimension(gcn::Rectangle(0,0,60,20));
- closeButton->setPosition(290, 230);
- add(closeButton);
-
- // finsihing touches
- setLocationRelativeTo(getParent());
-}
-
-void NewSkillDialog::action(const gcn::ActionEvent &event)
-{
- int osp = startPoint;
- if (event.getId() == "close")
- {
- setVisible(false);
- }
- else if (event.getId() == "g1") // weapons group 0-9
- {
- startPoint =0;
- }
- else if (event.getId() == "g2") // magic group 10-19
- {
- startPoint =10;
- }
- else if (event.getId() == "g3") // craft group 20-29
- {
- startPoint =20;
- }
- else if (event.getId() == "g4") // general group 30-39
- {
- startPoint =30;
- }
- else if (event.getId() == "g5") // combat group 40-49
- {
- startPoint =40;
- }
- else if (event.getId() == "g6") // e. resist group 50-59
- {
- startPoint =50;
- }
- else if (event.getId() == "g7") // s resist group 60-69
- {
- startPoint =60;
- }
- else if (event.getId() == "g8") // hunting group 70-79
- {
- startPoint =70;
- }
- else if (event.getId() == "g9") // stats group 80-89
- {
- startPoint =80;
- }
- if (osp != startPoint)
- {
- resetNSD();
- }
-}
-
-void NewSkillDialog::resetNSD()
-{
- for (int a = 0; a < N_SKILL_CAT_SIZE; a++)
- {
- if (skill_name[a + startPoint])
- {
- mSkillLabel[a]->setCaption(skill_name[a + startPoint]);
- mSkillLabel[a]->setVisible(true);
- char tmp[5];
- sprintf(tmp, "%d", mPlayerSkill[a+startPoint].level);
- mSkillLevel[a]->setCaption(tmp);
- mSkillLevel[a]->setVisible(true);
- mSkillbar[a]->setProgress(0.0f);
- mSkillbar[a]->setVisible(true);
- }
- else
- {
- mSkillLevel[a]->setVisible(false);
- mSkillLabel[a]->setVisible(false);
- mSkillbar[a]->setVisible(false);
- }
- }
-}
diff --git a/src/gui/smileycontainer.h b/src/gui/smileycontainer.h
index a6dadab6..ddfe9ec5 100644
--- a/src/gui/smileycontainer.h
+++ b/src/gui/smileycontainer.h
@@ -24,11 +24,11 @@
#include <list>
-#include <resources/imageset.h>
#include <guichan/mouselistener.hpp>
#include <guichan/widget.hpp>
#include <guichan/widgetlistener.hpp>
+#include "../resources/imageset.h"
#include "../guichanfwd.h"
class Image;
diff --git a/src/gui/smileyshortcutcontainer.h b/src/gui/smileyshortcutcontainer.h
index 72ddd54a..d6bbbc4f 100644
--- a/src/gui/smileyshortcutcontainer.h
+++ b/src/gui/smileyshortcutcontainer.h
@@ -25,9 +25,10 @@
#include <guichan/mouselistener.hpp>
#include <guichan/widget.hpp>
#include <guichan/widgetlistener.hpp>
-#include <resources/imageset.h>
+#include "../resources/imageset.h"
#include "../guichanfwd.h"
+
#include "shortcutcontainer.h"
class Image;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 35b5ec88..f6f9bb42 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -201,7 +201,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
// Draw text
if (textManager)
{
- textManager->draw(graphics, mPixelViewX, mPixelViewY);
+ textManager->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
}
// Draw player names, speech, and emotion sprite as needed
diff --git a/src/gui/widgets/adjustingcontainer.cpp b/src/gui/widgets/adjustingcontainer.cpp
deleted file mode 100644
index 2c613fbe..00000000
--- a/src/gui/widgets/adjustingcontainer.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2007 - 2008 Josh Matthews and Olof Naessén
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "adjustingcontainer.hpp"
-
-#include <guichan.hpp>
-
-namespace gcn
-{
- namespace contrib
- {
- AdjustingContainer::AdjustingContainer()
- : mWidth(0),
- mHeight(0),
- mNumberOfColumns(1),
- mNumberOfRows(1),
- mPaddingLeft(0),
- mPaddingRight(0),
- mPaddingTop(0),
- mPaddingBottom(0),
- mVerticalSpacing(0),
- mHorizontalSpacing(0)
-
-
- {
- mColumnWidths.push_back(0);
- mRowHeights.push_back(0);
- }
-
- AdjustingContainer::~AdjustingContainer()
- {
-
- }
-
- void AdjustingContainer::setNumberOfColumns(unsigned int numberOfColumns)
- {
- mNumberOfColumns = numberOfColumns;
-
- if (mColumnAlignment.size() < numberOfColumns)
- {
- while (mColumnAlignment.size() < numberOfColumns)
- {
- mColumnAlignment.push_back(LEFT);
- }
- }
- else
- {
- while (mColumnAlignment.size() > numberOfColumns)
- {
- mColumnAlignment.pop_back();
- }
- }
- }
-
- void AdjustingContainer::setColumnAlignment(unsigned int column,
- unsigned int alignment)
- {
- if (column < mColumnAlignment.size())
- {
- mColumnAlignment[column] = alignment;
- }
- }
-
- void AdjustingContainer::setPadding(unsigned int paddingLeft,
- unsigned int paddingRight,
- unsigned int paddingTop,
- unsigned int paddingBottom)
- {
- mPaddingLeft = paddingLeft;
- mPaddingRight = paddingRight;
- mPaddingTop = paddingTop;
- mPaddingBottom = paddingBottom;
- }
-
- void AdjustingContainer::setVerticalSpacing(unsigned int verticalSpacing)
- {
- mVerticalSpacing = verticalSpacing;
- }
-
- void AdjustingContainer::setHorizontalSpacing(unsigned int horizontalSpacing)
- {
- mHorizontalSpacing = horizontalSpacing;
- }
-
- void AdjustingContainer::logic()
- {
- Container::logic();
- adjustContent();
- }
-
- void AdjustingContainer::add(Widget *widget)
- {
- Container::add(widget);
- mContainedWidgets.push_back(widget);
- }
-
- void AdjustingContainer::add(Widget *widget, int x, int y)
- {
- add(widget);
- }
-
- void AdjustingContainer::clear()
- {
- Container::clear();
- mContainedWidgets.clear();
- }
-
- void AdjustingContainer::remove(Widget *widget)
- {
- Container::remove(widget);
- std::vector<gcn::Widget *>::iterator it;
- for(it = mContainedWidgets.begin(); it != mContainedWidgets.end(); it++)
- {
- if(*it == widget)
- {
- mContainedWidgets.erase(it);
- break;
- }
- }
- }
-
- void AdjustingContainer::adjustSize()
- {
- mNumberOfRows = mContainedWidgets.size()
- / mNumberOfColumns + mContainedWidgets.size() % mNumberOfColumns;
-
- mColumnWidths.clear();
-
- unsigned int i;
- for (i = 0; i < mNumberOfColumns; i++)
- {
- mColumnWidths.push_back(0);
- }
-
- mRowHeights.clear();
-
- for (i = 0; i < mNumberOfRows; i++)
- {
- mRowHeights.push_back(0);
- }
-
- for (i = 0; i < mNumberOfColumns; i++)
- {
- unsigned int j;
- for (j = 0; j < mNumberOfRows && mNumberOfColumns * j + i < mContainedWidgets.size(); j++)
- {
- if ((unsigned int)mContainedWidgets[mNumberOfColumns * j + i]->getWidth() > mColumnWidths[i])
- {
- mColumnWidths[i] = mContainedWidgets[mNumberOfColumns * j + i]->getWidth();
- }
- if ((unsigned int)mContainedWidgets[mNumberOfColumns * j + i]->getHeight() > mRowHeights[j])
- {
- mRowHeights[j] = mContainedWidgets[mNumberOfColumns * j + i]->getHeight();
- }
- }
- }
-
- mWidth = mPaddingLeft;
-
- for (i = 0; i < mColumnWidths.size(); i++)
- {
- mWidth += mColumnWidths[i] + mHorizontalSpacing;
- }
-
- mWidth -= mHorizontalSpacing;
- mWidth += mPaddingRight;
-
- mHeight = mPaddingTop;
-
- for (i = 0; i < mRowHeights.size(); i++)
- {
- mHeight += mRowHeights[i] + mVerticalSpacing;
- }
-
- mHeight -= mVerticalSpacing;
- mHeight += mPaddingBottom;
-
- setHeight(mHeight);
- setWidth(mWidth);
- }
-
- void AdjustingContainer::adjustContent()
- {
- adjustSize();
-
- unsigned int columnCount = 0;
- unsigned int rowCount = 0;
- unsigned int y = mPaddingTop;
-
- for (unsigned int i = 0; i < mContainedWidgets.size(); i++)
- {
- unsigned basex;
- if (columnCount % mNumberOfColumns)
- {
- basex = mPaddingLeft;
- unsigned int j;
-
- for (j = 0; j < columnCount; j++)
- {
- basex += mColumnWidths[j] + mHorizontalSpacing;
- }
- }
- else
- {
- basex = mPaddingLeft;
- }
-
- switch (mColumnAlignment[columnCount])
- {
- case LEFT:
- mContainedWidgets[i]->setX(basex);
- break;
- case CENTER:
- mContainedWidgets[i]->setX(basex + (mColumnWidths[columnCount] - mContainedWidgets[i]->getWidth()) / 2);
- break;
- case RIGHT:
- mContainedWidgets[i]->setX(basex + mColumnWidths[columnCount] - mContainedWidgets[i]->getWidth());
- break;
- default:
- throw GCN_EXCEPTION("Unknown alignment.");
- }
-
- mContainedWidgets[i]->setY(y);
- columnCount++;
-
- if (columnCount == mNumberOfColumns)
- {
- columnCount = 0;
- y += mRowHeights[rowCount] + mVerticalSpacing;
- rowCount++;
- }
- }
- }
- }
-}
diff --git a/src/gui/widgets/adjustingcontainer.hpp b/src/gui/widgets/adjustingcontainer.hpp
deleted file mode 100644
index 3227274e..00000000
--- a/src/gui/widgets/adjustingcontainer.hpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2007 - 2008 Josh Matthews and Olof Naessén
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_CONTRIB_ADJUSTINGCONTAINER_HPP
-#define GCN_CONTRIB_ADJUSTINGCONTAINER_HPP
-
-#include <vector>
-
-namespace gcn
-{
- namespace contrib
- {
- /**
- * Self-adjusting Container class. AdjustingContainers are an easy way to
- * have Guichan position a group of widgets for you. It organizes elements
- * in a table layout, with fixed columns and variable rows. The user specifies
- *
- * @verbitam
- * <ul>
- * <li>the number of columns</li>
- * <li>horizontal spacing between columns</li>
- * <li>vertical spacing between rows</li>
- * <li>padding around the sides of the container</li>
- * <li>each column's alignment</li>
- * </ul>
- * @endverbitam
- *
- * These properties give the user a lot of flexibility to make the
- * widgets look just right.
- * @code
- * AdjustingContainer *adjust = new AdjustingContainer;
- * adjust->setPadding(5, 5, 5, 5); //left, right, top, bottom
- * adjust->setHorizontalSpacing(3);
- * adjust->setVerticalSpacing(3);
- * adjust->setColumns(3);
- * adjust->setColumnAlignment(0, AdjustingContainer::LEFT);
- * adjust->setColumnAlignment(1, AdjustingContainer::CENTER);
- * adjust->setColumnAlignment(2, AdjustingContainer::RIGHT);
- * top->add(adjust);
- *
- * for(int j = 0; j < 9; j++)
- * {
- * gcn::Label *l;
- * int r = rand() % 3;
- * if(r == 0)
- * l = new gcn::Label("Short");
- * else if(r == 1)
- * l = new gcn::Label("A longer phrase");
- * else
- * l = new gcn::Label("Extravagent and wordy text");
- * adjust->add(l);
- * @endcode
- *
- * Output:
- * @verbitam
- * <pre>
- *+---------------------------------------------------------------------------+
- *| |
- *| A longer phrase Short Extravagent and wordy text |
- *| |
- *| Short Extravagent and wordy text Short |
- *| |
- *| Short A longer phrase A longer phrase |
- *| |
- *+---------------------------------------------------------------------------+
- * </pre>
- * @endverbitam
- * As you can see, each column is only as big as its largest element.
- * The AdjustingContainer will resize itself and rearrange its contents
- * based on whatever widgets it contains, allowing dynamic addition and
- * removal while the program is running. It also plays nicely with ScrollAreas,
- * allowing you to show a fixed, maximum size while not limiting the actual
- * container.
- *
- * For more help with using AdjustingContainers, try the Guichan forums
- * (http://guichan.sourceforge.net/forum/) or email mrlachatte@gmail.com.
- *
- * @author Josh Matthews
- */
- class AdjustingContainer : public gcn::Container
- {
- public:
- /**
- * Constructor.
- */
- AdjustingContainer();
-
- /**
- * Destructor.
- */
- virtual ~AdjustingContainer();
-
- /**
- * Set the number of columns to divide the widgets into.
- * The number of rows is derived automatically from the number
- * of widgets based on the number of columns. Default column
- * alignment is left.
- *
- * @param numberOfColumns the number of columns.
- */
- virtual void setNumberOfColumns(unsigned int numberOfColumns);
-
- /**
- * Set a specific column's alignment.
- *
- * @param column the column number, starting from 0.
- * @param alignment the column's alignment. See enum with alignments.
- */
- virtual void setColumnAlignment(unsigned int column, unsigned int alignment);
-
- /**
- * Set the padding for the sides of the container.
- *
- * @param paddingLeft left padding.
- * @param paddingRight right padding.
- * @param paddingTop top padding.
- * @param paddingBottom bottom padding.
- */
- virtual void setPadding(unsigned int paddingLeft,
- unsigned int paddingRight,
- unsigned int paddingTop,
- unsigned int paddingBottom);
-
- /**
- * Set the spacing between rows.
- *
- * @param verticalSpacing spacing in pixels.
- */
- virtual void setVerticalSpacing(unsigned int verticalSpacing);
-
- /**
- * Set the horizontal spacing between columns.
- *
- * @param horizontalSpacing spacing in pixels.
- */
- virtual void setHorizontalSpacing(unsigned int horizontalSpacing);
-
- /**
- * Rearrange the widgets and resize the container.
- */
- virtual void adjustContent();
-
-
- // Inherited from Container
-
- virtual void logic();
-
- virtual void add(Widget *widget);
-
- virtual void add(Widget *widget, int x, int y);
-
- virtual void remove(Widget *widget);
-
- virtual void clear();
-
- /**
- * Possible alignment values for each column.
- *
- * LEFT - Align content to the left of the column.
- * MIDDLE - Align content to the middle of the column.
- * RIGHT - Align content to the right of the column.
- */
- enum
- {
- LEFT = 0,
- CENTER,
- RIGHT
- };
-
- protected:
-
- /**
- * Adjust the size of the container to fit all the widgets.
- */
- virtual void adjustSize();
-
- std::vector<Widget*> mContainedWidgets;
- std::vector<unsigned int> mColumnWidths;
- std::vector<unsigned int> mColumnAlignment;
- std::vector<unsigned int> mRowHeights;
- unsigned int mWidth;
- unsigned int mHeight;
- unsigned int mNumberOfColumns;
- unsigned int mNumberOfRows;
- unsigned int mPaddingLeft;
- unsigned int mPaddingRight;
- unsigned int mPaddingTop;
- unsigned int mPaddingBottom;
- unsigned int mVerticalSpacing;
- unsigned int mHorizontalSpacing;
- };
- }
-}
-
-#endif