任务单 #39492

Patch for --disable-japanese compiler errors

开放日期: 2019-08-20 18:46 最后更新: 2021-01-01 20:07

报告人:
(匿名)
属主:
类型:
状态:
关闭
组件:
(无)
优先:
1 - Lowest
严重性:
1 - Lowest
处理结果:
Duplicate
文件:

Details

On OS X 10.14.6 with Apple's cc, version 10.0.1, there were some compiler errors when the source was configured with --disable-japanese. Below is the output from git diff for the changes to src/autopick.c, src/cmd-smith.c, and src/monster1.c that resolved those compiler errors.

diff --git a/src/autopick.c b/src/autopick.c
index 3ad5cea1..c74136ac 100644
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -137,7 +137,7 @@ static GAME_TEXT KEY_COLLECTING[] = "collecting";
 static GAME_TEXT KEY_ARTIFACT[] = "artifact";
 static GAME_TEXT KEY_EGO[] = "ego";
 static GAME_TEXT KEY_GOOD[] = "good";
-static GAME_TEXT KEY_nameLESS[] = "nameless";
+static GAME_TEXT KEY_NAMELESS[] = "nameless";
 static GAME_TEXT KEY_AVERAGE[] = "average";
 static GAME_TEXT KEY_WORTHLESS[] = "worthless";
 static GAME_TEXT KEY_RARE[] = "rare";
diff --git a/src/cmd-smith.c b/src/cmd-smith.c
index 873a9b11..44ebef8f 100644
--- a/src/cmd-smith.c
+++ b/src/cmd-smith.c
@@ -1310,7 +1310,7 @@ static void add_essence(ESSENCE_IDX mode)
 #ifdef JP
        msg_format(_("%sに%sの能力を付加しました。", "You have added ability of %s to %s."), o_name, es_ptr->add_name);
 #else
-       msg_format(, es_ptr->add_name, o_name);
+       msg_format(_("%sに%sの能力を付加しました。", "You have added ability of %s to %s."), es_ptr->add_name, o_name);
 #endif
        p_ptr->update |= (PU_COMBINE | PU_REORDER);
        p_ptr->window |= (PW_INVEN);
diff --git a/src/monster1.c b/src/monster1.c
index 582b3542..f657e427 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -669,7 +669,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
                        /* Mention the experience */
                        hooked_roff(format(" is worth about %ld.%02ld point%s for level %d player",
                                (long)i, (long)j,
-                               (((i == 1) && (j == 0)) ? "" : "s")), p_ptr->lev);
+                               (((i == 1) && (j == 0)) ? "" : "s"), p_ptr->lev));
 
                        /* Take account of annoying English */
                        p = "th";

任务单历史 (3/4 Histories)

2019-08-20 18:46 Updated by: None
  • New Ticket "Patch for --disable-japanese compiler errors" created
2019-08-31 20:00 Updated by: deskull
评论

It was applied manually. thanks.

2019-09-01 00:00 Updated by: deskull
  • 处理结果 Update from to Duplicate
  • 属主 Update from (无) to deskull
  • 状态 Update from 开启 to 关闭
2021-01-01 20:07 Updated by: deskull

Attachment File List

No attachments

编辑

Please login to add comment to this ticket » 登录名