diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-09-19 16:08:08 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-09-19 16:08:08 +0200 |
commit | 43db34d4e5c77109741f3adf3e58bf18796774e9 (patch) | |
tree | d12bf2ba222810c6ac74fdd7d04a76699dda6690 | |
parent | 923e52eafd132a8ba2435cba4e5cf04a5b15ffd4 (diff) | |
download | manaserv-43db34d4e5c77109741f3adf3e58bf18796774e9.tar.gz manaserv-43db34d4e5c77109741f3adf3e58bf18796774e9.tar.bz2 manaserv-43db34d4e5c77109741f3adf3e58bf18796774e9.tar.xz manaserv-43db34d4e5c77109741f3adf3e58bf18796774e9.zip |
Removed unused being state enums
-rw-r--r-- | src/common/defines.h | 18 | ||||
-rw-r--r-- | src/game-server/inventory.cpp | 1 | ||||
-rw-r--r-- | src/game-server/item.h | 28 | ||||
-rw-r--r-- | src/game-server/state.cpp | 2 |
4 files changed, 1 insertions, 48 deletions
diff --git a/src/common/defines.h b/src/common/defines.h index 86b97e25..483a4eb1 100644 --- a/src/common/defines.h +++ b/src/common/defines.h @@ -97,24 +97,6 @@ const int DEFAULT_INTERACTION_TILES_AREA = 20; const int DEFAULT_TILE_LENGTH = 32; /** - * Possible states of beings. - * States can be multiple for the same being. - * To be used as bitmask values. - */ -enum BeingState -{ - STATE_POISONED = 1, - STATE_STONED = 2, - STATE_STUNNED = 4, - STATE_SLOWED = 8, - STATE_TIRED = 16, - STATE_MAD = 32, - STATE_BERSERK = 64, - STATE_HASTED = 128, - STATE_FLOATING = 256 -}; - -/** * Element attribute for beings, actors, and items. * Subject to change until Pauan and Dabe are finished with the element system. * Please keep element modifier of BeingAttribute in sync. diff --git a/src/game-server/inventory.cpp b/src/game-server/inventory.cpp index 2f17af10..ee42c9a4 100644 --- a/src/game-server/inventory.cpp +++ b/src/game-server/inventory.cpp @@ -84,7 +84,6 @@ void Inventory::initialize() /* * Construct a set of itemIds to keep track of duplicate itemIds. */ - for (InventoryData::iterator it = mPoss->inventory.begin(), it_end = mPoss->inventory.end(); it != it_end;) { diff --git a/src/game-server/item.h b/src/game-server/item.h index 93978ca5..c8ee225e 100644 --- a/src/game-server/item.h +++ b/src/game-server/item.h @@ -41,34 +41,6 @@ struct ItemEquipRequirement { unsigned equipSlotId, capacityRequired; }; -/** - * State effects to beings, and actors. - * States can be multiple for the same being. - */ -enum -{ - SET_STATE_NORMAL = 0, - SET_STATE_POISONED, - SET_STATE_STONED, - SET_STATE_STUNNED, - SET_STATE_SLOWED, - SET_STATE_TIRED, - SET_STATE_MAD, - SET_STATE_BERSERK, - SET_STATE_HASTED, - SET_STATE_FLOATING, - - SET_STATE_NOT_POISONED, - SET_STATE_NOT_STONED, - SET_STATE_NOT_STUNNED, - SET_STATE_NOT_SLOWED, - SET_STATE_NOT_TIRED, - SET_STATE_NOT_MAD, - SET_STATE_NOT_BERSERK, - SET_STATE_NOT_HASTED, - SET_STATE_NOT_FLOATING -}; - enum ItemTriggerType { ITT_NULL = 0, diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index f690b661..054917b3 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -90,7 +90,7 @@ static void serializeLooks(Entity *ch, MessageOut &msg) // The map storing the info about the look changes to send //{ slot type id, item id } - std::map <unsigned, unsigned> lookChanges; + std::map<unsigned, unsigned> lookChanges; // Note that we can send several updates on the same slot type as different // items may have been equipped. |