range warning for throwing

Author: goblinhack

TODO

@@ -1,7 +1,6 @@
 bugs
 ----
 throwing potions
-out of range on throw distance
 smashing potion sound
 thing_clone
 item thrown onto exit

data/gfx.tgz

@@ -2072,13 +2072,13 @@ static void gfx_init_tiles()
       "cursor_path.hazard",
       "cursor_path.warning",
       "cursor_path.target",
+      "cursor_path.target_out_of_range",
       "cursor_at.nopath",
       "cursor_at.normal",
       "cursor_at.hazard",
       "cursor_at.warning",
       "cursor_at.target",
-      "",
-      "",
+      "cursor_at.target_out_of_range",
       "",
       "",
       "",

src/gfx.cpp

@@ -129,6 +129,7 @@ void thing_anim_init(Gamep g, Levelsp v, Levelp l, Thingp t, ThingAnimType anim_
         case THING_ANIM_CURSOR_NOPATH :
         case THING_ANIM_CURSOR_HAZARD :
         case THING_ANIM_CURSOR_TARGET :
+        case THING_ANIM_CURSOR_TARGET_OUT_OF_RANGE :
         case THING_ANIM_CURSOR_WARNING :
         case THING_ANIM_OPEN :
         case THING_ANIM_DEAD :

src/my_tp.hpp

@@ -21,22 +21,28 @@ static auto tp_cursor_at_display_get_tile_info(Gamep g, Levelsp v, Levelp l, con
   //
   Tilep tile = tp_tiles_get(tp, THING_ANIM_CURSOR_NOPATH, 0);
 
-  //
-  // Targetting?
-  //
-  if (game_state(g) == STATE_THROW_ITEM) {
-    return tp_tiles_get(tp, THING_ANIM_CURSOR_TARGET, 0);
-  }
-
   auto *player = thing_player(g);
   if (player == nullptr) [[unlikely]] {
     return tile;
   }
 
+  //
+  // Not seen this tile?
+  //
   if (! level_has_seen(g, v, l, p)) {
     return tile;
   }
 
+  //
+  // Targetting?
+  //
+  if (game_state(g) == STATE_THROW_ITEM) {
+    if (distance(p, thing_at(player)) > thing_distance_throw(g, v, l, player)) {
+      return tp_tiles_get(tp, THING_ANIM_CURSOR_TARGET_OUT_OF_RANGE, 0);
+    }
+    return tp_tiles_get(tp, THING_ANIM_CURSOR_TARGET, 0);
+  }
+
   //
   // Non zero cursor path, change the cursor to a positive color
   //
@@ -94,6 +100,8 @@ static auto tp_cursor_at_display_get_tile_info(Gamep g, Levelsp v, Levelp l, con
   tp_tiles_push_back(tp, THING_ANIM_CURSOR_HAZARD, tile);
   tile = tile_find_mand("cursor_at.target");
   tp_tiles_push_back(tp, THING_ANIM_CURSOR_TARGET, tile);
+  tile = tile_find_mand("cursor_at.target_out_of_range");
+  tp_tiles_push_back(tp, THING_ANIM_CURSOR_TARGET_OUT_OF_RANGE, tile);
 
   return true;
 }

src/thing_anim.cpp

@@ -20,18 +20,26 @@ static auto tp_cursor_path_display_get_tile_info(Gamep g, Levelsp v, Levelp l, c
   //
   Tilep tile = tp_tiles_get(tp, THING_ANIM_CURSOR_NOPATH, 0);
 
+  auto *player = thing_player(g);
+  if (player == nullptr) [[unlikely]] {
+    return tile;
+  }
+
   //
-  // Targetting?
+  // Not seen this tile?
   //
-  if (game_state(g) == STATE_THROW_ITEM) {
-    return tp_tiles_get(tp, THING_ANIM_CURSOR_TARGET, 0);
+  if (! level_has_seen(g, v, l, p)) {
+    return tile;
   }
 
-  auto *player = thing_player(g);
-  if (player) {
-    if (! level_has_seen(g, v, l, p)) {
-      return tile;
+  //
+  // Targetting?
+  //
+  if (game_state(g) == STATE_THROW_ITEM) {
+    if (distance(p, thing_at(player)) > thing_distance_throw(g, v, l, player)) {
+      return tp_tiles_get(tp, THING_ANIM_CURSOR_TARGET_OUT_OF_RANGE, 0);
     }
+    return tp_tiles_get(tp, THING_ANIM_CURSOR_TARGET, 0);
   }
 
   if (level_is_cursor_path_warning(g, v, l, p) != nullptr) {
@@ -68,6 +76,8 @@ static auto tp_cursor_path_display_get_tile_info(Gamep g, Levelsp v, Levelp l, c
   tp_tiles_push_back(tp, THING_ANIM_CURSOR_HAZARD, tile);
   tile = tile_find_mand("cursor_path.target");
   tp_tiles_push_back(tp, THING_ANIM_CURSOR_TARGET, tile);
+  tile = tile_find_mand("cursor_path.target_out_of_range");
+  tp_tiles_push_back(tp, THING_ANIM_CURSOR_TARGET_OUT_OF_RANGE, tile);
 
   return true;
 }