[Fix] #39670 現状把握している限りの関数宣言と定義のファイル齟齬を修正． / Fix mismatch between function definition...

diff --git a/src/core.h b/src/core.h
index 3afa2ff..b95e71f 100644 (file)
--- a/src/core.h
+++ b/src/core.h
@@ -79,7 +79,6 @@ extern bool repair_monsters;
 extern bool repair_objects;
 
 extern void play_game(player_type *player_ptr, bool new_game);
-extern void update_playtime(void);
 extern s32b turn_real(s32b hoge);
 extern void prevent_turn_overflow(void);
 extern void close_game(player_type *player_ptr);

diff --git a/src/quest.c b/src/quest.c
index 618e1d7..83f5de2 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -17,6 +17,7 @@
 #include "world.h"
 #include "cmd-dump.h"
 #include "english.h"
+#include "view-mainwindow.h"
 
 quest_type *quest; /*!< Quest info */
 QUEST_IDX max_q_idx; /*!< Maximum number of quests */

diff --git a/src/realm-arcane.c b/src/realm-arcane.c
index 283254b..4dfe05b 100644 (file)
--- a/src/realm-arcane.c
+++ b/src/realm-arcane.c
@@ -9,6 +9,7 @@
 #include "spells-object.h"
 #include "spells-summon.h"
 #include "spells-status.h"
+#include "spells-diceroll.h"
 #include "player-status.h"
 #include "player-effects.h"
 #include "targeting.h"

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index 001ccfd..8258f6b 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -8,6 +8,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "spells-object.h"
+#include "spells-diceroll.h"
 #include "spells.h"
 #include "targeting.h"
 #include "view-mainwindow.h"

diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index e27e275..bd65fbc 100644 (file)
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -9,6 +9,7 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-floor.h"
+#include "spells-diceroll.h"
 #include "player-class.h"
 #include "player-effects.h"
 #include "targeting.h"

diff --git a/src/realm-daemon.c b/src/realm-daemon.c
index 5163d0b..3d3e992 100644 (file)
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -9,6 +9,7 @@
 #include "spells-floor.h"
 #include "spells-status.h"
 #include "spells-object.h"
+#include "spells-diceroll.h"
 #include "player-effects.h"
 #include "player-race.h"
 #include "player-damage.h"

diff --git a/src/realm-death.c b/src/realm-death.c
index 7438fb7..8c2a00b 100644 (file)
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -4,6 +4,7 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-object.h"
+#include "spells-diceroll.h"
 #include "avatar.h"
 #include "player-status.h"
 #include "player-effects.h"

diff --git a/src/realm-nature.c b/src/realm-nature.c
index 2a7cae0..5d70278 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -6,6 +6,7 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-object.h"
+#include "spells-diceroll.h"
 #include "avatar.h"
 #include "spells-floor.h"
 #include "player-race.h"

diff --git a/src/save.c b/src/save.c
index 18a9200..186d851 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -34,6 +34,7 @@
 #include "monsterrace.h"
 #include "birth.h"
 #include "bldg.h"
+#include "view-mainwindow.h"
 
 
 /*

diff --git a/src/spells-diceroll.h b/src/spells-diceroll.h
index 1f89e9c..de9c411 100644 (file)
--- a/src/spells-diceroll.h
+++ b/src/spells-diceroll.h
@@ -2,4 +2,4 @@
 
 extern bool_hack common_saving_throw_control(player_type *operator_ptr, HIT_POINT pow, monster_type *m_ptr);
 extern bool_hack common_saving_throw_charm(player_type *operator_ptr, HIT_POINT pow, monster_type *m_ptr);
-
+extern PERCENTAGE beam_chance(player_type *caster_ptr);

diff --git a/src/spells.h b/src/spells.h
index 6dfe8ef..b32873b 100644 (file)
--- a/src/spells.h
+++ b/src/spells.h
@@ -141,7 +141,6 @@ extern bool sukekaku;
 extern const magic_type technic_info[NUM_TECHNIC][32];
 
 /* spells1.c */
-extern PERCENTAGE beam_chance(player_type *caster_ptr);
 extern bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 extern void breath_shape(floor_type *floor_ptr, u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ);
 extern POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2);

diff --git a/src/spells2.c b/src/spells2.c
index db849a1..4e953ee 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -34,6 +34,7 @@
 
 #include "spells-status.h"
 #include "spells-floor.h"
+#include "spells-diceroll.h"
 #include "realm-hex.h"
 #include "autopick.h"
 #include "object-flavor.h"

diff --git a/src/view-mainwindow.h b/src/view-mainwindow.h
index 6b6d610..a0b92b7 100644 (file)
--- a/src/view-mainwindow.h
+++ b/src/view-mainwindow.h
@@ -22,6 +22,7 @@ extern void redraw_window(void);
 extern bool change_panel(POSITION dy, POSITION dx);
 
 extern void window_stuff(void);
+extern void update_playtime(void);
 
 #define ROW_MAP                 0
 #define COL_MAP                 12