Fix misc clang-tidy errors

CleverRaven · Dec 24, 2019 · 44852dc · 44852dc
1 parent 095bd51
commit 44852dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
@@ -1018,9 +1018,7 @@ void avatar_action::plthrow( avatar &you, item_location loc,
     }
     // you must wield the item to throw it
     if( !you.is_wielding( *orig ) ) {
-        if( you.wield( *orig ) ) {
-            orig = &you.weapon;
-        } else {
+        if( !you.wield( *orig ) ) {
             return;
         }
     }

diff --git a/src/map.h b/src/map.h
@@ -268,10 +268,7 @@ class map
         bool check_seen_cache( const tripoint &p ) const {
             std::bitset<MAPSIZE_X *MAPSIZE_Y> &memory_seen_cache =
                 get_cache( p.z ).map_memory_seen_cache;
-            if( !memory_seen_cache[ static_cast<size_t>( p.x + p.y * MAPSIZE_Y ) ] ) {
-                return true;
-            }
-            return false;
+            return !memory_seen_cache[ static_cast<size_t>( p.x + p.y * MAPSIZE_Y ) ];
         }
         bool check_and_set_seen_cache( const tripoint &p ) const {
             std::bitset<MAPSIZE_X *MAPSIZE_Y> &memory_seen_cache =