From 97d0a0ea8eaa15b2195df6300693f32568941753 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sun, 27 Aug 2017 19:39:04 +0900 Subject: [PATCH] =?utf8?q?#37449=20(2.2.0.64)=20=E9=81=8E=E5=8E=BB?= =?utf8?q?=E3=81=AE=E3=82=B2=E3=83=BC=E3=83=A0=E3=83=A1=E3=83=83=E3=82=BB?= =?utf8?q?=E3=83=BC=E3=82=B8=E4=BF=9D=E5=AD=98=E5=AE=B9=E9=87=8F=E3=82=922?= =?utf8?q?0=E5=80=8D=E3=81=AB=E6=8B=A1=E5=A4=A7=20/=20Memory=20of=20game?= =?utf8?q?=20message=20becomes=2020=20times.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 6 +++--- src/externs.h | 10 +++++----- src/flavor.c | 4 ++-- src/util.c | 16 ++++++---------- src/variable.c | 10 +++++----- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/defines.h b/src/defines.h index 15db14537..c7d49d54e 100644 --- a/src/defines.h +++ b/src/defines.h @@ -53,7 +53,7 @@ #define FAKE_VER_MAJOR 12 /*!< ゲームのバージョン番号定義(メジャー番号 + 10) */ #define FAKE_VER_MINOR 2 /*!< ゲームのバージョン番号定義(マイナー番号) */ #define FAKE_VER_PATCH 0 /*!< ゲームのバージョン番号定義(パッチ番号) */ -#define FAKE_VER_EXTRA 63 /*!< ゲームのバージョン番号定義(エクストラ番号) */ +#define FAKE_VER_EXTRA 64 /*!< ゲームのバージョン番号定義(エクストラ番号) */ /*! @@ -443,14 +443,14 @@ * OPTION: Maximum number of messages to remember (see "io.c") * Default: assume maximal memorization of 2048 total messages */ -#define MESSAGE_MAX 4096 +#define MESSAGE_MAX 81920 /* * OPTION: Maximum space for the message text buffer (see "io.c") * Default: assume that each of the 2048 messages is repeated an * average of three times, and has an average length of 48 */ -#define MESSAGE_BUF 32768 +#define MESSAGE_BUF 655360 /* diff --git a/src/externs.h b/src/externs.h index 07fef9d18..6024503ff 100644 --- a/src/externs.h +++ b/src/externs.h @@ -426,11 +426,11 @@ extern bool *macro__cmd; extern char *macro__buf; extern s16b quark__num; extern cptr *quark__str; -extern u16b message__next; -extern u16b message__last; -extern u16b message__head; -extern u16b message__tail; -extern u16b *message__ptr; +extern u32b message__next; +extern u32b message__last; +extern u32b message__head; +extern u32b message__tail; +extern u32b *message__ptr; extern char *message__buf; extern u32b option_flag[8]; extern u32b option_mask[8]; diff --git a/src/flavor.c b/src/flavor.c index d769833ae..bc6ca6184 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -1327,8 +1327,8 @@ void object_desc(char *buf, object_type *o_ptr, u32b mode) /* Assume no "modifier" string */ cptr modstr = ""; - int power; - int fire_rate; + int power; + int fire_rate; bool aware = FALSE; bool known = FALSE; diff --git a/src/util.c b/src/util.c index c2abf2901..385587f78 100644 --- a/src/util.c +++ b/src/util.c @@ -2449,8 +2449,8 @@ s16b message_num(void) */ cptr message_str(int age) { - s16b x; - s16b o; + s32b x; + s32b o; cptr s; /* Forgotten messages have no text */ @@ -2479,7 +2479,7 @@ void message_add(cptr str) { int i, k, x, m, n; - char u[1024]; + char u[4096]; char splitted1[81]; cptr splitted2; @@ -2520,14 +2520,11 @@ void message_add(cptr str) splitted2 = NULL; } - /*** Step 2 -- Attempt to optimize ***/ + /*** Step 2 -- 最適化の試行 / Attempt to optimize ***/ /* Limit number of messages to check */ m = message_num(); - k = m / 4; - - /* Limit number of messages to check */ if (k > MESSAGE_MAX / 32) k = MESSAGE_MAX / 32; /* Check previous message */ @@ -2554,7 +2551,7 @@ void message_add(cptr str) /* Find multiple */ #ifdef JP for (t = buf; *t && (*t != '<' || (*(t+1) != 'x' )); t++) - if( iskanji(*t))t++; + if(iskanji(*t))t++; #else for (t = buf; *t && (*t != '<'); t++); #endif @@ -2602,8 +2599,7 @@ void message_add(cptr str) /* Check the last few messages (if any to count) */ for (i = message__next; k; k--) { - u16b q; - + int q; cptr old; /* Back up and wrap if needed */ diff --git a/src/variable.c b/src/variable.c index de8ccc931..19e6fa4e4 100644 --- a/src/variable.c +++ b/src/variable.c @@ -490,27 +490,27 @@ cptr *quark__str; /* * The next "free" index to use */ -u16b message__next; +u32b message__next; /* * The index of the oldest message (none yet) */ -u16b message__last; +u32b message__last; /* * The next "free" offset */ -u16b message__head; +u32b message__head; /* * The offset to the oldest used char (none yet) */ -u16b message__tail; +u32b message__tail; /* * The array of offsets, by index [MESSAGE_MAX] */ -u16b *message__ptr; +u32b *message__ptr; /* * The array of chars, by offset [MESSAGE_BUF] -- 2.11.0