From 108009c38616a72d9387c7d29af51a18fcf866e5 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sun, 23 Dec 2018 08:50:31 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20#37353=20=E8=AD=A6=E5=91=8A=E4=BF=AE?= =?utf8?q?=E6=AD=A3=E3=80=82=20/=20Refactor=20warnings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 2 +- src/files.c | 2 +- src/mspells3.c | 2 +- src/wizard2.c | 12 +++++------- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/externs.h b/src/externs.h index 2ed782626..910be9289 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1346,7 +1346,7 @@ extern bool monst_spell_monst(MONSTER_IDX m_idx); /* mspells3.c */ extern bool do_cmd_cast_learned(void); extern void learn_spell(int monspell); -extern void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, BIT_FLAGS mode); +extern void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode); /* mspells4.c */ extern bool spell_learnable(MONSTER_IDX m_idx); diff --git a/src/files.c b/src/files.c index 6dcd7319a..e482463b8 100644 --- a/src/files.c +++ b/src/files.c @@ -4245,7 +4245,7 @@ static void dump_aux_class_special(FILE *fff) int l2 = 0; int num = 0; int spellnum[MAX_MONSPELLS]; - s32b f4 = 0, f5 = 0, f6 = 0; + BIT_FLAGS f4 = 0, f5 = 0, f6 = 0; char p[60][80]; int col = 0; bool pcol = FALSE; diff --git a/src/mspells3.c b/src/mspells3.c index 8017c0fb2..20336068b 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -1606,7 +1606,7 @@ void learn_spell(int monspell) */ /* */ -void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, BIT_FLAGS mode) +void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode) { switch (mode) { diff --git a/src/wizard2.c b/src/wizard2.c index 9f17e4dd4..38ac08bef 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1211,14 +1211,12 @@ static void wiz_quantity_item(object_type *o_ptr) */ static void do_cmd_wiz_blue_mage(void) { + int i = 0; + int j = 0; + BIT_FLAGS f4 = 0L, f5 = 0L, f6 = 0L; - int i = 0; - int j = 0; - s32b f4 = 0, f5 = 0, f6 = 0; - - for (j=1; j<6; j++) + for (j = 1; j < 6; j++) { - set_rf_masks(&f4, &f5, &f6, j); for (i = 0; i < 32; i++) @@ -2035,7 +2033,7 @@ void do_cmd_debug(void) if(tmp_int < 0) break; if(tmp_int >= max_q_idx) break; - p_ptr->inside_quest = tmp_int; + p_ptr->inside_quest = (QUEST_IDX)tmp_int; process_dungeon_file("q_info.txt", 0, 0, 0, 0); quest[tmp_int].status = QUEST_STATUS_TAKEN; p_ptr->inside_quest = 0; -- 2.11.0