From 2255856da510a70a8136d2ef09e18952720d3a9b Mon Sep 17 00:00:00 2001 From: iks Date: Wed, 17 Mar 2021 23:51:23 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20=E4=BD=BF=E7=94=A8=E5=AE=9F?= =?utf8?q?=E6=85=8B=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6head->v=5F?= =?utf8?q?extra=E3=82=92head->checksum=E3=81=AB=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/info-reader/general-parser.cpp | 4 ++-- src/io-dump/character-dump.cpp | 4 ++-- src/main/angband-headers.h | 2 +- src/main/info-initializer.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/info-reader/general-parser.cpp b/src/info-reader/general-parser.cpp index 9e4c28d25..bd0a46de5 100644 --- a/src/info-reader/general-parser.cpp +++ b/src/info-reader/general-parser.cpp @@ -52,8 +52,8 @@ errr init_info_txt(FILE *fp, char *buf, angband_header *head, parse_info_txt_fun if (buf[0] != 'N' && buf[0] != 'D') { int i; for (i = 0; buf[i]; i++) { - head->v_extra += (byte)buf[i]; - head->v_extra ^= (1U << (i % 8)); + head->checksum += (byte)buf[i]; + head->checksum ^= (1U << (i % 8)); } } diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp index a56f848e2..e3d0fa791 100644 --- a/src/io-dump/character-dump.cpp +++ b/src/io-dump/character-dump.cpp @@ -548,8 +548,8 @@ static void dump_aux_home_museum(player_type *creature_ptr, FILE *fff) */ static concptr get_check_sum(void) { - return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x", f_head.v_extra, k_head.v_extra, a_head.v_extra, e_head.v_extra, r_head.v_extra, d_head.v_extra, - m_head.v_extra, s_head.v_extra, v_head.v_extra); + return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x", f_head.checksum, k_head.checksum, a_head.checksum, e_head.checksum, r_head.checksum, d_head.checksum, + m_head.checksum, s_head.checksum, v_head.checksum); } /*! diff --git a/src/main/angband-headers.h b/src/main/angband-headers.h index a2c8e25bf..9951d0c6f 100644 --- a/src/main/angband-headers.h +++ b/src/main/angband-headers.h @@ -12,7 +12,7 @@ struct angband_header { byte v_major; /* Version -- major */ byte v_minor; /* Version -- minor */ byte v_patch; /* Version -- patch */ - byte v_extra; /* Version -- extra */ + byte checksum; /* Version -- extra */ u16b info_num; /* Number of "info" records */ int info_len; /* Size of each "info" record */ diff --git a/src/main/info-initializer.cpp b/src/main/info-initializer.cpp index 7b5ee6ee4..f38eccd45 100644 --- a/src/main/info-initializer.cpp +++ b/src/main/info-initializer.cpp @@ -105,7 +105,7 @@ static void init_header(angband_header *head, IDX num, int len) head->v_major = FAKE_VER_MAJOR; head->v_minor = FAKE_VER_MINOR; head->v_patch = FAKE_VER_PATCH; - head->v_extra = 0; + head->checksum = 0; head->info_num = (IDX)num; head->info_len = len; -- 2.11.0