• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision61fd54c1ee47a6c98fdd7d549f313f36c14f20b0 (tree)
Time2019-05-07 23:47:06
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 賭け闘技場に関する定義を bldg.c/h へ移動.

Change Summary

Incremental Difference

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -60,6 +60,11 @@
6060 */
6161 building_type building[MAX_BLDG];
6262
63+MONRACE_IDX battle_mon[4];
64+u32b mon_odds[4];
65+int battle_odds;
66+PRICE kakekin;
67+int sel_monster;
6368
6469 /*!
6570 * @brief 闘技場のモンスターID及び報酬アイテムテーブル
--- a/src/bldg.h
+++ b/src/bldg.h
@@ -90,6 +90,12 @@ typedef struct
9090 OBJECT_SUBTYPE_VALUE sval; /*!< モンスター打倒後に得られるアイテムの小カテゴリID / sval of prize */
9191 } arena_type;
9292
93+extern MONRACE_IDX battle_mon[4];
94+extern u32b mon_odds[4];
95+extern int battle_odds;
96+extern PRICE kakekin;
97+extern int sel_monster;
98+
9399 extern const arena_type arena_info[MAX_ARENA_MONS + 2];
94100 extern void update_gambling_monsters(void);
95101 extern void do_cmd_bldg(void);
--- a/src/externs.h
+++ b/src/externs.h
@@ -171,11 +171,7 @@ extern DUNGEON_IDX max_d_idx;
171171 extern int init_flags;
172172 extern int highscore_fd;
173173 extern bool can_save;
174-extern MONRACE_IDX battle_mon[4];
175-extern int sel_monster;
176-extern int battle_odds;
177-extern PRICE kakekin;
178-extern u32b mon_odds[4];
174+
179175 extern MONSTER_IDX pet_t_m_idx;
180176 extern MONSTER_IDX riding_t_m_idx;
181177 extern MONRACE_IDX today_mon;
--- a/src/save.c
+++ b/src/save.c
@@ -30,6 +30,7 @@
3030 #include "objectkind.h"
3131 #include "monsterrace.h"
3232 #include "birth.h"
33+#include "bldg.h"
3334
3435
3536 /*
--- a/src/variable.c
+++ b/src/variable.c
@@ -394,11 +394,6 @@ int highscore_fd = -1;
394394
395395 bool can_save = FALSE; /* Game can be saved */
396396
397-MONRACE_IDX battle_mon[4];
398-int sel_monster;
399-int battle_odds;
400-PRICE kakekin;
401-u32b mon_odds[4];
402397
403398 MONSTER_IDX pet_t_m_idx;
404399 MONSTER_IDX riding_t_m_idx;
Show on old repository browser