OSDN Git Service

[Refactor] #39970 Removed argument handle_stuff() as function pointer from show_info()
authorHourier <hourier@users.sourceforge.jp>
Sun, 10 May 2020 09:50:49 +0000 (18:50 +0900)
committerHourier <hourier@users.sourceforge.jp>
Sun, 10 May 2020 09:50:49 +0000 (18:50 +0900)
src/core/game-closer.c
src/player/process-death.c
src/player/process-death.h

index 657e91f..1d6ec33 100644 (file)
@@ -89,7 +89,7 @@ void close_game(player_type* player_ptr)
 
     print_tomb(player_ptr);
     flush();
-    show_info(player_ptr, handle_stuff, update_playtime, display_player, map_name);
+    show_info(player_ptr, update_playtime, display_player, map_name);
     Term_clear();
     if (check_score(player_ptr)) {
         send_world_score_on_closing(player_ptr, do_send);
index 4090f6f..d216dec 100644 (file)
@@ -14,6 +14,7 @@
 #include "market/store-util.h"
 #include "market/store.h"
 #include "gameterm.h"
+#include "core/stuff-handler.h"
 
 #define GRAVE_LINE_WIDTH 31
 
@@ -398,13 +399,13 @@ static void export_player_info(player_type *creature_ptr, update_playtime_pf upd
  * @param display_player ステータス表示へのコールバック
  * @return なし
  */
-void show_info(player_type *creature_ptr, void(*handle_stuff)(player_type*), update_playtime_pf update_playtime, display_player_pf display_player, map_name_pf map_name)
+void show_info(player_type *creature_ptr, update_playtime_pf update_playtime, display_player_pf display_player, map_name_pf map_name)
 {
        inventory_aware(creature_ptr);
        home_aware(creature_ptr);
 
        creature_ptr->update |= (PU_BONUS);
-       (*handle_stuff)(creature_ptr);
+       handle_stuff(creature_ptr);
        flush();
        msg_erase();
        
index 8b39be6..281aad4 100644 (file)
@@ -4,4 +4,4 @@
 #include "files.h"
 
 void print_tomb(player_type *dead_ptr);
-void show_info(player_type *creature_ptr, void(*handle_stuff)(player_type*), update_playtime_pf update_playtime, display_player_pf display_player, map_name_pf map_name);
+void show_info(player_type *creature_ptr, update_playtime_pf update_playtime, display_player_pf display_player, map_name_pf map_name);