From ac3ccda23ac4b5c69e15147b8082d90df2ac23de Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 13 Dec 2015 22:45:52 +0300 Subject: Move spells and graphics related constants into separate files. --- src/being/actorsprite.cpp | 2 ++ src/being/being.cpp | 4 ++++ src/being/being.h | 7 ------- src/being/playerrelations.cpp | 2 ++ 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/being') 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(TargetCursorType::NUM_TCT)] [static_cast(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 beingInfoCache; typedef std::map::const_iterator GuildsMapCIter; typedef std::map::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 PlayerRelations; typedef PlayerRelations::const_iterator PlayerRelationsCIter; typedef std::list PlayerRelationListeners; -- cgit v1.2.3-70-g09d2