summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-07 21:47:14 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-07 21:47:14 +0300
commit24149e9e343dd5e507d2b4e879df55c692fbf9d1 (patch)
tree9caa75a85a3676acc02636c38f7d3e494bd10a4a /src/being
parent28f62ac9504bc5e912cd94c302295d4dcc47e41c (diff)
downloadmv-24149e9e343dd5e507d2b4e879df55c692fbf9d1.tar.gz
mv-24149e9e343dd5e507d2b4e879df55c692fbf9d1.tar.bz2
mv-24149e9e343dd5e507d2b4e879df55c692fbf9d1.tar.xz
mv-24149e9e343dd5e507d2b4e879df55c692fbf9d1.zip
Remove static in anonimouse namespaces.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/playerrelations.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 2e4b4b68c..e45376137 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -44,18 +44,18 @@ typedef PlayerRelations::const_iterator PlayerRelationsCIter;
typedef std::list<PlayerRelationsListener *> PlayerRelationListeners;
typedef PlayerRelationListeners::const_iterator PlayerRelationListenersCIter;
-namespace
-{
- static const char *const PLAYER_IGNORE_STRATEGY_NOP = "nop";
- static const char *const PLAYER_IGNORE_STRATEGY_EMOTE0 = "emote0";
- static const char *const DEFAULT_IGNORE_STRATEGY
- = PLAYER_IGNORE_STRATEGY_EMOTE0;
+static const char *const PLAYER_IGNORE_STRATEGY_NOP = "nop";
+static const char *const PLAYER_IGNORE_STRATEGY_EMOTE0 = "emote0";
+static const char *const DEFAULT_IGNORE_STRATEGY =
+ PLAYER_IGNORE_STRATEGY_EMOTE0;
- static const char *const NAME = "name";
- static const char *const RELATION = "relation";
+static const char *const NAME = "name";
+static const char *const RELATION = "relation";
- static const unsigned int IGNORE_EMOTE_TIME = 100;
+static const unsigned int IGNORE_EMOTE_TIME = 100;
+namespace
+{
class SortPlayersFunctor final
{
public:
@@ -131,11 +131,10 @@ namespace
return container;
}
};
-
- static PlayerConfSerialiser player_conf_serialiser; // stateless singleton
-
} // namespace
+static PlayerConfSerialiser player_conf_serialiser; // stateless singleton
+
const unsigned int PlayerRelation::RELATION_PERMISSIONS[RELATIONS_NR] =
{
/* NEUTRAL */ 0, // we always fall back to the defaults anyway