diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-13 22:45:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-13 22:45:52 +0300 |
| commit | ac3ccda23ac4b5c69e15147b8082d90df2ac23de (patch) | |
| tree | 593f2899e1891d8c5a6af47349570fb793e7ff79 /src/being | |
| parent | 6849c5919c02b4cf97de91c801b542e36eb089ce (diff) | |
| download | manaplus-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.tar.gz manaplus-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.tar.bz2 manaplus-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.tar.xz manaplus-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.zip | |
Move spells and graphics related constants into separate files.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/actorsprite.cpp | 2 | ||||
| -rw-r--r-- | src/being/being.cpp | 4 | ||||
| -rw-r--r-- | src/being/being.h | 7 | ||||
| -rw-r--r-- | src/being/playerrelations.cpp | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index 11099af01..122f4ecac 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -54,6 +54,8 @@ #define end_foreach } +static const unsigned int STATUS_EFFECTS = 32; + AnimatedSprite *ActorSprite::targetCursor [static_cast<size_t>(TargetCursorType::NUM_TCT)] [static_cast<size_t>(TargetCursorSize::NUM_TC)]; diff --git a/src/being/being.cpp b/src/being/being.cpp index ae0491372..69af6bd9f 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -126,6 +126,10 @@ std::list<BeingCacheEntry*> beingInfoCache; typedef std::map<int, Guild*>::const_iterator GuildsMapCIter; typedef std::map<int, int>::const_iterator IntMapCIter; +static const unsigned int SPEECH_TIME = 500; +static const unsigned int SPEECH_MIN_TIME = 200; +static const unsigned int SPEECH_MAX_TIME = 800; + #define for_each_badges() \ for (int f = 0; f < BadgeIndex::BadgeIndexSize; f++) diff --git a/src/being/being.h b/src/being/being.h index bab1cc254..0f094c908 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -44,13 +44,6 @@ #include "localconsts.h" -static const unsigned int FIRST_IGNORE_EMOTE = 14; -static const unsigned int STATUS_EFFECTS = 32; - -static const unsigned int SPEECH_TIME = 500; -static const unsigned int SPEECH_MIN_TIME = 200; -static const unsigned int SPEECH_MAX_TIME = 800; - static const int DEFAULT_BEING_WIDTH = 32; static const int DEFAULT_BEING_HEIGHT = 32; diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index 4bd7b637e..3c5dd2d06 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -37,6 +37,8 @@ #include "debug.h" +static const unsigned int FIRST_IGNORE_EMOTE = 14; + typedef std::map<std::string, PlayerRelation *> PlayerRelations; typedef PlayerRelations::const_iterator PlayerRelationsCIter; typedef std::list<PlayerRelationsListener *> PlayerRelationListeners; |