From c596615315b5c0a8f088426546a4ba5afc1762e2 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 25 Apr 2020 00:20:24 +0900 Subject: [PATCH] [Refactor] #39964 Separated autopick-key-flag-process.h from autopick.c --- Hengband_vcs2017/Hengband/Hengband.vcxproj | 1 + Hengband_vcs2017/Hengband/Hengband.vcxproj.filters | 3 +++ src/Makefile.am | 2 +- src/autopick/autopick-key-flag-process.h | 18 ++++++++++++++++++ src/autopick/autopick.c | 18 +----------------- 5 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 src/autopick/autopick-key-flag-process.h diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index 7045a17f6..6ddf184ae 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -290,6 +290,7 @@ + diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index 7e87b69be..3cd3fc7d5 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -1259,6 +1259,9 @@ autopick + + autopick + diff --git a/src/Makefile.am b/src/Makefile.am index abc119ae7..1bc8fbd31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ hengband_SOURCES = \ autopick/autopick.c autopick/autopick.h \ autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \ autopick/autopick-editor-table.h autopick/autopick-flags-table.h \ - autopick/autopick-key-table.h \ + autopick/autopick-key-flag-process.h autopick/autopick-key-table.h \ \ avatar.h avatar.c birth.c birth.h \ \ diff --git a/src/autopick/autopick-key-flag-process.h b/src/autopick/autopick-key-flag-process.h new file mode 100644 index 000000000..94a417dc8 --- /dev/null +++ b/src/autopick/autopick-key-flag-process.h @@ -0,0 +1,18 @@ +#pragma once + +#define MATCH_KEY(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\ + ? (ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE) +#define MATCH_KEY2(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\ + ? (prev_ptr = ptr, ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE) + +#ifdef JP +#define ADD_KEY(KEY) strcat(ptr, KEY) +#else +#define ADD_KEY(KEY) (strcat(ptr, KEY), strcat(ptr, " ")) +#endif +#define ADD_KEY2(KEY) strcat(ptr, KEY) + +#define ADD_FLG(FLG) (entry->flag[FLG / 32] |= (1L << (FLG % 32))) +#define REM_FLG(FLG) (entry->flag[FLG / 32] &= ~(1L << (FLG % 32))) +#define ADD_FLG_NOUN(FLG) (ADD_FLG(FLG), prev_flg = FLG) +#define IS_FLG(FLG) (entry->flag[FLG / 32] & (1L << (FLG % 32))) diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c index 7db5421e7..9cf176890 100644 --- a/src/autopick/autopick.c +++ b/src/autopick/autopick.c @@ -16,6 +16,7 @@ #include "autopick/autopick-commands-table.h" #include "autopick/autopick-dirty-flags.h" #include "autopick/autopick-editor-table.h" +#include "autopick/autopick-key-flag-process.h" #include "autopick/autopick-flags-table.h" #include "autopick/autopick-keys-table.h" #include "gameterm.h" @@ -68,23 +69,6 @@ #define DESCRIPT_HGT 3 -#define MATCH_KEY(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\ - ? (ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE) -#define MATCH_KEY2(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\ - ? (prev_ptr = ptr, ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE) - -#ifdef JP -#define ADD_KEY(KEY) strcat(ptr, KEY) -#else -#define ADD_KEY(KEY) (strcat(ptr, KEY), strcat(ptr, " ")) -#endif -#define ADD_KEY2(KEY) strcat(ptr, KEY) - -#define ADD_FLG(FLG) (entry->flag[FLG / 32] |= (1L << (FLG % 32))) -#define REM_FLG(FLG) (entry->flag[FLG / 32] &= ~(1L << (FLG % 32))) -#define ADD_FLG_NOUN(FLG) (ADD_FLG(FLG), prev_flg = FLG) -#define IS_FLG(FLG) (entry->flag[FLG / 32] & (1L << (FLG % 32))) - #ifdef JP static char kanji_colon[] = "："; #endif -- 2.11.0