OSDN Git Service
(root)
/
jnethack
/
source.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
985ea24
)
separate enc_stat_opt from enc_stat
author
SHIRAKATA Kentaro
<argrath@ub32.org>
Sun, 5 Apr 2020 19:17:50 +0000
(
04:17
+0900)
committer
SHIRAKATA Kentaro
<argrath@ub32.org>
Tue, 7 Apr 2020 19:40:28 +0000
(
04:40
+0900)
src/botl.c
patch
|
blob
|
history
diff --git
a/src/botl.c
b/src/botl.c
index
6900d40
..
9c034f8
100644
(file)
--- a/
src/botl.c
+++ b/
src/botl.c
@@
-19,8
+19,11
@@
extern const char *hu_stat[]; /* defined in eat.c */
const char *const enc_stat[] = { "", "Burdened", "Stressed",
"Strained", "Overtaxed", "Overloaded" };
#else
const char *const enc_stat[] = { "", "Burdened", "Stressed",
"Strained", "Overtaxed", "Overloaded" };
#else
+ /*
\83
I
\83
v
\83
V
\83
\87
\83
\93
\82
Ì
\83
p
\81
[
\83
X
\82
Å
\89
p
\8c
ê
\94
Å
\82
à
\95
K
\97
v*/
const char *const enc_stat[] = { "", "
\82
æ
\82
ë
\82
ß
\82
«", "
\88
³
\94
\97
",
"
\8c
À
\8a
E", "
\89
×
\8f
d", "
\92
´
\89
ß"};
const char *const enc_stat[] = { "", "
\82
æ
\82
ë
\82
ß
\82
«", "
\88
³
\94
\97
",
"
\8c
À
\8a
E", "
\89
×
\8f
d", "
\92
´
\89
ß"};
+const char *const enc_stat_opt[] = { "", "Burdened", "Stressed",
+ "Strained", "Overtaxed", "Overloaded" };
#endif
STATIC_OVL NEARDATA int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */
#endif
STATIC_OVL NEARDATA int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */
@@
-2210,10
+2213,17
@@
boolean from_configfile;
up = TRUE;
changed = TRUE;
} else if (fld == BL_CAP
up = TRUE;
changed = TRUE;
} else if (fld == BL_CAP
+#if 0 /*JP*/
&& is_fld_arrayvalues(s[sidx], enc_stat,
SLT_ENCUMBER, OVERLOADED + 1,
&kidx)) {
txt = enc_stat[kidx];
&& is_fld_arrayvalues(s[sidx], enc_stat,
SLT_ENCUMBER, OVERLOADED + 1,
&kidx)) {
txt = enc_stat[kidx];
+#else
+ && is_fld_arrayvalues(s[sidx], enc_stat_opt,
+ SLT_ENCUMBER, OVERLOADED + 1,
+ &kidx)) {
+ txt = enc_stat_opt[kidx];
+#endif
txtval = TRUE;
} else if (fld == BL_ALIGN
&& is_fld_arrayvalues(s[sidx], aligntxt, 0, 3, &kidx)) {
txtval = TRUE;
} else if (fld == BL_ALIGN
&& is_fld_arrayvalues(s[sidx], aligntxt, 0, 3, &kidx)) {
@@
-3449,9
+3459,15
@@
choose_value:
|| fld == BL_TITLE) ? "Choose" : "Enter",
initblstats[fld].fldname);
if (fld == BL_CAP) {
|| fld == BL_TITLE) ? "Choose" : "Enter",
initblstats[fld].fldname);
if (fld == BL_CAP) {
+#if 0 /*JP*/
int rv = query_arrayvalue(qry_buf,
enc_stat,
SLT_ENCUMBER, OVERLOADED + 1);
int rv = query_arrayvalue(qry_buf,
enc_stat,
SLT_ENCUMBER, OVERLOADED + 1);
+#else
+ int rv = query_arrayvalue(qry_buf,
+ enc_stat_opt,
+ SLT_ENCUMBER, OVERLOADED + 1);
+#endif
if (rv < SLT_ENCUMBER)
goto choose_behavior;
if (rv < SLT_ENCUMBER)
goto choose_behavior;