diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-14 00:28:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-14 00:42:56 +0300 |
| commit | 55a6d5e67d528910f94c0e20c497cd6042aff81e (patch) | |
| tree | 3b7f3a4d3dc90aff9dce42a1197b5910de464543 /src/net | |
| parent | 286554f730ca3fca716bf78e912e807a72dfee66 (diff) | |
| download | manaplus-55a6d5e67d528910f94c0e20c497cd6042aff81e.tar.gz manaplus-55a6d5e67d528910f94c0e20c497cd6042aff81e.tar.bz2 manaplus-55a6d5e67d528910f94c0e20c497cd6042aff81e.tar.xz manaplus-55a6d5e67d528910f94c0e20c497cd6042aff81e.zip | |
Move skill error defines into separate file.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/skillrecv.h | 34 | ||||
| -rw-r--r-- | src/net/eathena/skillrecv.cpp | 7 | ||||
| -rw-r--r-- | src/net/tmwa/skillrecv.cpp | 2 |
3 files changed, 9 insertions, 34 deletions
diff --git a/src/net/ea/skillrecv.h b/src/net/ea/skillrecv.h index 3c5323a36..8a91b5795 100644 --- a/src/net/ea/skillrecv.h +++ b/src/net/ea/skillrecv.h @@ -30,40 +30,6 @@ namespace Net class MessageIn; } -/** job dependend identifiers (?) */ -static const unsigned int SKILL_BASIC = 0x0001; -static const unsigned int SKILL_WARP = 0x001b; -static const unsigned int SKILL_STEAL = 0x0032; -static const unsigned int SKILL_ENVENOM = 0x0034; - -/** basic skills identifiers */ -static const unsigned int BSKILL_TRADE = 0x0000; -static const unsigned int BSKILL_EMOTE = 0x0001; -static const unsigned int BSKILL_SIT = 0x0002; -static const unsigned int BSKILL_CREATECHAT = 0x0003; -static const unsigned int BSKILL_JOINPARTY = 0x0004; -static const unsigned int BSKILL_SHOUT = 0x0005; - -/** reasons why action failed */ -static const unsigned int RFAIL_SKILLDEP = 0x00; -static const unsigned int RFAIL_INSUFSP = 0x01; -static const unsigned int RFAIL_INSUFHP = 0x02; -static const unsigned int RFAIL_NOMEMO = 0x03; -static const unsigned int RFAIL_SKILLDELAY = 0x04; -static const unsigned int RFAIL_ZENY = 0x05; -static const unsigned int RFAIL_WEAPON = 0x06; -static const unsigned int RFAIL_REDGEM = 0x07; -static const unsigned int RFAIL_BLUEGEM = 0x08; -static const unsigned int RFAIL_OVERWEIGHT = 0x09; - -static const unsigned int RFAIL_SUMMON = 19; -static const unsigned int RFAIL_NEED_ITEM = 71; -static const unsigned int RFAIL_NEED_EQUIPMENT = 72; -static const unsigned int RFAIL_SPIRITS = 74; - -/** should always be zero if failed */ -static const unsigned int SKILL_FAILED = 0x00; - namespace Ea { namespace SkillRecv diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp index 75e6464f4..5ebf59178 100644 --- a/src/net/eathena/skillrecv.cpp +++ b/src/net/eathena/skillrecv.cpp @@ -27,6 +27,8 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "const/net/skill.h" + #include "enums/resources/notifytypes.h" #include "gui/widgets/createwidget.h" @@ -52,6 +54,11 @@ #include "debug.h" +static const unsigned int RFAIL_SUMMON = 19; +static const unsigned int RFAIL_NEED_ITEM = 71; +static const unsigned int RFAIL_NEED_EQUIPMENT = 72; +static const unsigned int RFAIL_SPIRITS = 74; + namespace EAthena { diff --git a/src/net/tmwa/skillrecv.cpp b/src/net/tmwa/skillrecv.cpp index 0330d3566..1713ba301 100644 --- a/src/net/tmwa/skillrecv.cpp +++ b/src/net/tmwa/skillrecv.cpp @@ -27,6 +27,8 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "const/net/skill.h" + #include "enums/resources/notifytypes.h" #include "gui/windows/skilldialog.h" |