From e94c29bf0d85feb3a425caf053831240a2be0ea3 Mon Sep 17 00:00:00 2001 From: deskull Date: Tue, 7 Jan 2020 00:37:11 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20#39670=20=E7=8F=BE=E7=8A=B6=E6=8A=8A?= =?utf8?q?=E6=8F=A1=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E9=99=90=E3=82=8A?= =?utf8?q?=E3=81=AE=E9=96=A2=E6=95=B0=E5=AE=A3=E8=A8=80=E3=81=A8=E5=AE=9A?= =?utf8?q?=E7=BE=A9=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E9=BD=9F?= =?utf8?q?=E9=BD=AC=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=8E=20/=20Fix=20mismat?= =?utf8?q?ch=20between=20function=20definition=20and=20prototype.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core.h | 1 - src/quest.c | 1 + src/realm-arcane.c | 1 + src/realm-chaos.c | 1 + src/realm-crusade.c | 1 + src/realm-daemon.c | 1 + src/realm-death.c | 1 + src/realm-nature.c | 1 + src/save.c | 1 + src/spells-diceroll.h | 2 +- src/spells.h | 1 - src/spells2.c | 1 + src/view-mainwindow.h | 1 + 13 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/core.h b/src/core.h index 3afa2ff0d..b95e71fe8 100644 --- 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 618e1d77a..83f5de2f0 100644 --- 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 283254b5c..4dfe05b34 100644 --- 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 001ccfd71..8258f6b79 100644 --- 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 e27e27523..bd65fbc95 100644 --- 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 5163d0b9e..3d3e992ff 100644 --- 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 7438fb777..8c2a00bd4 100644 --- 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 2a7cae06b..5d702787c 100644 --- 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 18a9200db..186d851a5 100644 --- 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 1f89e9c6e..de9c41193 100644 --- 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 6dfe8ef09..b32873bfb 100644 --- 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 db849a1c5..4e953eec2 100644 --- 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 6b6d610e5..a0b92b764 100644 --- 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 -- 2.11.0