• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision790072aa28ff8afabac32a89abb0feb11a42b2fa (tree)
Time2018-12-03 23:47:46
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 メッセージ整理。 / Refactor messages.

Change Summary

Incremental Difference

--- a/src/object1.c
+++ b/src/object1.c
@@ -3612,7 +3612,6 @@ COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_w
36123612 /* Default length */
36133613 len = MAX((*min_width), 20);
36143614
3615-
36163615 /* Scan for objects in the grid, using item_tester_okay() */
36173616 floor_num = scan_floor(floor_list, y, x, 0x03);
36183617
@@ -4079,41 +4078,23 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode)
40794078 /* Append */
40804079 if (allow_equip)
40814080 {
4082-#ifdef JP
40834081 if (!use_menu)
4084- strcat(out_val, " '/' 装備品,");
4082+ strcat(out_val, _(" '/' 装備品,", " / for Equip,"));
40854083 else if (allow_floor)
4086- strcat(out_val, " '6' 装備品,");
4084+ strcat(out_val, _(" '6' 装備品,", " 6 for Equip,"));
40874085 else
4088- strcat(out_val, " '4'or'6' 装備品,");
4089-#else
4090- if (!use_menu)
4091- strcat(out_val, " / for Equip,");
4092- else if (allow_floor)
4093- strcat(out_val, " 6 for Equip,");
4094- else
4095- strcat(out_val, " 4 or 6 for Equip,");
4096-#endif
4086+ strcat(out_val, _(" '4'or'6' 装備品,", " 4 or 6 for Equip,"));
40974087 }
40984088
40994089 /* Append */
41004090 if (allow_floor)
41014091 {
4102-#ifdef JP
41034092 if (!use_menu)
4104- strcat(out_val, " '-'床上,");
4093+ strcat(out_val, _(" '-'床上,", " - for floor,"));
41054094 else if (allow_equip)
4106- strcat(out_val, " '4' 床上,");
4095+ strcat(out_val, _(" '4' 床上,", " 4 for floor,"));
41074096 else
4108- strcat(out_val, " '4'or'6' 床上,");
4109-#else
4110- if (!use_menu)
4111- strcat(out_val, " - for floor,");
4112- else if (allow_equip)
4113- strcat(out_val, " 4 for floor,");
4114- else
4115- strcat(out_val, " 4 or 6 for floor,");
4116-#endif
4097+ strcat(out_val, _(" '4'or'6' 床上,", " 4 or 6 for floor,"));
41174098 }
41184099 }
41194100
@@ -4139,41 +4120,23 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode)
41394120 /* Append */
41404121 if (allow_inven)
41414122 {
4142-#ifdef JP
41434123 if (!use_menu)
4144- strcat(out_val, " '/' 持ち物,");
4124+ strcat(out_val, _(" '/' 持ち物,", " / for Inven,"));
41454125 else if (allow_floor)
4146- strcat(out_val, " '4' 持ち物,");
4126+ strcat(out_val, _(" '4' 持ち物,", " 4 for Inven,"));
41474127 else
4148- strcat(out_val, " '4'or'6' 持ち物,");
4149-#else
4150- if (!use_menu)
4151- strcat(out_val, " / for Inven,");
4152- else if (allow_floor)
4153- strcat(out_val, " 4 for Inven,");
4154- else
4155- strcat(out_val, " 4 or 6 for Inven,");
4156-#endif
4128+ strcat(out_val, _(" '4'or'6' 持ち物,", " 4 or 6 for Inven,"));
41574129 }
41584130
41594131 /* Append */
41604132 if (allow_floor)
41614133 {
4162-#ifdef JP
4163- if (!use_menu)
4164- strcat(out_val, " '-'床上,");
4165- else if (allow_inven)
4166- strcat(out_val, " '6' 床上,");
4167- else
4168- strcat(out_val, " '4'or'6' 床上,");
4169-#else
41704134 if (!use_menu)
4171- strcat(out_val, " - for floor,");
4135+ strcat(out_val, _(" '-'床上,", " - for floor,"));
41724136 else if (allow_inven)
4173- strcat(out_val, " 6 for floor,");
4137+ strcat(out_val, _(" '6' 床上,", " 6 for floor,"));
41744138 else
4175- strcat(out_val, " 4 or 6 for floor,");
4176-#endif
4139+ strcat(out_val, _(" '4'or'6' 床上,", " 4 or 6 for floor,"));
41774140 }
41784141 }
41794142
Show on old repository browser