tidy

goblinhack · goblinhack · commit 1ad72616b775 · 2026-06-12T17:12:55.000+01:00
diff --git a/TODO b/TODO
@@ -1,5 +1,6 @@
 bugs
 ----
+dead argusul over chasm should fall
 item thrown onto exit
 item thrown onto chasm
 item thrown onto lava
diff --git a/src/ascii.cpp b/src/ascii.cpp
@@ -20,7 +20,6 @@
 #include "my_types.hpp"
 #include "my_ui.hpp"
 
-#include <OpenGL/gl.h>
 #include <algorithm>
 #include <array>
 #include <cstdarg>
diff --git a/src/cave_gen.cpp b/src/cave_gen.cpp
@@ -16,7 +16,7 @@
 
 static const int MAP_LEVEL_BLOB_CENTERING = MAP_WIDTH / 4;
 
-void cave_dump(Gamep  /*g*/, Cave *c)
+void cave_dump(Gamep g, Cave *c)
 {
   uint8_t x = 0;
   uint8_t y = 0;
@@ -129,7 +129,7 @@ static void cave_generation(Cave *c, uint32_t fill_prob, uint8_t r1, uint8_t r2,
 //
 // Iterate the generations for cellular automata
 //
-void cave_create(Gamep  /*g*/, Cave *c, uint32_t fill_prob, uint8_t r1, uint8_t r2, int map_generations)
+void cave_create(Gamep g, Cave *c, uint32_t fill_prob, uint8_t r1, uint8_t r2, int map_generations)
 {
   for (auto gen = 0; gen < map_generations; gen++) {
     cave_generation(c, fill_prob, r1, r2, gen);
@@ -244,7 +244,7 @@ void cave_generation_keep_largest_blob(Gamep g, Cave *c)
 //
 // Post generation of the cave, keep all but the largest blob
 //
-void cave_generation_center_blob(Gamep  /*g*/, Cave *c)
+void cave_generation_center_blob(Gamep g, Cave *c)
 {
   int x = 0;
   int y = 0;
diff --git a/src/level_tick.cpp b/src/level_tick.cpp
@@ -17,6 +17,7 @@
 #include "my_types.hpp"
 #include "my_wids.hpp"
 #include <algorithm>
+#include <cmath>
 #include <cstdint>
 #include <vector>
 
@@ -328,7 +329,7 @@ static void level_tick_check_running_time(Gamep g, Levelsp v, Levelp l)
       // before the lower level can complete!
       //
       Levelp player_level = thing_player_level(g);
-      if (player_level) {
+      if (player_level != nullptr) {
         if (level_tick_is_in_progress(g, v, player_level)) {
           LEVEL_DBG(g, v, l, "Tick %u: delay end, waiting for player level", v->tick);
           return;
@@ -398,7 +399,7 @@ static void level_tick_body(Gamep g, Levelsp v, Levelp l, float dt, bool tick_is
 
     float t_speed = thing_speed(t);
     if (t_speed == 0) {
-      t_speed = (float) player_speed;
+      t_speed = static_cast< float >(player_speed);
     }
 
     auto old_thing_dt = t->thing_dt;
@@ -417,12 +418,12 @@ static void level_tick_body(Gamep g, Levelsp v, Levelp l, float dt, bool tick_is
 
     if (compiler_unused) {
       THING_DBG(t, "level dt %f old_thing_dt %f thing_dt %f thing_dt_change %f speed %d v %d",
-                dt,              //
-                old_thing_dt,    //
-                t->thing_dt,     //
-                thing_dt_change, //
-                (int) t_speed,   //
-                player_speed     //
+                dt,                          //
+                old_thing_dt,                //
+                t->thing_dt,                 //
+                thing_dt_change,             //
+                static_cast< int >(t_speed), //
+                player_speed                 //
       );
     }
 
@@ -836,7 +837,7 @@ void level_tick_reset_frame_counter(Gamep g)
 {
   auto *v = game_levels_get(g);
 
-  if (! v) {
+  if (v == nullptr) {
     return;
   }
 
@@ -865,9 +866,7 @@ static void level_tick_time_step(Gamep g, Levelsp v, Levelp current_level)
   v->last_time_step = v->time_step;
   v->time_step      = (static_cast< float >(v->frame - v->frame_begin)) / static_cast< float >(duration_ms);
 
-  if (v->time_step >= 1.0) {
-    v->time_step = 1.0;
-  }
+  v->time_step = std::min< double >(v->time_step, 1.0);
 
   IF_DEBUG2
   { //
diff --git a/src/my_thing.hpp b/src/my_thing.hpp
@@ -621,7 +621,7 @@ using Thing = struct Thing {
 [[nodiscard]] auto thing_and_tp_get_at_safe(Gamep g, Levelsp v, Levelp l, const bpoint &p, int slot, Tpp *out) -> Thingp;
 [[nodiscard]] auto thing_and_tp_get_at(Gamep g, Levelsp v, Levelp l, const bpoint &p, int slot, Tpp *out) -> Thingp;
 [[nodiscard]] auto thing_at(Thingp t) -> bpoint;
-[[nodiscard]] auto thing_attack_at(Gamep g, Levelsp v, Levelp l, Thingp me, const bpoint &attack_at, ThingEvent *e = nullptr) -> bool;
+[[nodiscard]] auto thing_attack_at(Gamep g, Levelsp v, Levelp l, Thingp attacker, const bpoint &attack_at, ThingEvent *e = nullptr) -> bool;
 [[nodiscard]] auto thing_attack_count_per_tick_decr(Gamep g, Levelsp v, Levelp l, Thingp t, int val = 1) -> int;
 [[nodiscard]] auto thing_attack_count_per_tick_incr(Gamep g, Levelsp v, Levelp l, Thingp t, int val = 1) -> int;
 [[nodiscard]] auto thing_attack_count_per_tick_set(Gamep g, Levelsp v, Levelp l, Thingp t, int val) -> int;
@@ -669,11 +669,11 @@ using Thing = struct Thing {
 [[nodiscard]] auto thing_distance_jump(Gamep g, Levelsp v, Levelp l, Thingp me) -> int;
 [[nodiscard]] auto thing_distance_minion_from_mob_max_set(Gamep g, Levelsp v, Levelp l, Thingp t, int val) -> int;
 [[nodiscard]] auto thing_distance_minion_from_mob_max(Gamep g, Levelsp v, Levelp l, Thingp t) -> int;
-[[nodiscard]] auto thing_distance_throw_decr(Gamep g, Levelsp v, Levelp l, Thingp me, int val = 1) -> int;
-[[nodiscard]] auto thing_distance_throw_incr(Gamep g, Levelsp v, Levelp l, Thingp me, int val = 1) -> int;
-[[nodiscard]] auto thing_distance_throw_max(Gamep g, Levelsp v, Levelp l, Thingp me) -> int;
-[[nodiscard]] auto thing_distance_throw_set(Gamep g, Levelsp v, Levelp l, Thingp me, int val) -> int;
-[[nodiscard]] auto thing_distance_throw(Gamep g, Levelsp v, Levelp l, Thingp me) -> int;
+[[nodiscard]] auto thing_distance_throw_decr(Gamep g, Levelsp v, Levelp l, Thingp thrower, int val = 1) -> int;
+[[nodiscard]] auto thing_distance_throw_incr(Gamep g, Levelsp v, Levelp l, Thingp thrower, int val = 1) -> int;
+[[nodiscard]] auto thing_distance_throw_max(Gamep g, Levelsp v, Levelp l, Thingp thrower) -> int;
+[[nodiscard]] auto thing_distance_throw_set(Gamep g, Levelsp v, Levelp l, Thingp thrower, int val) -> int;
+[[nodiscard]] auto thing_distance_throw(Gamep g, Levelsp v, Levelp l, Thingp thrower) -> int;
 [[nodiscard]] auto thing_distance_vision_decr(Gamep g, Levelsp v, Levelp l, Thingp t, int val = 1) -> int;
 [[nodiscard]] auto thing_distance_vision_incr(Gamep g, Levelsp v, Levelp l, Thingp t, int val = 1) -> int;
 [[nodiscard]] auto thing_distance_vision_set(Gamep g, Levelsp v, Levelp l, Thingp t, int val) -> int;
@@ -1056,7 +1056,7 @@ using Thing = struct Thing {
 [[nodiscard]] auto thing_temperature_incr(Gamep g, Levelsp v, Levelp l, Thingp t, int val = 1) -> int;
 [[nodiscard]] auto thing_temperature_set(Gamep g, Levelsp v, Levelp l, Thingp t, int val) -> int;
 [[nodiscard]] auto thing_temperature(Thingp t) -> int;
-[[nodiscard]] auto thing_throw_to(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp what, bpoint to) -> bool;
+[[nodiscard]] auto thing_throw_to(Gamep g, Levelsp v, Levelp l, Thingp thrower, Thingp item, bpoint to) -> bool;
 [[nodiscard]] auto thing_unwield(Gamep g, Levelsp v, Levelp l, Thingp me, ThingEvent & /*e*/) -> bool;
 [[nodiscard]] auto thing_use(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp item, ThingEvent &e) -> bool;
 [[nodiscard]] auto thing_value1_decr(Gamep g, Levelsp v, Levelp l, Thingp t, int val = 1) -> int;
@@ -1185,9 +1185,9 @@ void thing_dump_missiles(Gamep g, Levelsp v, Levelp l, Thingp me);
 void thing_enhance(Gamep g, Levelsp v, Levelp l, Thingp t, Tpp tp);
 void thing_err(Thingp t, const char *fmt, ...) CHECK_FORMAT_STR(printf, 2, 3);
 void thing_explosion_handle(Gamep g, Levelsp v, Levelp l, Thingp t);
-void thing_fall_end_check(Gamep g, Levelsp v, Levelp l, Thingp t);
-void thing_fall_time_step(Gamep g, Levelsp v, Levelp l, Thingp t, int time_step);
-void thing_fall(Gamep g, Levelsp v, Levelp l, Thingp t);
+void thing_fall_end_check(Gamep g, Levelsp v, Levelp l, Thingp me);
+void thing_fall_time_step(Gamep g, Levelsp v, Levelp l, Thingp me, int time_step);
+void thing_fall(Gamep g, Levelsp v, Levelp l, Thingp me);
 void thing_fini(Gamep g, Levelsp v, Levelp l, Thingp t);
 void thing_free(Gamep g, Levelsp v, Levelp l, Thingp t);
 void thing_group_join(Gamep g, Levelsp v, Levelp l, Thingp t, Thingp group);
@@ -1226,8 +1226,8 @@ void thing_is_spawned_set(Gamep g, Levelsp v, Levelp l, Thingp t, bool val = tru
 void thing_is_spawned_unset(Gamep g, Levelsp v, Levelp l, Thingp t);
 void thing_is_teleporting_set(Gamep g, Levelsp v, Levelp l, Thingp me, bool val = true);
 void thing_is_teleporting_unset(Gamep g, Levelsp v, Levelp l, Thingp me);
-void thing_is_thrown_set(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp thrower, bool val = true);
-void thing_is_thrown_unset(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp thrower);
+void thing_is_thrown_set(Gamep g, Levelsp v, Levelp l, Thingp item, Thingp thrower, bool val = true);
+void thing_is_thrown_unset(Gamep g, Levelsp v, Levelp l, Thingp item, Thingp thrower);
 void thing_is_unlocked_set(Gamep g, Levelsp v, Levelp l, Thingp t, bool val = true);
 void thing_is_unlocked_unset(Gamep g, Levelsp v, Levelp l, Thingp t);
 void thing_level_warp_to_entrance(Gamep g, Levelsp v, Levelp new_level, Thingp t);
diff --git a/src/my_thing_callbacks.hpp b/src/my_thing_callbacks.hpp
@@ -54,15 +54,15 @@ void thing_on_level_populated(Gamep g, Levelsp v, Levelp l, Thingp me);
 
 using thing_on_carry_request_t = bool (*)(Gamep, Levelsp, Levelp, Thingp me, Thingp owner, ThingEvent &);
 void               thing_on_carry_request_set(Tpp tp, thing_on_carry_request_t callback);
-[[nodiscard]] auto thing_on_carry_request(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp owner, ThingEvent & /*e*/) -> bool;
+[[nodiscard]] auto thing_on_carry_request(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp user, ThingEvent & /*e*/) -> bool;
 
 using thing_on_drop_request_t = bool (*)(Gamep, Levelsp, Levelp, Thingp me, Thingp dropper, ThingEvent &);
 void               thing_on_drop_request_set(Tpp tp, thing_on_drop_request_t callback);
 [[nodiscard]] auto thing_on_drop_request(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp user, ThingEvent & /*e*/) -> bool;
 
 using thing_on_carry_success_t = bool (*)(Gamep, Levelsp, Levelp, Thingp me, Thingp owner, ThingEvent &);
 void               thing_on_carry_success_set(Tpp tp, thing_on_carry_success_t callback);
-[[nodiscard]] auto thing_on_carry_success(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp owner, ThingEvent & /*e*/) -> bool;
+[[nodiscard]] auto thing_on_carry_success(Gamep g, Levelsp v, Levelp l, Thingp me, Thingp user, ThingEvent & /*e*/) -> bool;
 
 using thing_on_drop_success_t = bool (*)(Gamep, Levelsp, Levelp, Thingp me, Thingp dropper, ThingEvent &);
 void               thing_on_drop_success_set(Tpp tp, thing_on_drop_success_t callback);
diff --git a/src/thing_carry.cpp b/src/thing_carry.cpp
@@ -4,7 +4,6 @@
 
 #include "my_callstack.hpp"
 #include "my_game.hpp"
-#include "my_level.hpp"
 #include "my_main.hpp"
 #include "my_thing.hpp"
 #include "my_thing_callbacks.hpp"
diff --git a/src/thing_damage.cpp b/src/thing_damage.cpp
@@ -269,9 +269,7 @@ static void thing_damage_cap_for_this_tick(Gamep g, Levelsp v, Levelp l, Thingp
   if (d_total > max_damage_per_tick) {
     auto old_d = e.damage;
     e.damage -= d_total - max_damage_per_tick;
-    if (e.damage < 0) {
-      e.damage = 0;
-    }
+    e.damage = std::max(e.damage, 0);
     THING_DBG(me, "%s: limit per tick damage %d -> %d", to_string(g, v, l, e).c_str(), old_d, e.damage);
   }
 }
diff --git a/src/thing_drop.cpp b/src/thing_drop.cpp
@@ -78,17 +78,17 @@ static auto thing_drop_item(Gamep g, Levelsp v, Levelp l, Thingp item, Thingp us
 
     FOR_ALL_INVENTORY_SLOTS(g, v, l, owner, slot, an_item)
     {
-      if (! an_item) {
+      if (an_item == nullptr) {
         continue;
       }
 
       //
       // Replace the thing dropped with a new thing
       //
       if (thing_tp(an_item) == thing_tp(item)) {
-        auto thing_copy = thing_spawn(g, v, l, thing_tp(item), user);
+        auto *thing_copy = thing_spawn(g, v, l, thing_tp(item), user);
 
-        if (thing_copy) {
+        if (thing_copy != nullptr) {
           THING_DBG(thing_copy, "drop: %s (thing copy)", s.c_str());
           TRACE_INDENT();
 
diff --git a/src/thing_fall.cpp b/src/thing_fall.cpp
@@ -269,12 +269,12 @@ static void thing_fall_end(Gamep g, Levelsp v, Levelp l, Thingp me)
   //
   // Splash!
   //
-  if (level_is_deep_water(g, v, l, thing_at(me))) {
+  if (level_is_deep_water(g, v, l, thing_at(me)) != nullptr) {
     thing_sound_play(g, v, l, me, "splash");
     if (thing_is_player(me)) {
       topcon(UI_GOOD_FMT_STR "The deep water dampened your fall!" UI_RESET_FMT);
     }
-  } else if (level_is_water(g, v, l, thing_at(me))) {
+  } else if (level_is_water(g, v, l, thing_at(me)) != nullptr) {
     thing_sound_play(g, v, l, me, "splash");
     if (thing_is_player(me)) {
       topcon(UI_GOOD_FMT_STR "The water dampened your fall!" UI_RESET_FMT);
diff --git a/src/thing_jump.cpp b/src/thing_jump.cpp
@@ -42,7 +42,7 @@ void thing_is_jumping_set(Gamep g, Levelsp v, Levelp l, Thingp me, bool val)
     //
     // Splash!
     //
-    if (level_is_water(g, v, l, thing_at(me))) {
+    if (level_is_water(g, v, l, thing_at(me)) != nullptr) {
       thing_sound_play(g, v, l, me, "splash");
     }
   }
diff --git a/src/thing_monst.cpp b/src/thing_monst.cpp
@@ -61,6 +61,11 @@ static auto thing_monst_choose_target_player(Gamep g, Levelsp v, Levelp l, Thing
     return false;
   }
 
+  if (dist < thing_distance_avoid_target(me)) {
+    THING_DBG(me, "choose target: player is too close (player %f) (vision %d)", dist, v_dist);
+    return false;
+  }
+
   THING_DBG(me, "astar thing_monst_choose_target_player");
   auto p = astar_solve(g, v, l, me, monst_at, target);
   if (p.empty()) {
@@ -435,7 +440,7 @@ void thing_monst_event_loop(Gamep g, Levelsp v, Levelp l, Thingp me)
   TRACE_INDENT();
 
   auto *player = thing_player(g);
-  if (! player) {
+  if (player == nullptr) {
     return;
   }
 
diff --git a/src/thing_player.cpp b/src/thing_player.cpp
@@ -137,9 +137,9 @@ void thing_player_init(Gamep g)
     case STATE_THROW_ITEM :
       {
         auto *player = thing_player(g);
-        if (player) {
-          auto item = thing_find(g, v, g_thing_throw_id);
-          if (item) {
+        if (player != nullptr) {
+          auto *item = thing_find(g, v, g_thing_throw_id);
+          if (item != nullptr) {
             if (! thing_throw_to(g, v, l, player, item, v->cursor_at)) {
               topcon(UI_WARNING_FMT_STR "You failed to throw the item." UI_RESET_FMT);
               (void) sound_play(g, "error");
diff --git a/src/thing_throw.cpp b/src/thing_throw.cpp
@@ -14,6 +14,7 @@
 #include "my_thing_callbacks.hpp"
 #include "my_thing_inlines.hpp"
 #include "my_tile.hpp"
+#include "my_tp.hpp"
 #include "my_types.hpp"
 #include "my_ui.hpp"
 
@@ -72,8 +73,8 @@ void thing_is_thrown_set(Gamep g, Levelsp v, Levelp l, Thingp item, Thingp throw
     //
     // Remove association with thrower
     //
-    auto owner = thing_owner(g, v, l, item);
-    if (owner) {
+    auto *owner = thing_owner(g, v, l, item);
+    if (owner != nullptr) {
       ThingEvent e {
           .reason     = "user threw item",  //
           .event_type = THING_EVENT_THROWN, //
@@ -107,7 +108,7 @@ void thing_is_thrown_unset(Gamep g, Levelsp v, Levelp l, Thingp item, Thingp thr
 //
 // If throwing too far, truncate the throw
 //
-static void thing_throw_truncate(Gamep g, Levelsp v, Levelp l, Thingp thrower, Thingp item, bpoint &to, int how_far_i_can_throw)
+static void thing_throw_truncate(Thingp thrower, bpoint &to, int how_far_i_can_throw)
 {
   //
   // Add some random delta for fun and some for diagonals
@@ -169,12 +170,12 @@ static auto thing_throw_something_in_the_way(Gamep g, Levelsp v, Levelp l, Thing
 //
 [[nodiscard]] auto thing_throw_to(Gamep g, Levelsp v, Levelp l, Thingp thrower, Thingp item, bpoint to) -> bool
 {
-  if (! thrower) {
+  if (thrower == nullptr) {
     ERR("no thing pointer");
     return false;
   }
 
-  if (! item) {
+  if (item == nullptr) {
     ERR("no thing pointer to throw");
     return false;
   }
@@ -219,7 +220,7 @@ static auto thing_throw_something_in_the_way(Gamep g, Levelsp v, Levelp l, Thing
     return false;
   }
 
-  thing_throw_truncate(g, v, l, thrower, item, to, how_far_i_can_throw);
+  thing_throw_truncate(thrower, to, how_far_i_can_throw);
 
   auto how_far_i_want_to_throw = static_cast< int >(floor(distance(at, to)));
 
@@ -258,7 +259,7 @@ static auto thing_throw_something_in_the_way(Gamep g, Levelsp v, Levelp l, Thing
     // Try again, but with a shorter distance.
     //
     if (how_far_i_want_to_throw > 1) {
-      thing_throw_truncate(g, v, l, thrower, item, to, how_far_i_want_to_throw - 1);
+      thing_throw_truncate(thrower, to, how_far_i_want_to_throw - 1);
       THING_DBG(thrower, "try truncated throw to (%d,%d)", to.x, to.y);
 
       return thing_throw_to(g, v, l, thrower, item, to);
diff --git a/src/tile.cpp b/src/tile.cpp
@@ -1081,7 +1081,8 @@ void tile_blit_apply_submerge_pct(Gamep g, spoint &tl, spoint &br, Tilep tile, f
   // Additionally (the pix_removed / 2), put submerged tiles more centralized as it
   // looks better when in a single tile
   //
-  auto submerged_depth = int(ceilf(((float) pix_removed / 2) / (float) one_pix_height) * one_pix_height);
+  auto submerged_depth
+      = static_cast< int >(ceilf((static_cast< float >(pix_removed) / 2) / static_cast< float >(one_pix_height)) * one_pix_height);
   tl.y += submerged_depth;
   br.y += submerged_depth;
 }
diff --git a/src/wid_throw_item.cpp b/src/wid_throw_item.cpp
@@ -21,7 +21,6 @@
 #include "my_wids.hpp"
 #include <SDL_keyboard.h>
 #include <SDL_keycode.h>
-#include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <string>

Original file line number	Diff line number	Diff line change
`@@ -269,9 +269,7 @@ static void thing_damage_cap_for_this_tick(Gamep g, Levelsp v, Levelp l, Thingp`
`269`	`269`	`if (d_total > max_damage_per_tick) {`
`270`	`270`	`auto old_d = e.damage;`
`271`	`271`	`e.damage -= d_total - max_damage_per_tick;`
`272`		`- if (e.damage < 0) {`
`273`		`- e.damage = 0;`
`274`		`- }`
	`272`	`+ e.damage = std::max(e.damage, 0);`
`275`	`273`	`THING_DBG(me, "%s: limit per tick damage %d -> %d", to_string(g, v, l, e).c_str(), old_d, e.damage);`
`276`	`274`	`}`
`277`	`275`	`}`