From b0171b875075e49fb76a97d5a54118ced6a0b4a9 Mon Sep 17 00:00:00 2001 From: Deskull Date: Wed, 20 Dec 2017 01:13:11 +0900 Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20=E5=9E=8B?= =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?= =?utf8?q?=E3=80=82=20/=20Ongoing=20type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 4 ++-- src/mspells3.c | 2 +- src/util.c | 7 ++++--- src/variable.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/externs.h b/src/externs.h index f0adc9def..9417dce6c 100644 --- a/src/externs.h +++ b/src/externs.h @@ -425,7 +425,7 @@ extern cptr *macro__pat; extern cptr *macro__act; extern bool *macro__cmd; extern char *macro__buf; -extern s16b quark__num; +extern STR_OFFSET quark__num; extern cptr *quark__str; extern u32b message__next; extern u32b message__last; @@ -1337,7 +1337,7 @@ extern sint macro_find_exact(cptr pat); extern char inkey(void); extern cptr quark_str(STR_OFFSET num); extern void quark_init(void); -extern s16b quark_add(cptr str); +extern u16b quark_add(cptr str); extern s32b message_num(void); extern cptr message_str(int age); extern void message_add(cptr msg); diff --git a/src/mspells3.c b/src/mspells3.c index d0b88c5f5..de195c0c3 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -611,7 +611,7 @@ static bool cast_learned_spell(int spell, bool success) HIT_POINT damage = 0; bool pet = success; bool no_trump = FALSE; - u32b p_mode, u_mode = 0L, g_mode; + BIT_FLAGS p_mode, u_mode = 0L, g_mode; if (pet) { diff --git a/src/util.c b/src/util.c index 57ea00020..c563cf517 100644 --- a/src/util.c +++ b/src/util.c @@ -2351,9 +2351,9 @@ void quark_init(void) /* * Add a new "quark" to the set of quarks. */ -s16b quark_add(cptr str) +u16b quark_add(cptr str) { - s16b i; + u16b i; /* Look for an existing quark */ for (i = 1; i < quark__num; i++) @@ -2477,7 +2477,8 @@ cptr message_str(int age) */ void message_add(cptr str) { - int i, k, x, m, n; + u32b i; + int k, x, m, n; char u[4096]; char splitted1[81]; diff --git a/src/variable.c b/src/variable.c index fa9639fbf..9cc725a11 100644 --- a/src/variable.c +++ b/src/variable.c @@ -482,7 +482,7 @@ char *macro__buf; /* * The number of quarks */ -s16b quark__num; +STR_OFFSET quark__num; /* * The pointers to the quarks [QUARK_MAX] -- 2.11.0