summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/localplayer.cpp5
-rw-r--r--src/resources/itemslot.h59
4 files changed, 3 insertions, 63 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9a4a0f381..1bd322e14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -670,7 +670,6 @@ SET(SRCS
resources/db/itemfielddb.h
resources/iteminfo.h
resources/iteminfo.cpp
- resources/itemslot.h
enums/resources/imageposition.h
enums/resources/imagetype.h
enums/resources/item/itemdbtype.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d2d0b787..b3595ec94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1280,7 +1280,6 @@ manaplus_SOURCES += main.cpp \
resources/db/weaponsdb.h \
resources/iteminfo.h \
resources/iteminfo.cpp \
- resources/itemslot.h \
enums/resources/imageposition.h \
enums/resources/imagetype.h \
enums/resources/item/itemdbtype.h \
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index c7078156d..2766a31b1 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -38,6 +38,8 @@
#include "const/sound.h"
+#include "enums/equipslot.h"
+
#include "enums/being/beingdirection.h"
#include "enums/resources/map/blockmask.h"
@@ -70,7 +72,6 @@
#include "net/serverfeatures.h"
#include "resources/iteminfo.h"
-#include "resources/itemslot.h"
#include "resources/db/weaponsdb.h"
@@ -960,7 +961,7 @@ int LocalPlayer::getAttackRange() const
else
{
const Item *const weapon = PlayerInfo::getEquipment(
- ItemSlot::FIGHT1_SLOT);
+ EquipSlot::FIGHT1_SLOT);
if (weapon)
{
const ItemInfo &info = weapon->getInfo();
diff --git a/src/resources/itemslot.h b/src/resources/itemslot.h
deleted file mode 100644
index f65133118..000000000
--- a/src/resources/itemslot.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2016 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 RESOURCES_ITEMSLOT_H
-#define RESOURCES_ITEMSLOT_H
-
-namespace ItemSlot
-{
- enum Type
- {
- // Equipment rules:
- // 1 Brest equipment
- TORSO_SLOT = 0,
- // 1 arms equipment
- ARMS_SLOT = 1,
- // 1 head equipment
- HEAD_SLOT = 2,
- // 1 legs equipment
- LEGS_SLOT = 3,
- // 1 feet equipment
- FEET_SLOT = 4,
- // 2 rings
- RING1_SLOT = 5,
- RING2_SLOT = 6,
- // 1 necklace
- NECKLACE_SLOT = 7,
- // Fight:
- // 2 one-handed weapons
- // or 1 two-handed weapon
- // or 1 one-handed weapon + 1 shield.
- FIGHT1_SLOT = 8,
- FIGHT2_SLOT = 9,
- // Projectile:
- // this item does not amount to one, it only
- // indicates the chosen projectile.
- PROJECTILE_SLOT = 10
- };
-} // namespace ItemSlot
-
-#endif // RESOURCES_ITEMSLOT_H