summaryrefslogtreecommitdiff
path: root/src/playerrelations.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-12 18:39:00 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-12 18:39:00 +0300
commit351821c1f18f9285be58df0a05339936311f6490 (patch)
tree47a60cad4f61f63c5ac2faf98dcae24760d7fe11 /src/playerrelations.cpp
parente50632a83a3c679cffd372656277a304d5d853f8 (diff)
downloadmanaplus-351821c1f18f9285be58df0a05339936311f6490.tar.gz
manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.bz2
manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.xz
manaplus-351821c1f18f9285be58df0a05339936311f6490.zip
first part of style fixed after cpplint checks.
Diffstat (limited to 'src/playerrelations.cpp')
-rw-r--r--src/playerrelations.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 184ef8adf..6cd46d2bb 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -109,11 +109,11 @@ public:
}
};
-static PlayerConfSerialiser player_conf_serialiser; // stateless singleton
+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
+ /* NEUTRAL */ 0, // we always fall back to the defaults anyway
/* FRIEND */ EMOTE | SPEECH_FLOAT | SPEECH_LOG | WHISPER | TRADE,
/* DISREGARDED*/ EMOTE | SPEECH_FLOAT,
/* IGNORED */ 0,
@@ -209,8 +209,8 @@ void PlayerRelationsManager::init()
if (!mPersistIgnores)
{
- clear(); // Yes, we still keep them around in the config file
- // until the next update.
+ clear(); // Yes, we still keep them around in the config file
+ // until the next update.
}
FOR_EACH (PlayerRelationListenersCIter, it, mListeners)
@@ -272,7 +272,7 @@ unsigned int PlayerRelationsManager::checkPermissionSilently(
break;
case PlayerRelation::FRIEND:
- permissions |= mDefaultPermissions; // widen
+ permissions |= mDefaultPermissions; // widen
break;
case PlayerRelation::DISREGARDED:
@@ -281,7 +281,7 @@ unsigned int PlayerRelationsManager::checkPermissionSilently(
case PlayerRelation::BLACKLISTED:
case PlayerRelation::ENEMY2:
default:
- permissions &= mDefaultPermissions; // narrow
+ permissions &= mDefaultPermissions; // narrow
}
return permissions & flags;