From 55a6d5e67d528910f94c0e20c497cd6042aff81e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 14 Dec 2015 00:28:55 +0300 Subject: Move skill error defines into separate file. --- src/const/net/skill.h | 57 +++++++++++++++++++++++++++++++++++++++++++ src/net/ea/skillrecv.h | 34 -------------------------- src/net/eathena/skillrecv.cpp | 7 ++++++ src/net/tmwa/skillrecv.cpp | 2 ++ 4 files changed, 66 insertions(+), 34 deletions(-) create mode 100644 src/const/net/skill.h diff --git a/src/const/net/skill.h b/src/const/net/skill.h new file mode 100644 index 000000000..febf7b7d7 --- /dev/null +++ b/src/const/net/skill.h @@ -0,0 +1,57 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program 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. + * + * This program 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 this program. If not, see . + */ + +#ifndef CONST_NET_SKILL_H +#define CONST_NET_SKILL_H + +#include "localconsts.h" + +/** 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; + +/** should always be zero if failed */ +static const unsigned int SKILL_FAILED = 0x00; + +#endif // CONST_NET_SKILL_H 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" -- cgit v1.2.3-70-g09d2