summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 18:55:09 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 18:55:09 +0300
commitfb8885f31122ca020ef61f540b44cca126653d15 (patch)
treef578db8e5134c642c9d0c2cc2082c8b9c63243e7 /src/being
parent8aca3361806f6d00c5b9c0b318354230ac2fab1c (diff)
downloadplus-fb8885f31122ca020ef61f540b44cca126653d15.tar.gz
plus-fb8885f31122ca020ef61f540b44cca126653d15.tar.bz2
plus-fb8885f31122ca020ef61f540b44cca126653d15.tar.xz
plus-fb8885f31122ca020ef61f540b44cca126653d15.zip
Move attributes.h into enums directory.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/attributes.h68
-rw-r--r--src/being/being.cpp3
-rw-r--r--src/being/localplayer.cpp3
-rw-r--r--src/being/playerinfo.cpp5
4 files changed, 7 insertions, 72 deletions
diff --git a/src/being/attributes.h b/src/being/attributes.h
deleted file mode 100644
index d20ace237..000000000
--- a/src/being/attributes.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef BEING_ATTRIBUTES_H
-#define BEING_ATTRIBUTES_H
-
-namespace Attributes
-{
- /**
- * Standard attributes for players.
- */
- enum Attributes
- {
- LEVEL = 0,
- HP,
- MAX_HP,
- MP,
- MAX_MP,
- EXP,
- EXP_NEEDED,
- MONEY,
- TOTAL_WEIGHT,
- MAX_WEIGHT,
- 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,
- ATTACK_SPEED = 103,
- KARMA,
- MANNER,
- CRIT,
- FLEE,
- HIT,
- MDEF,
- MATK,
- DEF,
- ATK
- };
-} // namespace Attributes
-
-#endif // BEING_ATTRIBUTES_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"