[Refactor] #40467 Separated set_zangband_gambling_monsters() from extra-loader.c...

diff --git a/src/savedata/extra-loader.c b/src/savedata/extra-loader.c
index e03ae85..c615e45 100644 (file)
--- a/src/savedata/extra-loader.c
+++ b/src/savedata/extra-loader.c
@@ -181,16 +181,14 @@ static void rd_dummy_monsters(player_type *creature_ptr)
     }
 }
 
-static void set_gambling_monsters(player_type *creature_ptr)
+static void set_gambling_monsters(void)
 {
     const int max_gambling_monsters = 4;
     for (int i = 0; i < max_gambling_monsters; i++) {
         rd_s16b(&battle_mon[i]);
-        if (z_older_than(10, 3, 4)) {
-            s16b tmp16s;
-            rd_s16b(&tmp16s);
-            mon_odds[i] = tmp16s;
-        } else
+        if (z_older_than(10, 3, 4))
+            set_zangband_gambling_monsters(i);
+        else
             rd_u32b(&mon_odds[i]);
     }
 }
@@ -213,7 +211,7 @@ void rd_extra(player_type *creature_ptr)
     if (z_older_than(10, 0, 3)) {
         update_gambling_monsters(creature_ptr);
     } else
-        set_gambling_monsters(creature_ptr);
+        set_gambling_monsters();
 
     rd_s16b(&creature_ptr->town_num);
     rd_s16b(&creature_ptr->arena_number);

diff --git a/src/savedata/load-zangband.c b/src/savedata/load-zangband.c
index f2611e0..3067dda 100644 (file)
--- a/src/savedata/load-zangband.c
+++ b/src/savedata/load-zangband.c
@@ -1,4 +1,5 @@
 #include "savedata/load-zangband.h"
+#include "cmd-building/cmd-building.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "game-option/option-flags.h"
@@ -177,3 +178,10 @@ void set_zangband_game_turns(player_type *creature_ptr)
     current_world_ptr->game_turn /= 2;
     current_world_ptr->dungeon_turn /= 2;
 }
+
+void set_zangband_gambling_monsters(int i)
+{
+    s16b tmp16s;
+    rd_s16b(&tmp16s);
+    mon_odds[i] = tmp16s;
+}

diff --git a/src/savedata/load-zangband.h b/src/savedata/load-zangband.h
index e6f0e8a..b23681b 100644 (file)
--- a/src/savedata/load-zangband.h
+++ b/src/savedata/load-zangband.h
@@ -14,3 +14,4 @@ void set_zangband_holy_aura(player_type *creature_ptr);
 void set_zangband_reflection(player_type *creature_ptr);
 void rd_zangband_dungeon(void);
 void set_zangband_game_turns(player_type *creature_ptr);
+void set_zangband_gambling_monsters(int i);