diff options
33 files changed, 70 insertions, 47 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2dfc25006..6e3e6f0c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -807,7 +807,7 @@ SET(SRCS being/actorsprite.cpp being/actorsprite.h being/actortype.h - being/attributes.h + enums/being/attributes.h listeners/actorspritelistener.h listeners/arrowslistener.cpp listeners/arrowslistener.h diff --git a/src/Makefile.am b/src/Makefile.am index 6029725d1..e557f59fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -929,7 +929,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/actorsprite.cpp \ being/actorsprite.h \ being/actortype.h \ - being/attributes.h \ + enums/being/attributes.h \ listeners/actorspritelistener.h \ listeners/arrowslistener.cpp \ listeners/arrowslistener.h \ diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 71e0e972e..7596758c8 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -32,10 +32,11 @@ #include "actions/actiondef.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "enums/gui/dialogtype.h" #include "gui/gui.h" diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 7a1ec6126..c847434a9 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -26,11 +26,12 @@ #include "settings.h" #include "main.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" #include "being/playerrelations.h" +#include "enums/being/attributes.h" + #include "enums/net/packettypes.h" #include "gui/viewport.h" diff --git a/src/being/being.cpp b/src/being/being.cpp index ebf7ee566..1ef37c15a 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -33,12 +33,13 @@ #include "soundmanager.h" #include "text.h" -#include "being/attributes.h" #include "being/beingcacheentry.h" #include "being/beingflag.h" #include "being/beingspeech.h" #include "being/playerrelations.h" +#include "enums/being/attributes.h" + #include "enums/net/packettypes.h" #include "particle/particle.h" diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 53189f531..d5a195753 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -36,11 +36,12 @@ #include "statuseffect.h" #include "resources/map/walklayer.h" -#include "being/attributes.h" #include "being/beingflag.h" #include "being/playerinfo.h" #include "being/playerrelations.h" +#include "enums/being/attributes.h" + #include "enums/net/packettypes.h" #include "particle/particle.h" diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index fd30a4274..8d8d20071 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -24,14 +24,15 @@ #include "client.h" #include "configuration.h" #include "inventory.h" +#include "itemsoundmanager.h" + -#include "being/attributes.h" #include "being/homunculusinfo.h" #include "being/localplayer.h" #include "being/mercenaryinfo.h" #include "being/petinfo.h" -#include "itemsoundmanager.h" +#include "enums/being/attributes.h" #include "gui/windows/inventorywindow.h" #include "gui/windows/npcdialog.h" diff --git a/src/being/attributes.h b/src/enums/being/attributes.h index d20ace237..91b809faf 100644 --- a/src/being/attributes.h +++ b/src/enums/being/attributes.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BEING_ATTRIBUTES_H -#define BEING_ATTRIBUTES_H +#ifndef ENUMS_BEING_ATTRIBUTES_H +#define ENUMS_BEING_ATTRIBUTES_H namespace Attributes { @@ -29,7 +29,7 @@ namespace Attributes */ enum Attributes { - LEVEL = 0, + LEVEL = 0, HP, MAX_HP, MP, @@ -39,19 +39,19 @@ namespace Attributes MONEY, TOTAL_WEIGHT, MAX_WEIGHT, - JOB = 10, - STR = 13, - AGI = 14, - VIT = 15, - INT = 16, - DEX = 17, - LUK = 18, + JOB = 10, + STR = 13, + AGI = 14, + VIT = 15, + INT = 16, + DEX = 17, + LUK = 18, SKILL_POINTS, CHAR_POINTS, CORR_POINTS, ATTACK_DELAY = 100, ATTACK_RANGE = 101, - WALK_SPEED = 102, + WALK_SPEED = 102, ATTACK_SPEED = 103, KARMA, MANNER, @@ -65,4 +65,4 @@ namespace Attributes }; } // namespace Attributes -#endif // BEING_ATTRIBUTES_H +#endif // ENUMS_BEING_ATTRIBUTES_H diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp index cb9381738..cb3e065bd 100644 --- a/src/gui/dialogsmanager.cpp +++ b/src/gui/dialogsmanager.cpp @@ -25,7 +25,7 @@ #include "configuration.h" #include "settings.h" -#include "being/attributes.h" +#include "enums/being/attributes.h" #include "enums/gui/dialogtype.h" diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp index 292170503..de4b4bc00 100644 --- a/src/gui/widgets/characterdisplay.cpp +++ b/src/gui/widgets/characterdisplay.cpp @@ -24,7 +24,7 @@ #include "units.h" -#include "being/attributes.h" +#include "enums/being/attributes.h" #include "gui/gui.h" diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 51204bf4f..9e68da061 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -26,9 +26,9 @@ #include "configuration.h" #include "units.h" -#include "input/inputaction.h" +#include "enums/being/attributes.h" -#include "being/attributes.h" +#include "input/inputaction.h" #include "listeners/charrenamelistener.h" #include "listeners/pincodelistener.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 9190f44f0..49ef73907 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -30,11 +30,12 @@ #include "settings.h" #include "spellshortcut.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" #include "being/playerrelations.h" +#include "enums/being/attributes.h" + #include "input/inputmanager.h" #include "gui/chatconsts.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 4cd0e05c6..25e087ec1 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -26,9 +26,10 @@ #include "item.h" #include "units.h" -#include "being/attributes.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "input/inputmanager.h" #include "gui/gui.h" diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index 582fa5cf5..89626598e 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -32,10 +32,11 @@ #include "client.h" #include "game.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "resources/map/map.h" #include "utils/gettext.h" diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index ffa3f4888..02f1f8400 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -26,10 +26,11 @@ #include "configuration.h" #include "inventory.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/popupmanager.h" #include "gui/skin.h" diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 695236e35..4d8e4f000 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -51,11 +51,12 @@ #include "shopitem.h" #include "soundmanager.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" #include "being/playerrelations.h" +#include "enums/being/attributes.h" + #include "net/chathandler.h" #include "net/tradehandler.h" diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 748b707f6..514bd101b 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -27,9 +27,10 @@ #include "itemshortcut.h" #include "spellmanager.h" -#include "being/attributes.h" #include "being/localplayer.h" +#include "enums/being/attributes.h" + #include "gui/models/skillmodel.h" #include "gui/windows/setupwindow.h" diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 37315e236..db03fbe70 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -31,10 +31,11 @@ #include "gui/windows/chatwindow.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/windows/equipmentwindow.h" #include "gui/windows/setupwindow.h" diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 5d7e8f6dc..708f4bc4d 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -27,11 +27,12 @@ #include "item.h" #include "units.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" #include "being/playerrelations.h" +#include "enums/being/attributes.h" + #include "gui/gui.h" #include "gui/fonts/font.h" diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 4131f170e..11785fec0 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -26,9 +26,10 @@ #include "inventory.h" #include "notifymanager.h" -#include "being/attributes.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/windows/chatwindow.h" #include "gui/windows/buyselldialog.h" #include "gui/windows/npcselldialog.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 3443e6ce7..1be2e5be2 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -24,10 +24,11 @@ #include "notifymanager.h" +#include "being/localplayer.h" + #include "enums/equipslot.h" -#include "being/attributes.h" -#include "being/localplayer.h" +#include "enums/being/attributes.h" #include "net/messagein.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index e0731cff3..b8210219d 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -28,9 +28,10 @@ #include "soundmanager.h" #include "units.h" -#include "being/attributes.h" #include "being/localplayer.h" +#include "enums/being/attributes.h" + #include "gui/viewport.h" #include "gui/windows/skilldialog.h" diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 769160894..ce8b220d5 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -24,9 +24,10 @@ #include "notifymanager.h" -#include "being/attributes.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/windows/buydialog.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp index c6191c512..109a3c1b1 100644 --- a/src/net/eathena/cashshophandler.cpp +++ b/src/net/eathena/cashshophandler.cpp @@ -20,9 +20,10 @@ #include "net/eathena/cashshophandler.h" -#include "being/attributes.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/windows/buydialog.h" #include "net/eathena/messageout.h" diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 2becc5c35..09d5257ce 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -26,7 +26,7 @@ #include "configuration.h" #include "settings.h" -#include "being/attributes.h" +#include "enums/being/attributes.h" #include "enums/gui/dialogtype.h" diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 9d0ad4797..30697388e 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -26,7 +26,7 @@ #include "configuration.h" #include "logger.h" -#include "being/attributes.h" +#include "enums/being/attributes.h" #include "gui/windows/inventorywindow.h" #include "gui/windows/skilldialog.h" diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp index 7785a1d8f..f57b3ec2d 100644 --- a/src/net/eathena/markethandler.cpp +++ b/src/net/eathena/markethandler.cpp @@ -22,9 +22,10 @@ #include "notifymanager.h" -#include "being/attributes.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/windows/buydialog.h" #include "net/eathena/messageout.h" diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 2d6d5604f..601dab1c6 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -22,9 +22,10 @@ #include "net/eathena/playerhandler.h" -#include "being/attributes.h" #include "being/localplayer.h" +#include "enums/being/attributes.h" + #include "gui/windows/statuswindow.h" #include "net/eathena/messageout.h" diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 2e0287a9e..2f870c0a9 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -24,9 +24,10 @@ #include "notifymanager.h" -#include "being/attributes.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/windows/buydialog.h" #include "net/serverfeatures.h" diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 53c368f03..a61d00e7c 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -26,7 +26,7 @@ #include "configuration.h" #include "settings.h" -#include "being/attributes.h" +#include "enums/being/attributes.h" #include "enums/gui/dialogtype.h" diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index db20e3aea..b42020ce0 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -26,7 +26,7 @@ #include "configuration.h" #include "logger.h" -#include "being/attributes.h" +#include "enums/being/attributes.h" #include "gui/windows/inventorywindow.h" #include "gui/windows/skilldialog.h" diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 6c654df87..ec0bd3d54 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -24,10 +24,11 @@ #include "configuration.h" -#include "being/attributes.h" #include "being/beingflag.h" #include "being/localplayer.h" +#include "enums/being/attributes.h" + #include "gui/onlineplayer.h" #include "gui/windows/statuswindow.h" diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index 8836ed672..4b627ffde 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -24,10 +24,11 @@ #include "configuration.h" -#include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/being/attributes.h" + #include "gui/windows/chatwindow.h" #include "net/playerhandler.h" |