diff options
| author | Philipp Sehmisch <mana@crushnet.org> | 2010-07-10 19:00:50 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <mana@crushnet.org> | 2010-07-10 19:00:50 +0200 |
| commit | 105438d77ce83972d70a1ce67728aaf72c9ec2b6 (patch) | |
| tree | b290e4f106e33226bac0ada8c30377674683dfda /mana.cbp | |
| parent | 9b72b2760e333e92877ec1e4d002fec6e612ad0e (diff) | |
| download | mana-105438d77ce83972d70a1ce67728aaf72c9ec2b6.tar.gz mana-105438d77ce83972d70a1ce67728aaf72c9ec2b6.tar.bz2 mana-105438d77ce83972d70a1ce67728aaf72c9ec2b6.tar.xz mana-105438d77ce83972d70a1ce67728aaf72c9ec2b6.zip | |
Moved parsing of specials.xml from gui/specialswindow.cpp to separate source files.
Restored functional recharge bars in specials window.
Individual specials are only shown after the server informed the client about their status.
Made level label, use button and progress bars optional. Their use is controlled through specials.xml.
The special window button is again shown even when the player has no specials. This problem needs to be solved differently now for architecture reasons.
Reviewed-by: Jaxad0127
Diffstat (limited to 'mana.cbp')
| -rw-r--r-- | mana.cbp | 99 |
1 files changed, 50 insertions, 49 deletions
@@ -11,6 +11,7 @@ <Option object_output=".objs\" /> <Option type="0" /> <Option compiler="gcc" /> + <Option parameters="-u -d C:\mana\data" /> <Option projectResourceIncludeDirsRelation="0" /> <Compiler> <Add option="-O3" /> @@ -128,7 +129,6 @@ <Unit filename="src\effectmanager.h" /> <Unit filename="src\emoteshortcut.cpp" /> <Unit filename="src\emoteshortcut.h" /> - <Unit filename="src\engine.h" /> <Unit filename="src\equipment.h" /> <Unit filename="src\flooritem.cpp" /> <Unit filename="src\flooritem.h" /> @@ -243,9 +243,9 @@ <Unit filename="src\gui\unregisterdialog.cpp" /> <Unit filename="src\gui\unregisterdialog.h" /> <Unit filename="src\gui\updatewindow.cpp" /> + <Unit filename="src\gui\updatewindow.h" /> <Unit filename="src\gui\userpalette.cpp" /> <Unit filename="src\gui\userpalette.h" /> - <Unit filename="src\gui\updatewindow.h" /> <Unit filename="src\gui\viewport.cpp" /> <Unit filename="src\gui\viewport.h" /> <Unit filename="src\gui\widgets\avatarlistbox.cpp" /> @@ -360,7 +360,6 @@ <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\main.cpp" /> @@ -379,52 +378,6 @@ <Unit filename="src\net\chathandler.h" /> <Unit filename="src\net\download.cpp" /> <Unit filename="src\net\download.h" /> - <Unit filename="src\net\tmwa\adminhandler.cpp" /> - <Unit filename="src\net\tmwa\adminhandler.h" /> - <Unit filename="src\net\tmwa\beinghandler.cpp" /> - <Unit filename="src\net\tmwa\beinghandler.h" /> - <Unit filename="src\net\tmwa\buysellhandler.cpp" /> - <Unit filename="src\net\tmwa\buysellhandler.h" /> - <Unit filename="src\net\tmwa\charserverhandler.cpp" /> - <Unit filename="src\net\tmwa\charserverhandler.h" /> - <Unit filename="src\net\tmwa\chathandler.cpp" /> - <Unit filename="src\net\tmwa\chathandler.h" /> - <Unit filename="src\net\tmwa\gamehandler.cpp" /> - <Unit filename="src\net\tmwa\gamehandler.h" /> - <Unit filename="src\net\tmwa\generalhandler.cpp" /> - <Unit filename="src\net\tmwa\generalhandler.h" /> - <Unit filename="src\net\tmwa\gui\guildtab.cpp" /> - <Unit filename="src\net\tmwa\gui\guildtab.h" /> - <Unit filename="src\net\tmwa\gui\partytab.cpp" /> - <Unit filename="src\net\tmwa\gui\partytab.h" /> - <Unit filename="src\net\tmwa\guildhandler.cpp" /> - <Unit filename="src\net\tmwa\guildhandler.h" /> - <Unit filename="src\net\tmwa\inventoryhandler.cpp" /> - <Unit filename="src\net\tmwa\inventoryhandler.h" /> - <Unit filename="src\net\tmwa\itemhandler.cpp" /> - <Unit filename="src\net\tmwa\itemhandler.h" /> - <Unit filename="src\net\tmwa\loginhandler.cpp" /> - <Unit filename="src\net\tmwa\loginhandler.h" /> - <Unit filename="src\net\tmwa\messagehandler.cpp" /> - <Unit filename="src\net\tmwa\messagehandler.h" /> - <Unit filename="src\net\tmwa\messagein.cpp" /> - <Unit filename="src\net\tmwa\messagein.h" /> - <Unit filename="src\net\tmwa\messageout.cpp" /> - <Unit filename="src\net\tmwa\messageout.h" /> - <Unit filename="src\net\tmwa\network.cpp" /> - <Unit filename="src\net\tmwa\network.h" /> - <Unit filename="src\net\tmwa\npchandler.cpp" /> - <Unit filename="src\net\tmwa\npchandler.h" /> - <Unit filename="src\net\tmwa\partyhandler.cpp" /> - <Unit filename="src\net\tmwa\partyhandler.h" /> - <Unit filename="src\net\tmwa\playerhandler.cpp" /> - <Unit filename="src\net\tmwa\playerhandler.h" /> - <Unit filename="src\net\tmwa\protocol.h" /> - <Unit filename="src\net\tmwa\specialhandler.cpp" /> - <Unit filename="src\net\tmwa\specialhandler.h" /> - <Unit filename="src\net\tmwa\token.h" /> - <Unit filename="src\net\tmwa\tradehandler.cpp" /> - <Unit filename="src\net\tmwa\tradehandler.h" /> <Unit filename="src\net\gamehandler.h" /> <Unit filename="src\net\generalhandler.h" /> <Unit filename="src\net\guildhandler.h" /> @@ -492,6 +445,52 @@ <Unit filename="src\net\playerhandler.h" /> <Unit filename="src\net\serverinfo.h" /> <Unit filename="src\net\specialhandler.h" /> + <Unit filename="src\net\tmwa\adminhandler.cpp" /> + <Unit filename="src\net\tmwa\adminhandler.h" /> + <Unit filename="src\net\tmwa\beinghandler.cpp" /> + <Unit filename="src\net\tmwa\beinghandler.h" /> + <Unit filename="src\net\tmwa\buysellhandler.cpp" /> + <Unit filename="src\net\tmwa\buysellhandler.h" /> + <Unit filename="src\net\tmwa\charserverhandler.cpp" /> + <Unit filename="src\net\tmwa\charserverhandler.h" /> + <Unit filename="src\net\tmwa\chathandler.cpp" /> + <Unit filename="src\net\tmwa\chathandler.h" /> + <Unit filename="src\net\tmwa\gamehandler.cpp" /> + <Unit filename="src\net\tmwa\gamehandler.h" /> + <Unit filename="src\net\tmwa\generalhandler.cpp" /> + <Unit filename="src\net\tmwa\generalhandler.h" /> + <Unit filename="src\net\tmwa\gui\guildtab.cpp" /> + <Unit filename="src\net\tmwa\gui\guildtab.h" /> + <Unit filename="src\net\tmwa\gui\partytab.cpp" /> + <Unit filename="src\net\tmwa\gui\partytab.h" /> + <Unit filename="src\net\tmwa\guildhandler.cpp" /> + <Unit filename="src\net\tmwa\guildhandler.h" /> + <Unit filename="src\net\tmwa\inventoryhandler.cpp" /> + <Unit filename="src\net\tmwa\inventoryhandler.h" /> + <Unit filename="src\net\tmwa\itemhandler.cpp" /> + <Unit filename="src\net\tmwa\itemhandler.h" /> + <Unit filename="src\net\tmwa\loginhandler.cpp" /> + <Unit filename="src\net\tmwa\loginhandler.h" /> + <Unit filename="src\net\tmwa\messagehandler.cpp" /> + <Unit filename="src\net\tmwa\messagehandler.h" /> + <Unit filename="src\net\tmwa\messagein.cpp" /> + <Unit filename="src\net\tmwa\messagein.h" /> + <Unit filename="src\net\tmwa\messageout.cpp" /> + <Unit filename="src\net\tmwa\messageout.h" /> + <Unit filename="src\net\tmwa\network.cpp" /> + <Unit filename="src\net\tmwa\network.h" /> + <Unit filename="src\net\tmwa\npchandler.cpp" /> + <Unit filename="src\net\tmwa\npchandler.h" /> + <Unit filename="src\net\tmwa\partyhandler.cpp" /> + <Unit filename="src\net\tmwa\partyhandler.h" /> + <Unit filename="src\net\tmwa\playerhandler.cpp" /> + <Unit filename="src\net\tmwa\playerhandler.h" /> + <Unit filename="src\net\tmwa\protocol.h" /> + <Unit filename="src\net\tmwa\specialhandler.cpp" /> + <Unit filename="src\net\tmwa\specialhandler.h" /> + <Unit filename="src\net\tmwa\token.h" /> + <Unit filename="src\net\tmwa\tradehandler.cpp" /> + <Unit filename="src\net\tmwa\tradehandler.h" /> <Unit filename="src\net\tradehandler.h" /> <Unit filename="src\net\worldinfo.h" /> <Unit filename="src\openglgraphics.cpp" /> @@ -552,6 +551,8 @@ <Unit filename="src\resources\resourcemanager.h" /> <Unit filename="src\resources\soundeffect.cpp" /> <Unit filename="src\resources\soundeffect.h" /> + <Unit filename="src\resources\specialdb.cpp" /> + <Unit filename="src\resources\specialdb.h" /> <Unit filename="src\resources\spritedef.cpp" /> <Unit filename="src\resources\spritedef.h" /> <Unit filename="src\resources\wallpaper.cpp" /> |