From 42f47e483da19079a937c4801ca94bd62d8dc970 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 21 Aug 2017 22:44:29 +0300
Subject: Remove useless else.

---
 src/being/playerrelations.cpp | 53 ++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'src/being/playerrelations.cpp')

diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index f7a8685e6..a1e9a457c 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -282,34 +282,32 @@ unsigned int PlayerRelationsManager::checkPermissionSilently(
     {
         return mDefaultPermissions & flags;
     }
-    else
-    {
-        const PlayerRelation *const r = (*it).second;
-        unsigned int permissions = PlayerRelation::RELATION_PERMISSIONS[
-            CAST_S32(r->mRelation)];
 
-        switch (r->mRelation)
-        {
-            case Relation::NEUTRAL:
-                permissions = mDefaultPermissions;
-                break;
-
-            case Relation::FRIEND:
-                permissions |= mDefaultPermissions;  // widen
-                break;
-
-            case Relation::DISREGARDED:
-            case Relation::IGNORED:
-            case Relation::ERASED:
-            case Relation::BLACKLISTED:
-            case Relation::ENEMY2:
-            default:
-                permissions &= mDefaultPermissions;  // narrow
-                break;
-        }
+    const PlayerRelation *const r = (*it).second;
+    unsigned int permissions = PlayerRelation::RELATION_PERMISSIONS[
+        CAST_S32(r->mRelation)];
 
-        return permissions & flags;
+    switch (r->mRelation)
+    {
+        case Relation::NEUTRAL:
+            permissions = mDefaultPermissions;
+            break;
+
+        case Relation::FRIEND:
+            permissions |= mDefaultPermissions;  // widen
+            break;
+
+        case Relation::DISREGARDED:
+        case Relation::IGNORED:
+        case Relation::ERASED:
+        case Relation::BLACKLISTED:
+        case Relation::ENEMY2:
+        default:
+            permissions &= mDefaultPermissions;  // narrow
+            break;
     }
+
+    return permissions & flags;
 }
 
 bool PlayerRelationsManager::hasPermission(const Being *const being,
@@ -455,10 +453,7 @@ void PlayerRelationsManager::ignoreTrade(const std::string &name) const
     {
         return;
     }
-    else
-    {
-        playerRelations.setRelation(name, Relation::BLACKLISTED);
-    }
+    playerRelations.setRelation(name, Relation::BLACKLISTED);
 }
 
 bool PlayerRelationsManager::checkBadRelation(const std::string &name) const
-- 
cgit v1.2.3-60-g2f50