tidy

Author: goblinhack

src/sound.cpp

@@ -181,7 +181,7 @@ auto sound_load(float volume, const std::string &name, const std::string &name_a
   TRACE();
 
   if (m->chunk == nullptr) {
-    if (me) {
+    if (me != nullptr) {
       thing_err(me, "cannot find sound chunk %s", m->name_alias.c_str());
     } else {
       ERR("cannot find sound chunk %s", m->name_alias.c_str());
@@ -215,7 +215,7 @@ auto sound_load(float volume, const std::string &name, const std::string &name_a
 
   auto chan = Mix_PlayChannel(-1, m->chunk, loops);
   if (chan == -1) {
-    if (me) {
+    if (me != nullptr) {
       THING_DBG(me, "Failed to play sound %s volume %d channel %d: %s", name_alias.c_str(), static_cast< int >(volume), chan,
                 Mix_GetError());
     } else {
@@ -229,7 +229,7 @@ auto sound_load(float volume, const std::string &name, const std::string &name_a
   p.volume                = static_cast< int >(volume);
   already_playing[ chan ] = p;
 
-  if (me) {
+  if (me != nullptr) {
     THING_DBG(me, "play sound %s volume %d channel %d", name_alias.c_str(), static_cast< int >(volume), chan);
   } else {
     DBG("play sound %s volume %d channel %d", name_alias.c_str(), static_cast< int >(volume), chan);
@@ -249,7 +249,7 @@ auto sound_play(Gamep g, const std::string &name_alias, float scale, int loops,
   auto *sound = find_one(name_alias);
   if (sound == nullptr) {
     if (! g_opt_tests && ! g_opt_do_level_gen && ! g_opt_do_level_select_gen && ! g_opt_do_room_gen) {
-      if (me) {
+      if (me != nullptr) {
         thing_err(me, "cannot find sound %s", name_alias.c_str());
       } else {
         ERR("cannot find sound %s", name_alias.c_str());

src/thing_carry_drop.cpp

@@ -318,7 +318,7 @@ auto thing_carry(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp item, ThingEven
   // Auto wield if nothing wielded?
   //
   if (thing_is_auto_wield(item)) {
-    if (! thing_wielding(g, v, l, me)) {
+    if (thing_wielding(g, v, l, me) == nullptr) {
       if (! thing_wield(g, v, l, me, item, e)) {
         return false;
       }

src/thing_laser.cpp

@@ -7,6 +7,7 @@
 #include "my_fpoint.hpp"
 #include "my_game_defs.hpp"
 #include "my_level.hpp"
+#include "my_main.hpp"
 #include "my_math.hpp"
 #include "my_thing.hpp"
 #include "my_tp.hpp"

src/wid_cfg_gfx.cpp

@@ -38,7 +38,7 @@ static bool            menu_was_created_due_to_game_restarting;
 
 static void wid_cfg_gfx_destroy()
 {
-  if (! wid_cfg_gfx_window) {
+  if (wid_cfg_gfx_window == nullptr) {
     return;
   }
 

src/wid_credits.cpp

@@ -23,7 +23,7 @@ static WidPopup *wid_credits_window;
 
 static void wid_credits_destroy(Gamep g)
 {
-  if (! wid_credits_window) {
+  if (wid_credits_window == nullptr) {
     return;
   }
 

src/wid_error.cpp

@@ -23,7 +23,7 @@ static WidPopup *wid_error_window;
 
 static void wid_error_destroy(Gamep g)
 {
-  if (! wid_error_window) {
+  if (wid_error_window == nullptr) {
     return;
   }
 

src/wid_hiscore.cpp

@@ -28,7 +28,7 @@ static WidPopup *wid_hiscore_window;
 
 static void wid_hiscore_destroy(Gamep g)
 {
-  if (! wid_hiscore_window) {
+  if (wid_hiscore_window == nullptr) {
     return;
   }
 

src/wid_intro.cpp

@@ -27,7 +27,7 @@ static WidPopup *wid_intro_window;
 
 static void wid_intro_destroy()
 {
-  if (! wid_intro_window) {
+  if (wid_intro_window == nullptr) {
     return;
   }
 

src/wid_main_menu.cpp

@@ -32,7 +32,7 @@ static WidPopup *wid_main_menu_window;
 
 void wid_main_menu_destroy(Gamep /*g*/)
 {
-  if (! wid_main_menu_window) {
+  if (wid_main_menu_window == nullptr) {
     return;
   }
 

src/wid_more.cpp

@@ -17,14 +17,13 @@
 
 #include <SDL_keyboard.h>
 #include <SDL_keycode.h>
-#include <cmath>
 #include <cstdint>
 
 static WidPopup *wid_more_window;
 
 static void wid_more_destroy()
 {
-  if (! wid_more_window) {
+  if (wid_more_window == nullptr) {
     return;
   }