Silence some clang-tidy warnings (#34222)

* Silence some clang-tidy warnings * Update src/teleport.cpp Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]> * Assert that p is not null to shut clang tidy up
CleverRaven · Sep 25, 2019 · 6af0db3 · 6af0db3
1 parent 15709fa
commit 6af0db3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/teleport.cpp b/src/teleport.cpp
@@ -20,11 +20,11 @@ bool teleport::teleport( Creature &critter, int min_distance, int max_distance,
         return false;
     }
 
-    const bool c_is_u = &critter == &g->u;
     player *const p = critter.as_player();
+    const bool c_is_u = p != nullptr && p == &g->u;
     int tries = 0;
     tripoint origin = critter.pos();
-    tripoint new_pos = tripoint_zero;
+    tripoint new_pos;
     do {
         int rangle = rng( 0, 360 );
         int rdistance = rng( min_distance, max_distance );