-/* File: autopick.c */
-
-/* Purpose: Object Auto-picker/Destroyer */
-
-/*
- * Copyright (c) 2002 Mogami
- *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+/*!
+ * @file autopick.c
+ * @brief 自動拾い機能の実装 / Object Auto-picker/Destroyer
+ * @date 2014/01/02
+ * @author
+ * Copyright (c) 2002 Mogami\n
+ *\n
+ * This software may be copied and distributed for educational, research, and\n
+ * not for profit purposes provided that this copyright and statement are\n
+ * included in all such copies.\n
+ * 2014 Deskull rearranged comment for Doxygen.\n
*/
#include "angband.h"
-
+#include "store.h"
+#include "player-status.h"
+#include "object-hook.h"
#define MAX_LINELEN 1024
/*
* Macros for Keywords
*/
-#define FLG_ALL 0
-#define FLG_UNAWARE 1
-#define FLG_UNIDENTIFIED 2
-#define FLG_IDENTIFIED 3
-#define FLG_STAR_IDENTIFIED 4
-#define FLG_COLLECTING 5
-#define FLG_ARTIFACT 6
+#define FLG_ALL 0
+#define FLG_UNAWARE 1
+#define FLG_UNIDENTIFIED 2
+#define FLG_IDENTIFIED 3
+#define FLG_STAR_IDENTIFIED 4
+#define FLG_COLLECTING 5
+#define FLG_ARTIFACT 6
#define FLG_EGO 7
#define FLG_GOOD 10
-#define FLG_NAMELESS 11
+#define FLG_NAMELESS 11
#define FLG_AVERAGE 12
-#define FLG_WORTHLESS 13
+#define FLG_WORTHLESS 13
#define FLG_RARE 14
#define FLG_COMMON 15
#define FLG_BOOSTED 16
-#define FLG_MORE_DICE 17
-#define FLG_MORE_BONUS 18
+#define FLG_MORE_DICE 17
+#define FLG_MORE_BONUS 18
#define FLG_WANTED 19
#define FLG_UNIQUE 20
#define FLG_HUMAN 21
-#define FLG_UNREADABLE 22
+#define FLG_UNREADABLE 22
#define FLG_REALM1 23
#define FLG_REALM2 24
#define FLG_FIRST 25
#ifdef JP
-static char KEY_ALL[] = "¤¹¤Ù¤Æ¤Î";
-static char KEY_UNAWARE[] = "̤ȽÌÀ¤Î";
-static char KEY_UNIDENTIFIED[] = "̤´ÕÄê¤Î";
-static char KEY_IDENTIFIED[] = "´ÕÄêºÑ¤ß¤Î";
-static char KEY_STAR_IDENTIFIED[] = "*´ÕÄê*ºÑ¤ß¤Î";
-static char KEY_COLLECTING[] = "¼ý½¸Ãæ¤Î";
-static char KEY_ARTIFACT[] = "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È";
-static char KEY_EGO[] = "¥¨¥´";
-static char KEY_GOOD[] = "¾å¼Á¤Î";
-static char KEY_NAMELESS[] = "̵ÌäÎ";
-static char KEY_AVERAGE[] = "ʤÎ";
-static char KEY_WORTHLESS[] = "̵²ÁÃͤÎ";
-static char KEY_RARE[] = "¥ì¥¢¤Ê";
-static char KEY_COMMON[] = "¤¢¤ê¤Õ¤ì¤¿";
-static char KEY_BOOSTED[] = "¥À¥¤¥¹Ìܤΰ㤦";
-static char KEY_MORE_THAN[] = "¥À¥¤¥¹ÌÜ";
-static char KEY_DICE[] = "°Ê¾å¤Î";
-static char KEY_MORE_BONUS[] = "½¤ÀµÃÍ";
-static char KEY_MORE_BONUS2[] = "°Ê¾å¤Î";
-static char KEY_WANTED[] = "¾Þ¶â¼ó¤Î";
-static char KEY_UNIQUE[] = "¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î";
-static char KEY_HUMAN[] = "¿Í´Ö¤Î";
-static char KEY_UNREADABLE[] = "Æɤá¤Ê¤¤";
-static char KEY_REALM1[] = "Âè°ìÎΰè¤Î";
-static char KEY_REALM2[] = "ÂèÆóÎΰè¤Î";
-static char KEY_FIRST[] = "1ºýÌܤÎ";
-static char KEY_SECOND[] = "2ºýÌܤÎ";
-static char KEY_THIRD[] = "3ºýÌܤÎ";
-static char KEY_FOURTH[] = "4ºýÌܤÎ";
-static char KEY_ITEMS[] = "¥¢¥¤¥Æ¥à";
-static char KEY_WEAPONS[] = "Éð´ï";
-static char KEY_FAVORITE_WEAPONS[] = "ÆÀ°ÕÉð´ï";
-static char KEY_ARMORS[] = "Ëɶñ";
-static char KEY_MISSILES[] = "Ìð";
-static char KEY_DEVICES[] = "ËâË¡¥¢¥¤¥Æ¥à";
-static char KEY_LIGHTS[] = "¸÷¸»";
-static char KEY_JUNKS[] = "¤¬¤é¤¯¤¿";
-static char KEY_CORPSES[] = "»àÂΤä¹ü";
-static char KEY_SPELLBOOKS[] = "ËâË¡½ñ";
-static char KEY_HAFTED[] = "Æß´ï";
-static char KEY_SHIELDS[] = "½â";
-static char KEY_BOWS[] = "µÝ";
-static char KEY_RINGS[] = "»ØÎØ";
-static char KEY_AMULETS[] = "¥¢¥ß¥å¥ì¥Ã¥È";
-static char KEY_SUITS[] = "³»";
-static char KEY_CLOAKS[] = "¥¯¥í¡¼¥¯";
-static char KEY_HELMS[] = "³õ";
-static char KEY_GLOVES[] = "äƼê";
-static char KEY_BOOTS[] = "·¤";
+static GAME_TEXT KEY_ALL[] = "すべての";
+static GAME_TEXT KEY_UNAWARE[] = "未判明の";
+static GAME_TEXT KEY_UNIDENTIFIED[] = "未鑑定の";
+static GAME_TEXT KEY_IDENTIFIED[] = "鑑定済みの";
+static GAME_TEXT KEY_STAR_IDENTIFIED[] = "*鑑定*済みの";
+static GAME_TEXT KEY_COLLECTING[] = "収集中の";
+static GAME_TEXT KEY_ARTIFACT[] = "アーティファクト";
+static GAME_TEXT KEY_EGO[] = "ã\82¨ã\82´";
+static GAME_TEXT KEY_GOOD[] = "上質の";
+static GAME_TEXT KEY_NAMELESS[] = "無銘の";
+static GAME_TEXT KEY_AVERAGE[] = "並の";
+static GAME_TEXT KEY_WORTHLESS[] = "無価値の";
+static GAME_TEXT KEY_RARE[] = "レアな";
+static GAME_TEXT KEY_COMMON[] = "ありふれた";
+static GAME_TEXT KEY_BOOSTED[] = "ダイス目の違う";
+static GAME_TEXT KEY_MORE_THAN[] = "ダイス目";
+static GAME_TEXT KEY_DICE[] = "以上の";
+static GAME_TEXT KEY_MORE_BONUS[] = "修正値";
+static GAME_TEXT KEY_MORE_BONUS2[] = "以上の";
+static GAME_TEXT KEY_WANTED[] = "賞金首の";
+static GAME_TEXT KEY_UNIQUE[] = "ユニーク・モンスターの";
+static GAME_TEXT KEY_HUMAN[] = "人間の";
+static GAME_TEXT KEY_UNREADABLE[] = "読めない";
+static GAME_TEXT KEY_REALM1[] = "第一領域の";
+static GAME_TEXT KEY_REALM2[] = "第二領域の";
+static GAME_TEXT KEY_FIRST[] = "1冊目の";
+static GAME_TEXT KEY_SECOND[] = "2冊目の";
+static GAME_TEXT KEY_THIRD[] = "3冊目の";
+static GAME_TEXT KEY_FOURTH[] = "4冊目の";
+static GAME_TEXT KEY_ITEMS[] = "アイテム";
+static GAME_TEXT KEY_WEAPONS[] = "武器";
+static GAME_TEXT KEY_FAVORITE_WEAPONS[] = "得意武器";
+static GAME_TEXT KEY_ARMORS[] = "防具";
+static GAME_TEXT KEY_MISSILES[] = "矢";
+static GAME_TEXT KEY_DEVICES[] = "魔法アイテム";
+static GAME_TEXT KEY_LIGHTS[] = "光源";
+static GAME_TEXT KEY_JUNKS[] = "がらくた";
+static GAME_TEXT KEY_CORPSES[] = "死体や骨";
+static GAME_TEXT KEY_SPELLBOOKS[] = "魔法書";
+static GAME_TEXT KEY_HAFTED[] = "鈍器";
+static GAME_TEXT KEY_SHIELDS[] = "盾";
+static GAME_TEXT KEY_BOWS[] = "弓";
+static GAME_TEXT KEY_RINGS[] = "指輪";
+static GAME_TEXT KEY_AMULETS[] = "アミュレット";
+static GAME_TEXT KEY_SUITS[] = "鎧";
+static GAME_TEXT KEY_CLOAKS[] = "ã\82¯ã\83ã\83¼ã\82¯";
+static GAME_TEXT KEY_HELMS[] = "兜";
+static GAME_TEXT KEY_GLOVES[] = "籠手";
+static GAME_TEXT KEY_BOOTS[] = "靴";
#else
-static char KEY_ALL[] = "all";
-static char KEY_UNAWARE[] = "unaware";
-static char KEY_UNIDENTIFIED[] = "unidentified";
-static char KEY_IDENTIFIED[] = "identified";
-static char KEY_STAR_IDENTIFIED[] = "*identified*";
-static char KEY_COLLECTING[] = "collecting";
-static char KEY_ARTIFACT[] = "artifact";
-static char KEY_EGO[] = "ego";
-static char KEY_GOOD[] = "good";
-static char KEY_NAMELESS[] = "nameless";
-static char KEY_AVERAGE[] = "average";
-static char KEY_WORTHLESS[] = "worthless";
-static char KEY_RARE[] = "rare";
-static char KEY_COMMON[] = "common";
-static char KEY_BOOSTED[] = "dice boosted";
-static char KEY_MORE_THAN[] = "more than";
-static char KEY_DICE[] = " dice";
-static char KEY_MORE_BONUS[] = "more bonus than";
-static char KEY_MORE_BONUS2[] = "";
-static char KEY_WANTED[] = "wanted";
-static char KEY_UNIQUE[] = "unique monster's";
-static char KEY_HUMAN[] = "human";
-static char KEY_UNREADABLE[] = "unreadable";
-static char KEY_REALM1[] = "first realm's";
-static char KEY_REALM2[] = "second realm's";
-static char KEY_FIRST[] = "first";
-static char KEY_SECOND[] = "second";
-static char KEY_THIRD[] = "third";
-static char KEY_FOURTH[] = "fourth";
-static char KEY_ITEMS[] = "items";
-static char KEY_WEAPONS[] = "weapons";
-static char KEY_FAVORITE_WEAPONS[] = "favorite weapons";
-static char KEY_ARMORS[] = "armors";
-static char KEY_MISSILES[] = "missiles";
-static char KEY_DEVICES[] = "magical devices";
-static char KEY_LIGHTS[] = "lights";
-static char KEY_JUNKS[] = "junks";
-static char KEY_CORPSES[] = "corpses or skeletons";
-static char KEY_SPELLBOOKS[] = "spellbooks";
-static char KEY_HAFTED[] = "hafted weapons";
-static char KEY_SHIELDS[] = "shields";
-static char KEY_BOWS[] = "bows";
-static char KEY_RINGS[] = "rings";
-static char KEY_AMULETS[] = "amulets";
-static char KEY_SUITS[] = "suits";
-static char KEY_CLOAKS[] = "cloaks";
-static char KEY_HELMS[] = "helms";
-static char KEY_GLOVES[] = "gloves";
-static char KEY_BOOTS[] = "boots";
+static GAME_TEXT KEY_ALL[] = "all";
+static GAME_TEXT KEY_UNAWARE[] = "unaware";
+static GAME_TEXT KEY_UNIDENTIFIED[] = "unidentified";
+static GAME_TEXT KEY_IDENTIFIED[] = "identified";
+static GAME_TEXT KEY_STAR_IDENTIFIED[] = "*identified*";
+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_AVERAGE[] = "average";
+static GAME_TEXT KEY_WORTHLESS[] = "worthless";
+static GAME_TEXT KEY_RARE[] = "rare";
+static GAME_TEXT KEY_COMMON[] = "common";
+static GAME_TEXT KEY_BOOSTED[] = "dice boosted";
+static GAME_TEXT KEY_MORE_THAN[] = "more than";
+static GAME_TEXT KEY_DICE[] = " dice";
+static GAME_TEXT KEY_MORE_BONUS[] = "more bonus than";
+static GAME_TEXT KEY_MORE_BONUS2[] = "";
+static GAME_TEXT KEY_WANTED[] = "wanted";
+static GAME_TEXT KEY_UNIQUE[] = "unique monster's";
+static GAME_TEXT KEY_HUMAN[] = "human";
+static GAME_TEXT KEY_UNREADABLE[] = "unreadable";
+static GAME_TEXT KEY_REALM1[] = "first realm's";
+static GAME_TEXT KEY_REALM2[] = "second realm's";
+static GAME_TEXT KEY_FIRST[] = "first";
+static GAME_TEXT KEY_SECOND[] = "second";
+static GAME_TEXT KEY_THIRD[] = "third";
+static GAME_TEXT KEY_FOURTH[] = "fourth";
+static GAME_TEXT KEY_ITEMS[] = "items";
+static GAME_TEXT KEY_WEAPONS[] = "weapons";
+static GAME_TEXT KEY_FAVORITE_WEAPONS[] = "favorite weapons";
+static GAME_TEXT KEY_ARMORS[] = "armors";
+static GAME_TEXT KEY_MISSILES[] = "missiles";
+static GAME_TEXT KEY_DEVICES[] = "magical devices";
+static GAME_TEXT KEY_LIGHTS[] = "lights";
+static GAME_TEXT KEY_JUNKS[] = "junks";
+static GAME_TEXT KEY_CORPSES[] = "corpses or skeletons";
+static GAME_TEXT KEY_SPELLBOOKS[] = "spellbooks";
+static GAME_TEXT KEY_HAFTED[] = "hafted weapons";
+static GAME_TEXT KEY_SHIELDS[] = "shields";
+static GAME_TEXT KEY_BOWS[] = "bows";
+static GAME_TEXT KEY_RINGS[] = "rings";
+static GAME_TEXT KEY_AMULETS[] = "amulets";
+static GAME_TEXT KEY_SUITS[] = "suits";
+static GAME_TEXT KEY_CLOAKS[] = "cloaks";
+static GAME_TEXT KEY_HELMS[] = "helms";
+static GAME_TEXT KEY_GLOVES[] = "gloves";
+static GAME_TEXT KEY_BOOTS[] = "boots";
#endif /* JP */
#define IS_FLG(FLG) (entry->flag[FLG / 32] & (1L << (FLG % 32)))
#ifdef JP
- static char kanji_colon[] = "¡§";
+ static char kanji_colon[] = "：";
#endif
/*
* A function to create new entry
*/
-static bool autopick_new_entry(autopick_type *entry, cptr str, bool allow_default)
+static bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default)
{
- cptr insc;
+ concptr insc;
int i;
byte act = 0;
char buf[MAX_LINELEN];
- cptr prev_ptr, ptr, old_ptr;
+ concptr prev_ptr, ptr, old_ptr;
int prev_flg;
- if (str[1] == ':') switch (str[0])
+ if (str[0] && str[1] == ':') switch (str[0])
{
case '?': case '%':
case 'A': case 'P': case 'C':
entry->flag[0] = entry->flag[1] = 0L;
entry->dice = 0;
+ entry->bonus = 0;
act = DO_AUTOPICK | DO_DISPLAY;
while (TRUE)
break;
}
- if (isupper(c)) c = tolower(c);
+ if (isupper(c)) c = (char)tolower(c);
buf[i] = c;
}
bool name = TRUE;
#ifdef JP
- /* ¥¨¥´Ì䬼ÙË⤫¤â¤·¤ì¤Ê¤¤¤Î¤Ç¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¡Ö^¡×¤ÏÉÕ¤±¤Ê¤¤ */
+ /* エゴ銘が邪魔かもしれないので、デフォルトで「^」は付けない */
bool bol_mark = FALSE;
#else
/* We can always use the ^ mark in English */
bool bol_mark = TRUE;
#endif
- char name_str[MAX_NLEN];
+ GAME_TEXT name_str[MAX_NLEN];
/* Initialize name string */
name_str[0] = '\0';
{
/* Ego objects */
if (object_is_ego(o_ptr))
-
{
if (object_is_weapon_armour_ammo(o_ptr))
{
*/
ego_item_type *e_ptr = &e_info[o_ptr->name2];
#ifdef JP
- /* ¥¨¥´ÌäˤϡÖ^¡×¥Þ¡¼¥¯¤¬»È¤¨¤ë */
+ /* エゴ銘には「^」マークが使える */
sprintf(name_str, "^%s", e_name + e_ptr->name);
#else
/* We ommit the basename and cannot use the ^ mark */
/* Don't use the object description */
name = FALSE;
- if (object_is_weapon_armour_ammo(o_ptr))
- {
- /* Restrict to 'common' equipments */
- if (!object_is_rare(o_ptr)) ADD_FLG(FLG_COMMON);
- }
+ /* Restrict to 'common' equipments */
+ if (!object_is_rare(o_ptr)) ADD_FLG(FLG_COMMON);
}
ADD_FLG(FLG_EGO);
/* Prepare the object description */
if (name)
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL | OD_NAME_ONLY));
{
string_free(entry->name);
string_free(entry->insc);
+ entry->name = NULL;
+ entry->insc = NULL;
}
/*
* Get file name for autopick preference
*/
-static cptr pickpref_filename(int filename_mode)
+static concptr pickpref_filename(int filename_mode)
{
-#ifdef JP
- static const char namebase[] = "picktype";
-#else
- static const char namebase[] = "pickpref";
-#endif
+ static const char namebase[] = _("picktype", "pickpref");
switch (filename_mode)
{
*/
void autopick_load_pref(bool disp_mes)
{
- char buf[80];
+ GAME_TEXT buf[80];
errr err;
/* Free old entries */
if (err == 0 && disp_mes)
{
/* Success */
-#ifdef JP
- msg_format("%s¤òÆɤ߹þ¤ß¤Þ¤·¤¿¡£", buf);
-#else
- msg_format("Loaded '%s'.", buf);
-#endif
+ msg_format(_("%sを読み込みました。", "Loaded '%s'."), buf);
}
/* No file found */
if (err == 0 && disp_mes)
{
/* Success */
-#ifdef JP
- msg_format("%s¤òÆɤ߹þ¤ß¤Þ¤·¤¿¡£", buf);
-#else
- msg_format("Loaded '%s'.", buf);
-#endif
+ msg_format(_("%sを読み込みました。", "Loaded '%s'."), buf);
}
}
if (err && disp_mes)
{
/* Failed */
-#ifdef JP
- msg_print("¼«Æ°½¦¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£");
-#else
- msg_print("Failed to reload autopick preference.");
-#endif
+ msg_print(_("自動拾い設定ファイルの読み込みに失敗しました。", "Failed to reload autopick preference."));
}
}
C_MAKE(autopick_list, max_max_autopick, autopick_type);
/* Copy from old list to new list */
- C_COPY(autopick_list, old_autopick_list, old_max_max_autopick, autopick_type);
+ (void)C_COPY(autopick_list, old_autopick_list, old_max_max_autopick, autopick_type);
/* Kill old list */
- C_FREE(old_autopick_list, old_max_max_autopick, autopick_type);
+ C_KILL(old_autopick_list, old_max_max_autopick, autopick_type);
}
/* Add one line */
continue;
}
#endif
- if (isspace(buf[i]) && buf[i] != ' ')
+ if (iswspace(buf[i]) && buf[i] != ' ')
break;
}
buf[i] = 0;
&& entry->flag[0] == autopick_list[i].flag[0]
&& entry->flag[1] == autopick_list[i].flag[1]
&& entry->dice == autopick_list[i].dice
- && entry->bonus == autopick_list[i].bonus) return 0;
+ && entry->bonus == autopick_list[i].bonus)
+ {
+ autopick_free_entry(entry);
+ return 0;
+ }
add_autopick_list(entry);
return 0;
/*
* Reconstruct preference line from entry
*/
-cptr autopick_line_from_entry(autopick_type *entry)
+concptr autopick_line_from_entry(autopick_type *entry)
{
char buf[MAX_LINELEN];
char *ptr;
/*
* Reconstruct preference line from entry and kill entry
*/
-static cptr autopick_line_from_entry_kill(autopick_type *entry)
+static concptr autopick_line_from_entry_kill(autopick_type *entry)
{
- cptr ptr = autopick_line_from_entry(entry);
+ concptr ptr = autopick_line_from_entry(entry);
/* Free memory for original entry */
autopick_free_entry(entry);
* A function for Auto-picker/destroyer
* Examine whether the object matches to the entry
*/
-static bool is_autopick_aux(object_type *o_ptr, autopick_type *entry, cptr o_name)
+static bool is_autopick_aux(object_type *o_ptr, autopick_type *entry, concptr o_name)
{
int j;
- cptr ptr = entry->name;
+ concptr ptr = entry->name;
/*** Unaware items ***/
if (IS_FLG(FLG_UNAWARE) && object_is_aware(o_ptr))
/* Require boosted dice */
if ((o_ptr->dd == k_ptr->dd) && (o_ptr->ds == k_ptr->ds))
return FALSE;
+
+ /* In Vault Quest, Dice must be hide.*/
+ if(!object_is_known(o_ptr) && object_is_quest_target(o_ptr))
+ {
+ return FALSE;
+ }
}
/*** Weapons which dd*ds is more than nn ***/
int is_autopick(object_type *o_ptr)
{
int i;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
if (o_ptr->tval == TV_GOLD) return -1;
/* Now decided to destroy */
- disturb(0,0);
+ disturb(FALSE, FALSE);
/* Artifact? */
if (!can_player_destroy_object(o_ptr))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
object_desc(o_name, o_ptr, 0);
- /* Message */
-#ifdef JP
- msg_format("%s¤ÏÇ˲õÉÔǽ¤À¡£", o_name);
-#else
- msg_format("You cannot auto-destroy %s.", o_name);
-#endif
+ msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name);
- /* Done */
return;
}
/* Record name of destroyed item */
- COPY(&autopick_last_destroyed_object, o_ptr, object_type);
+ (void)COPY(&autopick_last_destroyed_object, o_ptr, object_type);
/* Destroy Later */
o_ptr->marked |= OM_AUTODESTROY;
- p_ptr->notice |= PN_AUTODESTROY;
+ p_ptr->update |= PU_AUTODESTROY;
return;
}
/*
* Auto-destroy marked item
*/
-static void autopick_delayed_alter_aux(int item)
+static void autopick_delayed_alter_aux(INVENTORY_IDX item)
{
object_type *o_ptr;
if (o_ptr->k_idx && (o_ptr->marked & OM_AUTODESTROY))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
object_desc(o_name, o_ptr, 0);
delete_object_idx(0 - item);
}
- /* Print a message */
-#ifdef JP
- msg_format("%s¤ò¼«Æ°Ç˲õ¤·¤Þ¤¹¡£", o_name);
-#else
- msg_format("Auto-destroying %s.", o_name);
-#endif
+ msg_format(_("%sを自動破壊します。", "Auto-destroying %s."), o_name);
}
}
*/
void autopick_delayed_alter(void)
{
- int item;
+ INVENTORY_IDX item;
/*
* Scan inventry in reverse order to prevent
autopick_delayed_alter_aux(item);
/* Scan the pile of objects */
- item = cave[py][px].o_idx;
+ item = current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].o_idx;
while (item)
{
- int next = o_list[item].next_o_idx;
+ OBJECT_IDX next = o_list[item].next_o_idx;
autopick_delayed_alter_aux(-item);
item = next;
}
* Auto-destroyer works only on inventory or on floor stack only when
* requested.
*/
-void autopick_alter_item(int item, bool destroy)
+void autopick_alter_item(INVENTORY_IDX item, bool destroy)
{
object_type *o_ptr;
int idx;
/*
* Automatically pickup/destroy items in this grid.
*/
-void autopick_pickup_items(cave_type *c_ptr)
+void autopick_pickup_items(grid_type *g_ptr)
{
- s16b this_o_idx, next_o_idx = 0;
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
/* Scan the pile of objects */
- for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
+ for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
int idx;
-
- /* Acquire object */
- object_type *o_ptr = &o_list[this_o_idx];
+ object_type *o_ptr = &o_list[this_o_idx];
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
if (idx >= 0 &&
(autopick_list[idx].action & (DO_AUTOPICK | DO_QUERY_AUTOPICK)))
{
- disturb(0,0);
+ disturb(FALSE, FALSE);
if (!inven_carry_okay(o_ptr))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
- /* Message */
-#ifdef JP
- msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
-#else
- msg_format("You have no room for %s.", o_name);
-#endif
+ msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name);
/* Hack - remember that the item has given a message here. */
o_ptr->marked |= OM_NOMSG;
else if (autopick_list[idx].action & DO_QUERY_AUTOPICK)
{
char out_val[MAX_NLEN+20];
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
if (o_ptr->marked & OM_NO_QUERY)
{
continue;
}
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
-#ifdef JP
- sprintf(out_val, "%s¤ò½¦¤¤¤Þ¤¹¤«? ", o_name);
-#else
- sprintf(out_val, "Pick up %s? ", o_name);
-#endif
+ sprintf(out_val, _("%sを拾いますか? ", "Pick up %s? "), o_name);
if (!get_check(out_val))
{
{
/* Close the preference file */
fclose(pref_fff);
-
-#ifdef JP
- msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£", tmp_file);
-#else
- msg_format("Failed to create temporary file %s.", tmp_file);
-#endif
+ msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), tmp_file);
msg_print(NULL);
return FALSE;
}
if (num)
{
-#ifdef JP
- msg_format("°ÊÁ°¤Î¥¥ã¥é¥¯¥¿¡¼ÍѤμ«Æ°ÀßÄê(%d¹Ô)¤¬»Ä¤Ã¤Æ¤¤¤Þ¤¹¡£", num);
- strcpy(buf, "¸Å¤¤ÀßÄê¹Ô¤Ïºï½ü¤·¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡©");
-#else
- msg_format("Auto registered lines (%d lines) for previous character are remaining.", num);
- strcpy(buf, "These lines will be deleted. Are you sure? ");
-#endif
+ msg_format(_("以前のキャラクター用の自動設定(%d行)が残っています。",
+ "Auto registered lines (%d lines) for previous character are remaining."), num);
+ strcpy(buf, _("古い設定行は削除します。よろしいですか？", "These lines will be deleted. Are you sure? "));
/* You can cancel it */
if (!get_check(buf))
okay = FALSE;
autoregister = FALSE;
-#ifdef JP
- msg_print("¥¨¥Ç¥£¥¿¤Î¥«¥Ã¥È&¥Ú¡¼¥¹¥ÈÅù¤ò»È¤Ã¤ÆɬÍפʹԤòÈòÆñ¤·¤Æ¤¯¤À¤µ¤¤¡£");
-#else
- msg_print("Use cut & paste of auto picker editor (_) to keep old prefs.");
-#endif
+ msg_print(_("エディタのカット&ペースト等を使って必要な行を避難してください。",
+ "Use cut & paste of auto picker editor (_) to keep old prefs."));
}
}
/* Already registered */
if (match_autopick != -1)
{
- cptr what;
+ concptr what;
byte act = autopick_list[match_autopick].action;
-#ifdef JP
- if (act & DO_AUTOPICK) what = "¼«Æ°¤Ç½¦¤¦";
- else if (act & DO_AUTODESTROY) what = "¼«Æ°Ç˲õ¤¹¤ë";
- else if (act & DONT_AUTOPICK) what = "ÊüÃÖ¤¹¤ë";
- else /* if (act & DO_QUERY_AUTOPICK) */ what = "³Îǧ¤·¤Æ½¦¤¦";
+ if (act & DO_AUTOPICK) what = _("自動で拾う", "auto-pickup");
+ else if (act & DO_AUTODESTROY) what = _("自動破壊する", "auto-destroy");
+ else if (act & DONT_AUTOPICK) what = _("放置する", "leave on floor");
+ else /* if (act & DO_QUERY_AUTOPICK) */ what = _("確認して拾う", "query auto-pickup");
- msg_format("¤½¤Î¥¢¥¤¥Æ¥à¤Ï´û¤Ë%s¤è¤¦¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£", what);
-#else
- if (act & DO_AUTOPICK) what = "auto-pickup";
- else if (act & DO_AUTODESTROY) what = "auto-destroy";
- else if (act & DONT_AUTOPICK) what = "leave on floor";
- else /* if (act & DO_QUERY_AUTOPICK) */ what = "query auto-pickup";
-
- msg_format("The object is already registered to %s.", what);
-#endif
-
+ msg_format(_("そのアイテムは既に%sように設定されています。", "The object is already registered to %s."), what);
return FALSE;
}
((o_ptr->ident & IDENT_SENSE) &&
(o_ptr->feeling == FEEL_TERRIBLE || o_ptr->feeling == FEEL_SPECIAL)))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
object_desc(o_name, o_ptr, 0);
- /* Message */
-#ifdef JP
- msg_format("%s¤ÏÇ˲õÉÔǽ¤À¡£", o_name);
-#else
- msg_format("You cannot auto-destroy %s.", o_name);
-#endif
+ msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name);
- /* Done */
return FALSE;
}
/* Failure */
if (!pref_fff) {
-#ifdef JP
- msg_format("%s ¤ò³«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£", pref_file);
-#else
- msg_format("Failed to open %s.", pref_file);
-#endif
+ msg_format(_("%s を開くことができませんでした。", "Failed to open %s."), pref_file);
msg_print(NULL);
/* Failed */
/* Add the header */
fprintf(pref_fff, "%s\n", autoregister_header);
-#ifdef JP
- fprintf(pref_fff, "%s\n", "# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°ÅÐÏ¿¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£");
- fprintf(pref_fff, "%s\n", "# ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢É¬ÍפʹԤϾå¤ÎÊý¤Ø°ÜÆ°¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£");
-#else
- fprintf(pref_fff, "%s\n", "# *Waring!* The lines below will be deleated later.");
- fprintf(pref_fff, "%s\n", "# Keep it by cut & paste if you need these lines for future characters.");
-#endif
+ fprintf(pref_fff, "%s\n", _("# *警告!!* 以降の行は自動登録されたものです。",
+ "# *Waring!* The lines below will be deleated later."));
+ fprintf(pref_fff, "%s\n", _("# 後で自動的に削除されますので、必要な行は上の方へ移動しておいてください。",
+ "# Keep it by cut & paste if you need these lines for future characters."));
/* Now auto register is in-use */
p_ptr->autopick_autoregister = TRUE;
/* Add a line to the file */
/* Don't kill "entry" */
fprintf(pref_fff, "%s\n", autopick_line_from_entry(entry));
-
- /* Close the file */
fclose(pref_fff);
return TRUE;
byte mark;
object_type *search_o_ptr;
- cptr search_str;
- cptr last_destroyed;
+ concptr search_str;
+ concptr last_destroyed;
chain_str_type *yank;
bool yank_eol;
- cptr *lines_list;
+ concptr *lines_list;
byte states[MAX_LINES];
u16b dirty_flags;
*/
static void describe_autopick(char *buff, autopick_type *entry)
{
- cptr str = entry->name;
+ concptr str = entry->name;
byte act = entry->action;
- cptr insc = entry->insc;
+ concptr insc = entry->insc;
int i;
bool top = FALSE;
#ifdef JP
- cptr before_str[100], body_str;
+ concptr before_str[100], body_str;
int before_n = 0;
- body_str = "¥¢¥¤¥Æ¥à";
+ body_str = "アイテム";
/*** Collecting items ***/
/*** Which can be absorbed into a slot as a bundle ***/
if (IS_FLG(FLG_COLLECTING))
- before_str[before_n++] = "¼ý½¸Ãæ¤Ç´û¤Ë»ý¤Ã¤Æ¤¤¤ë¥¹¥í¥Ã¥È¤Ë¤Þ¤È¤á¤é¤ì¤ë";
+ before_str[before_n++] = "収集中で既に持っているスロットにまとめられる";
/*** Unaware items ***/
if (IS_FLG(FLG_UNAWARE))
- before_str[before_n++] = "̤´ÕÄê¤Ç¤½¤Î¸ú²Ì¤âȽÌÀ¤·¤Æ¤¤¤Ê¤¤";
+ before_str[before_n++] = "未鑑定でその効果も判明していない";
/*** Unidentified ***/
if (IS_FLG(FLG_UNIDENTIFIED))
- before_str[before_n++] = "̤´ÕÄê¤Î";
+ before_str[before_n++] = "未鑑定の";
/*** Identified ***/
if (IS_FLG(FLG_IDENTIFIED))
- before_str[before_n++] = "´ÕÄêºÑ¤ß¤Î";
+ before_str[before_n++] = "鑑定済みの";
/*** *Identified* ***/
if (IS_FLG(FLG_STAR_IDENTIFIED))
- before_str[before_n++] = "´°Á´¤Ë´ÕÄêºÑ¤ß¤Î";
+ before_str[before_n++] = "完全に鑑定済みの";
/*** Dice boosted (weapon of slaying) ***/
if (IS_FLG(FLG_BOOSTED))
{
- before_str[before_n++] = "¥À¥á¡¼¥¸¥À¥¤¥¹¤¬Ä̾ï¤è¤êÂ礤¤";
- body_str = "Éð´ï";
+ before_str[before_n++] = "ダメージダイスが通常より大きい";
+ body_str = "武器";
}
/*** Weapons whose dd*ds is more than nn ***/
if (IS_FLG(FLG_MORE_DICE))
{
static char more_than_desc_str[] = "___";
- before_str[before_n++] = "¥À¥á¡¼¥¸¥À¥¤¥¹¤ÎºÇÂçÃͤ¬";
- body_str = "Éð´ï";
+ before_str[before_n++] = "ダメージダイスの最大値が";
+ body_str = "武器";
sprintf(more_than_desc_str,"%d", entry->dice);
before_str[before_n++] = more_than_desc_str;
- before_str[before_n++] = "°Ê¾å¤Î";
+ before_str[before_n++] = "以上の";
}
/*** Items whose magical bonus is more than nn ***/
if (IS_FLG(FLG_MORE_BONUS))
{
static char more_bonus_desc_str[] = "___";
- before_str[before_n++] = "½¤ÀµÃͤ¬(+";
+ before_str[before_n++] = "修正値が(+";
sprintf(more_bonus_desc_str,"%d", entry->bonus);
before_str[before_n++] = more_bonus_desc_str;
- before_str[before_n++] = ")°Ê¾å¤Î";
+ before_str[before_n++] = ")以上の";
}
/*** Worthless items ***/
if (IS_FLG(FLG_WORTHLESS))
- before_str[before_n++] = "Ź¤Ç̵²ÁÃͤÈȽÄꤵ¤ì¤ë";
+ before_str[before_n++] = "店で無価値と判定される";
/*** Artifact ***/
if (IS_FLG(FLG_ARTIFACT))
{
- before_str[before_n++] = "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "アーティファクトの";
+ body_str = "装備";
}
/*** Ego ***/
if (IS_FLG(FLG_EGO))
{
- before_str[before_n++] = "¥¨¥´¥¢¥¤¥Æ¥à¤Î";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "エゴアイテムの";
+ body_str = "装備";
}
/*** Good ***/
if (IS_FLG(FLG_GOOD))
{
- before_str[before_n++] = "¾å¼Á¤Î";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "上質の";
+ body_str = "装備";
}
/*** Nameless ***/
if (IS_FLG(FLG_NAMELESS))
{
- before_str[before_n++] = "¥¨¥´¤Ç¤â¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ç¤â¤Ê¤¤";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "エゴでもアーティファクトでもない";
+ body_str = "装備";
}
/*** Average ***/
if (IS_FLG(FLG_AVERAGE))
{
- before_str[before_n++] = "ʤÎ";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "並の";
+ body_str = "装備";
}
/*** Rare equipments ***/
if (IS_FLG(FLG_RARE))
{
- before_str[before_n++] = "¥É¥é¥´¥óÁõÈ÷¤ä¥«¥ª¥¹¡¦¥Ö¥ì¡¼¥ÉÅù¤ò´Þ¤àÄÁ¤·¤¤";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "ドラゴン装備やカオス・ブレード等を含む珍しい";
+ body_str = "装備";
}
/*** Common equipments ***/
if (IS_FLG(FLG_COMMON))
{
- before_str[before_n++] = "¤¢¤ê¤Õ¤ì¤¿(¥É¥é¥´¥óÁõÈ÷¤ä¥«¥ª¥¹¡¦¥Ö¥ì¡¼¥ÉÅù¤ÎÄÁ¤·¤¤Êª¤Ç¤Ï¤Ê¤¤)";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "ありふれた(ドラゴン装備やカオス・ブレード等の珍しい物ではない)";
+ body_str = "装備";
}
/*** Wanted monster's corpse/skeletons ***/
if (IS_FLG(FLG_WANTED))
{
- before_str[before_n++] = "¥Ï¥ó¥¿¡¼»ö̳½ê¤Ç¾Þ¶â¼ó¤È¤µ¤ì¤Æ¤¤¤ë";
- body_str = "»àÂΤä¹ü";
+ before_str[before_n++] = "ハンター事務所で賞金首とされている";
+ body_str = "死体や骨";
}
/*** Human corpse/skeletons (for Daemon magic) ***/
if (IS_FLG(FLG_HUMAN))
{
- before_str[before_n++] = "°ËâËâË¡¤Ç»È¤¦¤¿¤á¤Î¿Í´Ö¤ä¥Ò¥å¡¼¥Þ¥Î¥¤¥É¤Î";
- body_str = "»àÂΤä¹ü";
+ before_str[before_n++] = "悪魔魔法で使うための人間やヒューマノイドの";
+ body_str = "死体や骨";
}
/*** Unique monster's corpse/skeletons/statues ***/
if (IS_FLG(FLG_UNIQUE))
{
- before_str[before_n++] = "¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤Î";
- body_str = "»àÂΤä¹ü";
+ before_str[before_n++] = "ユニークモンスターの";
+ body_str = "死体や骨";
}
/*** Unreadable spellbooks ***/
if (IS_FLG(FLG_UNREADABLE))
{
- before_str[before_n++] = "¤¢¤Ê¤¿¤¬Æɤá¤Ê¤¤Îΰè¤Î";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "あなたが読めない領域の";
+ body_str = "魔法書";
}
/*** First realm spellbooks ***/
if (IS_FLG(FLG_REALM1))
{
- before_str[before_n++] = "Âè°ìÎΰè¤Î";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "第一領域の";
+ body_str = "魔法書";
}
/*** Second realm spellbooks ***/
if (IS_FLG(FLG_REALM2))
{
- before_str[before_n++] = "ÂèÆóÎΰè¤Î";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "第二領域の";
+ body_str = "魔法書";
}
/*** First rank spellbooks ***/
if (IS_FLG(FLG_FIRST))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î1ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の1冊目の";
+ body_str = "魔法書";
}
/*** Second rank spellbooks ***/
if (IS_FLG(FLG_SECOND))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î2ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の2冊目の";
+ body_str = "魔法書";
}
/*** Third rank spellbooks ***/
if (IS_FLG(FLG_THIRD))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î3ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の3冊目の";
+ body_str = "魔法書";
}
/*** Fourth rank spellbooks ***/
if (IS_FLG(FLG_FOURTH))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î4ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の4冊目の";
+ body_str = "魔法書";
}
/*** Items ***/
if (IS_FLG(FLG_ITEMS))
; /* Nothing to do */
else if (IS_FLG(FLG_WEAPONS))
- body_str = "Éð´ï";
+ body_str = "武器";
else if (IS_FLG(FLG_FAVORITE_WEAPONS))
- body_str = "ÆÀ°ÕÉð´ï";
+ body_str = "得意武器";
else if (IS_FLG(FLG_ARMORS))
- body_str = "Ëɶñ";
+ body_str = "防具";
else if (IS_FLG(FLG_MISSILES))
- body_str = "ÃƤäÌð¤ä¥¯¥í¥¹¥Ü¥¦¤ÎÌð";
+ body_str = "弾や矢やクロスボウの矢";
else if (IS_FLG(FLG_DEVICES))
- body_str = "´¬Êª¤äËâË¡ËÀ¤ä¾ó¤ä¥í¥Ã¥É";
+ body_str = "巻物や魔法棒や杖やロッド";
else if (IS_FLG(FLG_LIGHTS))
- body_str = "¸÷¸»ÍѤΥ¢¥¤¥Æ¥à";
+ body_str = "光源用のアイテム";
else if (IS_FLG(FLG_JUNKS))
- body_str = "Àޤ줿ËÀÅù¤Î¥¬¥é¥¯¥¿";
+ body_str = "æ\8a\98ã\82\8cã\81\9fæ£\92ç\89ã\81®ã\82¬ã\83©ã\82¯ã\82¿";
else if (IS_FLG(FLG_CORPSES))
- body_str = "»àÂΤä¹ü";
+ body_str = "死体や骨";
else if (IS_FLG(FLG_SPELLBOOKS))
- body_str = "ËâË¡½ñ";
+ body_str = "魔法書";
else if (IS_FLG(FLG_HAFTED))
- body_str = "Æß´ï";
+ body_str = "鈍器";
else if (IS_FLG(FLG_SHIELDS))
- body_str = "½â";
+ body_str = "盾";
else if (IS_FLG(FLG_BOWS))
- body_str = "¥¹¥ê¥ó¥°¤äµÝ¤ä¥¯¥í¥¹¥Ü¥¦";
+ body_str = "ã\82¹ã\83ªã\83³ã\82°ã\82\84å¼\93ã\82\84ã\82¯ã\83ã\82¹ã\83\9cã\82¦";
else if (IS_FLG(FLG_RINGS))
- body_str = "»ØÎØ";
+ body_str = "指輪";
else if (IS_FLG(FLG_AMULETS))
- body_str = "¥¢¥ß¥å¥ì¥Ã¥È";
+ body_str = "アミュレット";
else if (IS_FLG(FLG_SUITS))
- body_str = "³»";
+ body_str = "鎧";
else if (IS_FLG(FLG_CLOAKS))
- body_str = "¥¯¥í¡¼¥¯";
+ body_str = "ã\82¯ã\83ã\83¼ã\82¯";
else if (IS_FLG(FLG_HELMS))
- body_str = "¥Ø¥ë¥á¥Ã¥È¤ä´§";
+ body_str = "ヘルメットや冠";
else if (IS_FLG(FLG_GLOVES))
- body_str = "äƼê";
+ body_str = "籠手";
else if (IS_FLG(FLG_BOOTS))
- body_str = "¥Ö¡¼¥Ä";
+ body_str = "ブーツ";
*buff = '\0';
if (!before_n)
- strcat(buff, "Á´¤Æ¤Î");
+ strcat(buff, "全ての");
else for (i = 0; i < before_n && before_str[i]; i++)
strcat(buff, before_str[i]);
top = TRUE;
}
- strcat(buff, "¤Ç¡¢Ì¾Á°¤¬¡Ö");
+ strcat(buff, "で、名前が「");
strncat(buff, str, 80);
if (top)
- strcat(buff, "¡×¤Ç»Ï¤Þ¤ë¤â¤Î");
+ strcat(buff, "」で始まるもの");
else
- strcat(buff, "¡×¤ò´Þ¤à¤â¤Î");
+ strcat(buff, "」を含むもの");
}
if (insc)
{
- strncat(buff, format("¤Ë¡Ö%s¡×", insc), 80);
+ strncat(buff, format("に「%s」", insc), 80);
if (my_strstr(insc, "%%all"))
- strcat(buff, "(%%all¤ÏÁ´Ç½ÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
+ strcat(buff, "(%%allは全能力を表す英字の記号で置換)");
else if (my_strstr(insc, "%all"))
- strcat(buff, "(%all¤ÏÁ´Ç½ÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
+ strcat(buff, "(%allは全能力を表す記号で置換)");
else if (my_strstr(insc, "%%"))
- strcat(buff, "(%%¤ÏÄɲÃǽÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
+ strcat(buff, "(%%は追加能力を表す英字の記号で置換)");
else if (my_strstr(insc, "%"))
- strcat(buff, "(%¤ÏÄɲÃǽÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
+ strcat(buff, "(%は追加能力を表す記号で置換)");
- strcat(buff, "¤È¹ï¤ó¤Ç");
+ strcat(buff, "と刻んで");
}
else
- strcat(buff, "¤ò");
+ strcat(buff, "を");
if (act & DONT_AUTOPICK)
- strcat(buff, "ÊüÃÖ¤¹¤ë¡£");
+ strcat(buff, "放置する。");
else if (act & DO_AUTODESTROY)
- strcat(buff, "Ç˲õ¤¹¤ë¡£");
+ strcat(buff, "破壊する。");
else if (act & DO_QUERY_AUTOPICK)
- strcat(buff, "³Îǧ¤Î¸å¤Ë½¦¤¦¡£");
+ strcat(buff, "確認の後に拾う。");
else
- strcat(buff, "½¦¤¦¡£");
+ strcat(buff, "拾う。");
if (act & DO_DISPLAY)
{
if (act & DONT_AUTOPICK)
- strcat(buff, "Á´ÂΥޥå×('M')¤Ç'N'¤ò²¡¤·¤¿¤È¤¤Ëɽ¼¨¤¹¤ë¡£");
+ strcat(buff, "全体マップ('M')で'N'を押したときに表示する。");
else if (act & DO_AUTODESTROY)
- strcat(buff, "Á´ÂΥޥå×('M')¤Ç'K'¤ò²¡¤·¤¿¤È¤¤Ëɽ¼¨¤¹¤ë¡£");
+ strcat(buff, "全体マップ('M')で'K'を押したときに表示する。");
else
- strcat(buff, "Á´ÂΥޥå×('M')¤Ç'M'¤ò²¡¤·¤¿¤È¤¤Ëɽ¼¨¤¹¤ë¡£");
+ strcat(buff, "全体マップ('M')で'M'を押したときに表示する。");
}
else
- strcat(buff, "Á´ÂΥޥåפˤÏɽ¼¨¤·¤Ê¤¤¡£");
+ strcat(buff, "全体マップには表示しない。");
#else /* JP */
- cptr before_str[20], after_str[20], which_str[20], whose_str[20], body_str;
+ concptr before_str[20], after_str[20], which_str[20], whose_str[20], body_str;
int before_n = 0, after_n = 0, which_n = 0, whose_n = 0;
body_str = "items";
/*
* Read whole lines of a file to memory
*/
-static cptr *read_text_lines(cptr filename)
+static concptr *read_text_lines(concptr filename)
{
- cptr *lines_list = NULL;
+ concptr *lines_list = NULL;
FILE *fff;
int lines = 0;
if (fff)
{
/* Allocate list of pointers */
- C_MAKE(lines_list, MAX_LINES, cptr);
+ C_MAKE(lines_list, MAX_LINES, concptr);
/* Parse it */
while (0 == my_fgets(fff, buf, sizeof(buf)))
*/
static void prepare_default_pickpref(void)
{
- static char *messages[] = {
-#ifdef JP
- "¤¢¤Ê¤¿¤Ï¡Ö¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¡×¤ò½é¤á¤Æµ¯Æ°¤·¤Þ¤·¤¿¡£",
- "¼«Æ°½¦¤¤¤Î¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤¬¤Þ¤À½ñ¤«¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢",
- "´ðËÜŪ¤Ê¼«Æ°½¦¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤òlib/pref/picktype.prf¤«¤é¥³¥Ô¡¼¤·¤Þ¤¹¡£",
- NULL
-#else
- "You have activated the Auto-Picker Editor for the first time.",
- "Since user pref file for autopick is not yet created,",
- "the default setting is loaded from lib/pref/pickpref.prf .",
+ const concptr messages[] = {
+ _("あなたは「自動拾いエディタ」を初めて起動しました。", "You have activated the Auto-Picker Editor for the first time."),
+ _("自動拾いのユーザー設定ファイルがまだ書かれていないので、", "Since user pref file for autopick is not yet created,"),
+ _("基本的な自動拾い設定ファイルをlib/pref/picktype.prfからコピーします。", "the default setting is loaded from lib/pref/pickpref.prf ."),
NULL
-#endif
};
char buf[1024];
FILE *pref_fp;
FILE *user_fp;
int i;
- cptr filename = pickpref_filename(PT_DEFAULT);
+ concptr filename = pickpref_filename(PT_DEFAULT);
/* Display messages */
for (i = 0; messages[i]; i++) msg_print(messages[i]);
* Read an autopick prefence file to memory
* Prepare default if no user file is found
*/
-static cptr *read_pickpref_text_lines(int *filename_mode_p)
+static concptr *read_pickpref_text_lines(int *filename_mode_p)
{
char buf[1024];
- cptr *lines_list;
+ concptr *lines_list;
/* Try a filename with player name */
*filename_mode_p = PT_WITH_PNAME;
if (!lines_list)
{
/* Allocate list of pointers */
- C_MAKE(lines_list, MAX_LINES, cptr);
+ C_MAKE(lines_list, MAX_LINES, concptr);
lines_list[0] = string_make("");
}
return lines_list;
/*
* Write whole lines of memory to a file.
*/
-static bool write_text_lines(cptr filename, cptr *lines_list)
+static bool write_text_lines(concptr filename, concptr *lines_list)
{
FILE *fff;
/*
* Free memory of lines_list.
*/
-static void free_text_lines(cptr *lines_list)
+static void free_text_lines(concptr *lines_list)
{
int lines;
string_free(lines_list[lines]);
/* free list of pointers */
- C_FREE((char **)lines_list, MAX_LINES, char *);
+ C_KILL(lines_list, MAX_LINES, concptr);
}
/*
* Delete or insert string
*/
-static void toggle_keyword(text_body_type *tb, int flg)
+static void toggle_keyword(text_body_type *tb, BIT_FLAGS flg)
{
int by1, by2, y;
bool add = TRUE;
/*
* Delete or insert string
*/
-static void add_keyword(text_body_type *tb, int flg)
+static void add_keyword(text_body_type *tb, BIT_FLAGS flg)
{
int by1, by2, y;
*/
static void check_expression_line(text_body_type *tb, int y)
{
- cptr s = tb->lines_list[y];
+ concptr s = tb->lines_list[y];
if ((s[0] == '?' && s[1] == ':') ||
(tb->states[y] & LSTAT_BYPASS))
/*
* Choose an item and get auto-picker entry from it.
*/
-static object_type *choose_object(cptr q, cptr s)
-{
- int item;
-
- if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR | USE_EQUIP))) return NULL;
-
- /* Get the item (in the pack) */
- if (item >= 0) return &inventory[item];
-
- /* Get the item (on the floor) */
- else return &o_list[0 - item];
-}
-
-
-/*
- * Choose an item and get auto-picker entry from it.
- */
static bool entry_from_choosed_object(autopick_type *entry)
{
object_type *o_ptr;
- cptr q, s;
+ concptr q, s;
- /* Get an item */
-#ifdef JP
- q = "¤É¤Î¥¢¥¤¥Æ¥à¤òÅÐÏ¿¤·¤Þ¤¹¤«? ";
- s = "¥¢¥¤¥Æ¥à¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£";
-#else
- q = "Enter which item? ";
- s = "You have nothing to enter.";
-#endif
- o_ptr = choose_object(q, s);
+ q = _("どのアイテムを登録しますか? ", "Enter which item? ");
+ s = _("アイテムを持っていない。", "You have nothing to enter.");
+ o_ptr = choose_object(NULL, q, s, USE_INVEN | USE_FLOOR | USE_EQUIP);
if (!o_ptr) return FALSE;
autopick_entry_from_object(entry, o_ptr);
/*
* Choose an item for search
*/
-static byte get_object_for_search(object_type **o_handle, cptr *search_strp)
+static byte get_object_for_search(object_type **o_handle, concptr *search_strp)
{
char buf[MAX_NLEN+20];
object_type *o_ptr;
- cptr q, s;
+ concptr q, s;
- /* Get an item */
-#ifdef JP
- q = "¤É¤Î¥¢¥¤¥Æ¥à¤ò¸¡º÷¤·¤Þ¤¹¤«? ";
- s = "¥¢¥¤¥Æ¥à¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£";
-#else
- q = "Enter which item? ";
- s = "You have nothing to enter.";
-#endif
- o_ptr = choose_object(q, s);
+ q = _("どのアイテムを検索しますか? ", "Enter which item? ");
+ s = _("アイテムを持っていない。", "You have nothing to enter.");
+ o_ptr = choose_object(NULL, q, s, USE_INVEN | USE_FLOOR | USE_EQUIP);
if (!o_ptr) return 0;
*o_handle = o_ptr;
/*
* Prepare for search by destroyed object
*/
-static byte get_destroyed_object_for_search(object_type **o_handle, cptr *search_strp)
+static byte get_destroyed_object_for_search(object_type **o_handle, concptr *search_strp)
{
char buf[MAX_NLEN+20];
/*
* Choose an item or string for search
*/
-static byte get_string_for_search(object_type **o_handle, cptr *search_strp)
+static byte get_string_for_search(object_type **o_handle, concptr *search_strp)
{
int pos = 0;
char buf[MAX_NLEN+20];
const int len = 80;
-#ifdef JP
- char prompt[] = "¸¡º÷(^I:»ý¤Áʪ ^L:Ç˲õ¤µ¤ì¤¿Êª): ";
-#else
- char prompt[] = "Search key(^I:inven ^L:destroyed): ";
-#endif
+ char prompt[] = _("検索(^I:持ち物 ^L:破壊された物): ", "Search key(^I:inven ^L:destroyed): ");
int col = sizeof(prompt) - 1;
/* Prepare string buffer for edit */
return (back ? -1 : 1);
case KTRL('i'):
- /* Get an item */
return get_object_for_search(o_handle, search_strp);
case KTRL('l'):
static void search_for_object(text_body_type *tb, object_type *o_ptr, bool forward)
{
autopick_type an_entry, *entry = &an_entry;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
int bypassed_cy = -1;
/* Start searching from current cursor position */
while (TRUE)
{
+ bool match;
+
/* End of list? */
if (forward)
{
if (!autopick_new_entry(entry, tb->lines_list[i], FALSE)) continue;
/* Does this line match to the object? */
- if (!is_autopick_aux(o_ptr, entry, o_name)) continue;
-
+ match = is_autopick_aux(o_ptr, entry, o_name);
+ autopick_free_entry(entry);
+ if (!match) continue;
/* Found a line but it's inactive */
if (tb->states[i] & LSTAT_BYPASS)
/*
* Search next line matches to the string
*/
-static void search_for_string(text_body_type *tb, cptr search_str, bool forward)
+static void search_for_string(text_body_type *tb, concptr search_str, bool forward)
{
int bypassed_cy = -1;
int bypassed_cx = 0;
while (TRUE)
{
- cptr pos;
+ concptr pos;
/* End of list? */
if (forward)
/*
* Editor command id's
*/
-#define EC_QUIT 1
-#define EC_SAVEQUIT 2
-#define EC_REVERT 3
-#define EC_HELP 4
-#define EC_RETURN 5
+#define EC_QUIT 1
+#define EC_SAVEQUIT 2
+#define EC_REVERT 3
+#define EC_HELP 4
+#define EC_RETURN 5
#define EC_LEFT 6
#define EC_DOWN 7
#define EC_UP 8
/* Manu names */
#ifdef JP
-static char MN_QUIT[] = "¥»¡¼¥Ö̵¤·¤Ç½ªÎ»";
-static char MN_SAVEQUIT[] = "¥»¡¼¥Ö¤·¤Æ½ªÎ»";
-static char MN_REVERT[] = "Á´¤Æ¤ÎÊѹ¹¤òÇË´þ";
-static char MN_HELP[] = "¥Ø¥ë¥×";
-
-static char MN_MOVE[] = "¥«¡¼¥½¥ë°ÜÆ°";
-static char MN_LEFT[] = "º¸ (¢«Ìð°õ¥¡¼)";
-static char MN_DOWN[] = "²¼ (¢Ìð°õ¥¡¼)";
-static char MN_UP[] = "¾å (¢¬Ìð°õ¥¡¼)";
-static char MN_RIGHT[] = "±¦ (¢ªÌð°õ¥¡¼)";
-static char MN_BOL[] = "¹Ô¤ÎÀèƬ";
-static char MN_EOL[] = "¹Ô¤Î½ªÃ¼";
-static char MN_PGUP[] = "¾å¤Î¥Ú¡¼¥¸ (PageUp¥¡¼)";
-static char MN_PGDOWN[] = "²¼¤Î¥Ú¡¼¥¸ (PageDown¥¡¼)";
-static char MN_TOP[] = "1¹ÔÌܤذÜÆ° (Home¥¡¼)";
-static char MN_BOTTOM[] = "ºÇ²¼¹Ô¤Ø°ÜÆ°(End¥¡¼)";
-
-static char MN_EDIT[] = "ÊÔ½¸";
-static char MN_CUT[] = "¥«¥Ã¥È";
-static char MN_COPY[] = "¥³¥Ô¡¼";
-static char MN_PASTE[] = "¥Ú¡¼¥¹¥È";
-static char MN_BLOCK[] = "ÁªÂòÈϰϤλØÄê";
-static char MN_KILL_LINE[] = "¹Ô¤Î»Ä¤ê¤òºï½ü";
-static char MN_DELETE_CHAR[] = "1ʸ»úºï½ü";
-static char MN_BACKSPACE[] = "¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹";
-static char MN_RETURN[] = "²þ¹Ô";
-
-static char MN_SEARCH[] = "¸¡º÷";
-static char MN_SEARCH_STR[] = "ʸ»úÎó¤Ç¸¡º÷";
-static char MN_SEARCH_FORW[] = "Á°Êý¤ØºÆ¸¡º÷";
-static char MN_SEARCH_BACK[] = "¸åÊý¤ØºÆ¸¡º÷";
-static char MN_SEARCH_OBJ[] = "¥¢¥¤¥Æ¥à¤òÁªÂò¤·¤Æ¸¡º÷";
-static char MN_SEARCH_DESTROYED[] = "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ç¸¡º÷";
-
-static char MN_INSERT[] = "¿§¡¹ÁÞÆþ";
-static char MN_INSERT_OBJECT[] = "ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ";
-static char MN_INSERT_DESTROYED[] = "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ";
-static char MN_INSERT_BLOCK[] = "¾ò·ïʬ´ô¥Ö¥í¥Ã¥¯¤ÎÎã¤òÁÞÆþ";
-static char MN_INSERT_MACRO[] = "¥Þ¥¯¥íÄêµÁ¤òÁÞÆþ";
-static char MN_INSERT_KEYMAP[] = "¥¡¼¥Þ¥Ã¥×ÄêµÁ¤òÁÞÆþ";
-
-static char MN_COMMAND_LETTER[] = "½¦¤¤/Ç˲õ/ÊüÃÖ¤ÎÁªÂò";
-static char MN_CL_AUTOPICK[] = "¡Ö ¡× (¼«Æ°½¦¤¤)";
-static char MN_CL_DESTROY[] = "¡Ö!¡× (¼«Æ°Ç˲õ)";
-static char MN_CL_LEAVE[] = "¡Ö~¡× (ÊüÃÖ)";
-static char MN_CL_QUERY[] = "¡Ö;¡× (³Îǧ¤·¤Æ½¦¤¦)";
-static char MN_CL_NO_DISP[] = "¡Ö(¡× (¥Þ¥Ã¥×¥³¥Þ¥ó¥É¤Çɽ¼¨¤·¤Ê¤¤)";
-
-static char MN_ADJECTIVE_GEN[] = "·ÁÍÆ»ì(°ìÈÌ)¤ÎÁªÂò";
-static char MN_RARE[] = "¥ì¥¢¤Ê (ÁõÈ÷)";
-static char MN_COMMON[] = "¤¢¤ê¤Õ¤ì¤¿ (ÁõÈ÷)";
-
-static char MN_ADJECTIVE_SPECIAL[] = "·ÁÍÆ»ì(Æüì)¤ÎÁªÂò";
-static char MN_BOOSTED[] = "¥À¥¤¥¹Ìܤΰ㤦 (Éð´ï)";
-static char MN_MORE_DICE[] = "¥À¥¤¥¹ÌÜ # °Ê¾å¤Î (Éð´ï)";
-static char MN_MORE_BONUS[] = "½¤ÀµÃÍ # °Ê¾å¤Î (»ØÎØÅù)";
-static char MN_WANTED[] = "¾Þ¶â¼ó¤Î (»àÂÎ)";
-static char MN_UNIQUE[] = "¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î (»àÂÎ)";
-static char MN_HUMAN[] = "¿Í´Ö¤Î (»àÂÎ)";
-static char MN_UNREADABLE[] = "Æɤá¤Ê¤¤ (ËâË¡½ñ)";
-static char MN_REALM1[] = "Âè°ìÎΰè¤Î (ËâË¡½ñ)";
-static char MN_REALM2[] = "ÂèÆóÎΰè¤Î (ËâË¡½ñ)";
-static char MN_FIRST[] = "1ºýÌܤΠ(ËâË¡½ñ)";
-static char MN_SECOND[] = "2ºýÌܤΠ(ËâË¡½ñ)";
-static char MN_THIRD[] = "3ºýÌܤΠ(ËâË¡½ñ)";
-static char MN_FOURTH[] = "4ºýÌܤΠ(ËâË¡½ñ)";
-
-static char MN_NOUN[] = "̾»ì¤ÎÁªÂò";
+static GAME_TEXT MN_QUIT[] = "セーブ無しで終了";
+static GAME_TEXT MN_SAVEQUIT[] = "セーブして終了";
+static GAME_TEXT MN_REVERT[] = "全ての変更を破棄";
+static GAME_TEXT MN_HELP[] = "ヘルプ";
+
+static GAME_TEXT MN_MOVE[] = "カーソル移動";
+static GAME_TEXT MN_LEFT[] = "å·¦ (â\86\90ç\9f¢å\8d°ã\82ã\83¼)";
+static GAME_TEXT MN_DOWN[] = "ä¸\8b (â\86\93ç\9f¢å\8d°ã\82ã\83¼)";
+static GAME_TEXT MN_UP[] = "ä¸\8a (â\86\91ç\9f¢å\8d°ã\82ã\83¼)";
+static GAME_TEXT MN_RIGHT[] = "å\8f³ (â\86\92ç\9f¢å\8d°ã\82ã\83¼)";
+static GAME_TEXT MN_BOL[] = "行の先頭";
+static GAME_TEXT MN_EOL[] = "行の終端";
+static GAME_TEXT MN_PGUP[] = "ä¸\8aã\81®ã\83\9aã\83¼ã\82¸ (PageUpã\82ã\83¼)";
+static GAME_TEXT MN_PGDOWN[] = "ä¸\8bã\81®ã\83\9aã\83¼ã\82¸ (PageDownã\82ã\83¼)";
+static GAME_TEXT MN_TOP[] = "1è¡\8cç\9b®ã\81¸ç§»å\8b\95 (Homeã\82ã\83¼)";
+static GAME_TEXT MN_BOTTOM[] = "æ\9c\80ä¸\8bè¡\8cã\81¸ç§»å\8b\95(Endã\82ã\83¼)";
+
+static GAME_TEXT MN_EDIT[] = "編集";
+static GAME_TEXT MN_CUT[] = "カット";
+static GAME_TEXT MN_COPY[] = "ã\82³ã\83\94ã\83¼";
+static GAME_TEXT MN_PASTE[] = "ペースト";
+static GAME_TEXT MN_BLOCK[] = "選択範囲の指定";
+static GAME_TEXT MN_KILL_LINE[] = "行の残りを削除";
+static GAME_TEXT MN_DELETE_CHAR[] = "1文字削除";
+static GAME_TEXT MN_BACKSPACE[] = "ã\83\90ã\83\83ã\82¯ã\82¹ã\83\9aã\83¼ã\82¹";
+static GAME_TEXT MN_RETURN[] = "改行";
+
+static GAME_TEXT MN_SEARCH[] = "検索";
+static GAME_TEXT MN_SEARCH_STR[] = "文字列で検索";
+static GAME_TEXT MN_SEARCH_FORW[] = "前方へ再検索";
+static GAME_TEXT MN_SEARCH_BACK[] = "後方へ再検索";
+static GAME_TEXT MN_SEARCH_OBJ[] = "アイテムを選択して検索";
+static GAME_TEXT MN_SEARCH_DESTROYED[] = "自動破壊されたアイテムで検索";
+
+static GAME_TEXT MN_INSERT[] = "色々挿入";
+static GAME_TEXT MN_INSERT_OBJECT[] = "選択したアイテムの名前を挿入";
+static GAME_TEXT MN_INSERT_DESTROYED[] = "自動破壊されたアイテムの名前を挿入";
+static GAME_TEXT MN_INSERT_BLOCK[] = "条件分岐ブロックの例を挿入";
+static GAME_TEXT MN_INSERT_MACRO[] = "マクロ定義を挿入";
+static GAME_TEXT MN_INSERT_KEYMAP[] = "キーマップ定義を挿入";
+
+static GAME_TEXT MN_COMMAND_LETTER[] = "拾い/破壊/放置の選択";
+static GAME_TEXT MN_CL_AUTOPICK[] = "「 」 (自動拾い)";
+static GAME_TEXT MN_CL_DESTROY[] = "「!」 (自動破壊)";
+static GAME_TEXT MN_CL_LEAVE[] = "「~」 (放置)";
+static GAME_TEXT MN_CL_QUERY[] = "「;」 (確認して拾う)";
+static GAME_TEXT MN_CL_NO_DISP[] = "「(」 (マップコマンドで表示しない)";
+
+static GAME_TEXT MN_ADJECTIVE_GEN[] = "形容詞(一般)の選択";
+static GAME_TEXT MN_RARE[] = "レアな (装備)";
+static GAME_TEXT MN_COMMON[] = "ありふれた (装備)";
+
+static GAME_TEXT MN_ADJECTIVE_SPECIAL[] = "形容詞(特殊)の選択";
+static GAME_TEXT MN_BOOSTED[] = "ダイス目の違う (武器)";
+static GAME_TEXT MN_MORE_DICE[] = "ダイス目 # 以上の (武器)";
+static GAME_TEXT MN_MORE_BONUS[] = "修正値 # 以上の (指輪等)";
+static GAME_TEXT MN_WANTED[] = "賞金首の (死体)";
+static GAME_TEXT MN_UNIQUE[] = "ユニーク・モンスターの (死体)";
+static GAME_TEXT MN_HUMAN[] = "人間の (死体)";
+static GAME_TEXT MN_UNREADABLE[] = "読めない (魔法書)";
+static GAME_TEXT MN_REALM1[] = "第一領域の (魔法書)";
+static GAME_TEXT MN_REALM2[] = "第二領域の (魔法書)";
+static GAME_TEXT MN_FIRST[] = "1冊目の (魔法書)";
+static GAME_TEXT MN_SECOND[] = "2冊目の (魔法書)";
+static GAME_TEXT MN_THIRD[] = "3冊目の (魔法書)";
+static GAME_TEXT MN_FOURTH[] = "4冊目の (魔法書)";
+
+static GAME_TEXT MN_NOUN[] = "名詞の選択";
#else
-static char MN_QUIT[] = "Quit without save";
-static char MN_SAVEQUIT[] = "Save & Quit";
-static char MN_REVERT[] = "Revert all changes";
-static char MN_HELP[] = "Help";
-
-static char MN_MOVE[] = "Move cursor";
-static char MN_LEFT[] = "Left (Left Arrow key)";
-static char MN_DOWN[] = "Down (Down Arrow key)";
-static char MN_UP[] = "Up (Up Arrow key)";
-static char MN_RIGHT[] = "Right (Right Arrow key)";
-static char MN_BOL[] = "Beggining of line";
-static char MN_EOL[] = "End of line";
-static char MN_PGUP[] = "Page up (PageUp key)";
-static char MN_PGDOWN[] = "Page down(PageDown key)";
-static char MN_TOP[] = "Top (Home key)";
-static char MN_BOTTOM[] = "Bottom (End key)";
-
-static char MN_EDIT[] = "Edit";
-static char MN_CUT[] = "Cut";
-static char MN_COPY[] = "Copy";
-static char MN_PASTE[] = "Paste";
-static char MN_BLOCK[] = "Select block";
-static char MN_KILL_LINE[] = "Kill rest of line";
-static char MN_DELETE_CHAR[] = "Delete character";
-static char MN_BACKSPACE[] = "Backspace";
-static char MN_RETURN[] = "Return";
-
-static char MN_SEARCH[] = "Search";
-static char MN_SEARCH_STR[] = "Search by string";
-static char MN_SEARCH_FORW[] = "Search forward";
-static char MN_SEARCH_BACK[] = "Search backward";
-static char MN_SEARCH_OBJ[] = "Search by inventory object";
-static char MN_SEARCH_DESTROYED[] = "Search by destroyed object";
-
-static char MN_INSERT[] = "Insert...";
-static char MN_INSERT_OBJECT[] = "Insert name of choosen object";
-static char MN_INSERT_DESTROYED[] = "Insert name of destroyed object";
-static char MN_INSERT_BLOCK[] = "Insert conditional block";
-static char MN_INSERT_MACRO[] = "Insert a macro definition";
-static char MN_INSERT_KEYMAP[] = "Insert a keymap definition";
-
-static char MN_COMMAND_LETTER[] = "Command letter";
-static char MN_CL_AUTOPICK[] = "' ' (Auto pick)";
-static char MN_CL_DESTROY[] = "'!' (Auto destroy)";
-static char MN_CL_LEAVE[] = "'~' (Leave it on the floor)";
-static char MN_CL_QUERY[] = "';' (Query to pick up)";
-static char MN_CL_NO_DISP[] = "'(' (No display on the large map)";
-
-static char MN_ADJECTIVE_GEN[] = "Adjective (general)";
-static char MN_RARE[] = "rare (equipments)";
-static char MN_COMMON[] = "common (equipments)";
-
-static char MN_ADJECTIVE_SPECIAL[] = "Adjective (special)";
-static char MN_BOOSTED[] = "dice boosted (weapons)";
-static char MN_MORE_DICE[] = "more than # dice (weapons)";
-static char MN_MORE_BONUS[] = "more bonus than # (rings etc.)";
-static char MN_WANTED[] = "wanted (corpse)";
-static char MN_UNIQUE[] = "unique (corpse)";
-static char MN_HUMAN[] = "human (corpse)";
-static char MN_UNREADABLE[] = "unreadable (spellbooks)";
-static char MN_REALM1[] = "realm1 (spellbooks)";
-static char MN_REALM2[] = "realm2 (spellbooks)";
-static char MN_FIRST[] = "first (spellbooks)";
-static char MN_SECOND[] = "second (spellbooks)";
-static char MN_THIRD[] = "third (spellbooks)";
-static char MN_FOURTH[] = "fourth (spellbooks)";
-
-static char MN_NOUN[] = "Keywords (noun)";
+static GAME_TEXT MN_QUIT[] = "Quit without save";
+static GAME_TEXT MN_SAVEQUIT[] = "Save & Quit";
+static GAME_TEXT MN_REVERT[] = "Revert all changes";
+static GAME_TEXT MN_HELP[] = "Help";
+
+static GAME_TEXT MN_MOVE[] = "Move cursor";
+static GAME_TEXT MN_LEFT[] = "Left (Left Arrow key)";
+static GAME_TEXT MN_DOWN[] = "Down (Down Arrow key)";
+static GAME_TEXT MN_UP[] = "Up (Up Arrow key)";
+static GAME_TEXT MN_RIGHT[] = "Right (Right Arrow key)";
+static GAME_TEXT MN_BOL[] = "Beggining of line";
+static GAME_TEXT MN_EOL[] = "End of line";
+static GAME_TEXT MN_PGUP[] = "Page up (PageUp key)";
+static GAME_TEXT MN_PGDOWN[] = "Page down(PageDown key)";
+static GAME_TEXT MN_TOP[] = "Top (Home key)";
+static GAME_TEXT MN_BOTTOM[] = "Bottom (End key)";
+
+static GAME_TEXT MN_EDIT[] = "Edit";
+static GAME_TEXT MN_CUT[] = "Cut";
+static GAME_TEXT MN_COPY[] = "Copy";
+static GAME_TEXT MN_PASTE[] = "Paste";
+static GAME_TEXT MN_BLOCK[] = "Select block";
+static GAME_TEXT MN_KILL_LINE[] = "Kill rest of line";
+static GAME_TEXT MN_DELETE_CHAR[] = "Delete character";
+static GAME_TEXT MN_BACKSPACE[] = "Backspace";
+static GAME_TEXT MN_RETURN[] = "Return";
+
+static GAME_TEXT MN_SEARCH[] = "Search";
+static GAME_TEXT MN_SEARCH_STR[] = "Search by string";
+static GAME_TEXT MN_SEARCH_FORW[] = "Search forward";
+static GAME_TEXT MN_SEARCH_BACK[] = "Search backward";
+static GAME_TEXT MN_SEARCH_OBJ[] = "Search by inventory object";
+static GAME_TEXT MN_SEARCH_DESTROYED[] = "Search by destroyed object";
+
+static GAME_TEXT MN_INSERT[] = "Insert...";
+static GAME_TEXT MN_INSERT_OBJECT[] = "Insert name of choosen object";
+static GAME_TEXT MN_INSERT_DESTROYED[] = "Insert name of destroyed object";
+static GAME_TEXT MN_INSERT_BLOCK[] = "Insert conditional block";
+static GAME_TEXT MN_INSERT_MACRO[] = "Insert a macro definition";
+static GAME_TEXT MN_INSERT_KEYMAP[] = "Insert a keymap definition";
+
+static GAME_TEXT MN_COMMAND_LETTER[] = "Command letter";
+static GAME_TEXT MN_CL_AUTOPICK[] = "' ' (Auto pick)";
+static GAME_TEXT MN_CL_DESTROY[] = "'!' (Auto destroy)";
+static GAME_TEXT MN_CL_LEAVE[] = "'~' (Leave it on the floor)";
+static GAME_TEXT MN_CL_QUERY[] = "';' (Query to pick up)";
+static GAME_TEXT MN_CL_NO_DISP[] = "'(' (No display on the large map)";
+
+static GAME_TEXT MN_ADJECTIVE_GEN[] = "Adjective (general)";
+static GAME_TEXT MN_RARE[] = "rare (equipments)";
+static GAME_TEXT MN_COMMON[] = "common (equipments)";
+
+static GAME_TEXT MN_ADJECTIVE_SPECIAL[] = "Adjective (special)";
+static GAME_TEXT MN_BOOSTED[] = "dice boosted (weapons)";
+static GAME_TEXT MN_MORE_DICE[] = "more than # dice (weapons)";
+static GAME_TEXT MN_MORE_BONUS[] = "more bonus than # (rings etc.)";
+static GAME_TEXT MN_WANTED[] = "wanted (corpse)";
+static GAME_TEXT MN_UNIQUE[] = "unique (corpse)";
+static GAME_TEXT MN_HUMAN[] = "human (corpse)";
+static GAME_TEXT MN_UNREADABLE[] = "unreadable (spellbooks)";
+static GAME_TEXT MN_REALM1[] = "realm1 (spellbooks)";
+static GAME_TEXT MN_REALM2[] = "realm2 (spellbooks)";
+static GAME_TEXT MN_FIRST[] = "first (spellbooks)";
+static GAME_TEXT MN_SECOND[] = "second (spellbooks)";
+static GAME_TEXT MN_THIRD[] = "third (spellbooks)";
+static GAME_TEXT MN_FOURTH[] = "fourth (spellbooks)";
+
+static GAME_TEXT MN_NOUN[] = "Keywords (noun)";
#endif
typedef struct {
- cptr name;
+ concptr name;
int level;
int key;
int com_id;
for (i = start; menu_data[i].level >= level; i++)
{
char com_key_str[3];
- cptr str;
+ concptr str;
/* Ignore lower level sub menus */
if (menu_data[i].level > level) continue;
if (menu_data[i].com_id == -1)
{
-#ifdef JP
- strcpy(com_key_str, "¢§");
-#else
- strcpy(com_key_str, ">");
-#endif
+ strcpy(com_key_str, _("▼", ">"));
}
else if (menu_data[i].key != -1)
{
/* The menu was shown */
redraw = FALSE;
}
-#ifdef JP
- prt(format("(a-%c) ¥³¥Þ¥ó¥É:", menu_key + 'a' - 1), 0, 0);
-#else
- prt(format("(a-%c) Command:", menu_key + 'a' - 1), 0, 0);
-#endif
+ prt(format(_("(a-%c) コマンド:", "(a-%c) Command:"), menu_key + 'a' - 1), 0, 0);
key = inkey();
if (key == ESCAPE) return 0;
}
-static chain_str_type *new_chain_str(cptr str)
+static chain_str_type *new_chain_str(concptr str)
{
chain_str_type *chain;
}
-static void add_str_to_yank(text_body_type *tb, cptr str)
+static void add_str_to_yank(text_body_type *tb, concptr str)
{
chain_str_type *chain;
int i;
int by1 = 0, by2 = 0;
- /* Get size */
Term_get_size(&tb->wid, &tb->hgt);
/*
if (tb->dirty_flags & DIRTY_SCREEN)
{
tb->dirty_flags |= (DIRTY_ALL | DIRTY_MODE);
-
- /* Clear screen */
Term_clear();
}
for (y = 0; tb->lines_list[y]; y++)
{
char f;
- cptr v;
- cptr s = tb->lines_list[y];
+ concptr v;
+ concptr s = tb->lines_list[y];
char *ss, *s_keep;
int s_len;
/* Parse the expr */
v = process_pref_file_expr(&ss, &f);
- /* Cannot use string_free() because the string was "destroyed" */
- C_FREE(s_keep, s_len + 1, char);
-
/* Set flag */
if (streq(v, "0")) state |= LSTAT_BYPASS;
else state &= ~LSTAT_BYPASS;
+ /* Cannot use string_free() because the string was "destroyed" */
+ C_KILL(s_keep, s_len + 1, char);
+
/* Re-update this line's state */
tb->states[y] = state | LSTAT_EXPRESSION;
}
{
int j;
int leftcol = 0;
- cptr msg;
+ concptr msg;
byte color;
int y = tb->upper+i;
if (tb->old_cy != tb->cy || (tb->dirty_flags & (DIRTY_ALL | DIRTY_NOT_FOUND | DIRTY_NO_SEARCH)) || tb->dirty_line == tb->cy)
{
autopick_type an_entry, *entry = &an_entry;
- cptr str1 = NULL, str2 = NULL;
+ concptr str1 = NULL, str2 = NULL;
/* Clear information line */
/* Display information */
if (tb->dirty_flags & DIRTY_NOT_FOUND)
{
-#ifdef JP
- str1 = format("¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s", tb->search_str);
-#else
- str1 = format("Pattern not found: %s", tb->search_str);
-#endif
+ str1 = format(_("パターンが見つかりません: %s", "Pattern not found: %s"), tb->search_str);
}
else if (tb->dirty_flags & DIRTY_SKIP_INACTIVE)
{
-#ifdef JP
- str1 = format("̵¸ú¾õÂ֤ιԤò¥¹¥¥Ã¥×¤·¤Þ¤·¤¿¡£(%s¤ò¸¡º÷Ãæ)", tb->search_str);
-#else
- str1 = format("Some inactive lines are skipped. (Searching %s)", tb->search_str);
-#endif
+ str1 = format(_("無効状態の行をスキップしました。(%sを検索中)",
+ "Some inactive lines are skipped. (Searching %s)"), tb->search_str);
}
else if (tb->dirty_flags & DIRTY_INACTIVE)
{
-#ifdef JP
- str1 = format("̵¸ú¾õÂ֤ιԤÀ¤±¤¬¸«ÉÕ¤«¤ê¤Þ¤·¤¿¡£(%s¤ò¸¡º÷Ãæ)", tb->search_str);
-#else
- str1 = format("Found only an inactive line. (Searching %s)", tb->search_str);
-#endif
+ str1 = format(_("無効状態の行だけが見付かりました。(%sを検索中)",
+ "Found only an inactive line. (Searching %s)"), tb->search_str);
}
else if (tb->dirty_flags & DIRTY_NO_SEARCH)
{
-#ifdef JP
- str1 = "¸¡º÷¤¹¤ë¥Ñ¥¿¡¼¥ó¤¬¤¢¤ê¤Þ¤»¤ó(^S ¤Ç¸¡º÷)¡£";
-#else
- str1 = "No pattern to search. (Press ^S to search.)";
-#endif
+ str1 = _("検索するパターンがありません(^S で検索)。", "No pattern to search. (Press ^S to search.)");
}
else if (tb->lines_list[tb->cy][0] == '#')
{
-#ifdef JP
- str1 = "¤³¤Î¹Ô¤Ï¥³¥á¥ó¥È¤Ç¤¹¡£";
-#else
- str1 = "This line is a comment.";
-#endif
+ str1 = _("この行はコメントです。", "This line is a comment.");
}
- else if (tb->lines_list[tb->cy][1] == ':')
+ else if (tb->lines_list[tb->cy][0] && tb->lines_list[tb->cy][1] == ':')
{
switch(tb->lines_list[tb->cy][0])
{
case '?':
-#ifdef JP
- str1 = "¤³¤Î¹Ô¤Ï¾ò·ïʬ´ô¼°¤Ç¤¹¡£";
-#else
- str1 = "This line is a Conditional Expression.";
-#endif
-
+ str1 = _("この行は条件分岐式です。", "This line is a Conditional Expression.");
break;
case 'A':
-#ifdef JP
- str1 = "¤³¤Î¹Ô¤Ï¥Þ¥¯¥í¤Î¼Â¹ÔÆâÍƤòÄêµÁ¤·¤Þ¤¹¡£";
-#else
- str1 = "This line defines a Macro action.";
-#endif
+ str1 = _("この行はマクロの実行内容を定義します。", "This line defines a Macro action.");
break;
case 'P':
-#ifdef JP
- str1 = "¤³¤Î¹Ô¤Ï¥Þ¥¯¥í¤Î¥È¥ê¥¬¡¼¡¦¥¡¼¤òÄêµÁ¤·¤Þ¤¹¡£";
-#else
- str1 = "This line defines a Macro trigger key.";
-#endif
+ str1 = _("この行はマクロのトリガー・キーを定義します。", "This line defines a Macro trigger key.");
break;
case 'C':
-#ifdef JP
- str1 = "¤³¤Î¹Ô¤Ï¥¡¼ÇÛÃÖ¤òÄêµÁ¤·¤Þ¤¹¡£";
-#else
- str1 = "This line defines a Keymap.";
-#endif
+ str1 = _("この行はキー配置を定義します。", "This line defines a Keymap.");
break;
}
case '?':
if (tb->states[tb->cy] & LSTAT_BYPASS)
{
-#ifdef JP
- str2 = "¸½ºß¤Î¼°¤ÎÃͤϡֵ¶(=0)¡×¤Ç¤¹¡£";
-#else
- str2 = "The expression is 'False'(=0) currently.";
-#endif
+ str2 = _("現在の式の値は「偽(=0)」です。", "The expression is 'False'(=0) currently.");
}
else
{
-#ifdef JP
- str2 = "¸½ºß¤Î¼°¤ÎÃͤϡֿ¿(=1)¡×¤Ç¤¹¡£";
-#else
- str2 = "The expression is 'True'(=1) currently.";
-#endif
+ str2 = _("現在の式の値は「真(=1)」です。", "The expression is 'True'(=1) currently.");
}
break;
default:
if (tb->states[tb->cy] & LSTAT_AUTOREGISTER)
{
-#ifdef JP
- str2 = "¤³¤Î¹Ô¤Ï¸å¤Çºï½ü¤µ¤ì¤Þ¤¹¡£";
-#else
- str2 = "This line will be delete later.";
-#endif
+ str2 = _("この行は後で削除されます。", "This line will be delete later.");
}
else if (tb->states[tb->cy] & LSTAT_BYPASS)
{
-#ifdef JP
- str2 = "¤³¤Î¹Ô¤Ï¸½ºß¤Ï̵¸ú¤Ê¾õÂ֤Ǥ¹¡£";
-#else
- str2 = "This line is bypassed currently.";
-#endif
+ str2 = _("この行は現在は無効な状態です。", "This line is bypassed currently.");
}
break;
}
{
char buf[MAX_LINELEN];
char temp[MAX_LINELEN];
- cptr t;
+ concptr t;
describe_autopick(buf, entry);
if (tb->states[tb->cy] & LSTAT_AUTOREGISTER)
{
-#ifdef JP
- strcat(buf, "¤³¤Î¹Ô¤Ï¸å¤Çºï½ü¤µ¤ì¤Þ¤¹¡£");
-#else
- strcat(buf, " This line will be delete later.");
-#endif
+ strcat(buf, _("この行は後で削除されます。", " This line will be delete later."));
}
if (tb->states[tb->cy] & LSTAT_BYPASS)
{
-#ifdef JP
- strcat(buf, "¤³¤Î¹Ô¤Ï¸½ºß¤Ï̵¸ú¤Ê¾õÂ֤Ǥ¹¡£");
-#else
- strcat(buf, " This line is bypassed currently.");
-#endif
+ strcat(buf, _("この行は現在は無効な状態です。", " This line is bypassed currently."));
}
roff_to_buf(buf, 81, temp, sizeof(temp));
static void kill_line_segment(text_body_type *tb, int y, int x0, int x1, bool whole)
{
char buf[MAX_LINELEN];
- cptr s = tb->lines_list[y];
+ concptr s = tb->lines_list[y];
char *d = buf;
int x;
while (i)
{
/* Save the key */
- buf[n++] = i;
+ buf[n++] = (char)i;
/* Do not process macros */
inkey_base = TRUE;
/* Terminate */
buf[n] = '\0';
- /* Flush */
flush();
/* Convert the trigger */
{
char tmp[1024];
char buf[2];
- int mode;
- cptr act;
+ BIT_FLAGS mode;
+ concptr act;
/* Roguelike */
if (rogue_like_commands)
mode = KEYMAP_MODE_ORIG;
}
- /* Flush */
flush();
/* Get a key */
buf[0] = inkey();
buf[1] = '\0';
- /* Flush */
flush();
/* Convert the trigger */
case EC_QUIT:
if (tb->changed)
{
-#ifdef JP
- if (!get_check("Á´¤Æ¤ÎÊѹ¹¤òÇË´þ¤·¤Æ¤«¤é½ªÎ»¤·¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡© ")) break;
-#else
- if (!get_check("Discard all changes and quit. Are you sure? ")) break;
-#endif
+ if (!get_check(_("全ての変更を破棄してから終了します。よろしいですか？ ",
+ "Discard all changes and quit. Are you sure? "))) break;
}
return QUIT_WITHOUT_SAVE;
case EC_REVERT:
/* Revert to original */
-#ifdef JP
- if (!get_check("Á´¤Æ¤ÎÊѹ¹¤òÇË´þ¤·¤Æ¸µ¤Î¾õÂÖ¤ËÌᤷ¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡© ")) break;
-#else
- if (!get_check("Discard all changes and revert to original file. Are you sure? ")) break;
-#endif
+ if (!get_check(_("全ての変更を破棄して元の状態に戻します。よろしいですか？ ",
+ "Discard all changes and revert to original file. Are you sure? "))) break;
free_text_lines(tb->lines_list);
tb->lines_list = read_pickpref_text_lines(&tb->filename_mode);
case EC_HELP:
/* Peruse the main help file */
-#ifdef JP
- (void)show_file(TRUE, "jeditor.txt", NULL, 0, 0);
-#else
- (void)show_file(TRUE, "editor.txt", NULL, 0, 0);
-#endif
+ (void)show_file(TRUE, _("jeditor.txt", "editor.txt"), NULL, 0, 0);
/* Redraw all */
tb->dirty_flags |= DIRTY_SCREEN;
/* Paste text */
while (chain)
{
- cptr yank_str = chain->s;
+ concptr yank_str = chain->s;
char buf[MAX_LINELEN];
int i;
Term_erase(0, tb->cy - tb->upper + 1, tb->wid);
/* Prompt */
-#ifdef JP
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, "P:<¥È¥ê¥¬¡¼¥¡¼>: ");
-#else
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, "P:<Trigger key>: ");
-#endif
+ Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, _("P:<トリガーキー>: ", "P:<Trigger key>: "));
if (insert_macro_line(tb))
{
/* Prepare to input action */
Term_erase(0, tb->cy - tb->upper + 1, tb->wid);
/* Prompt */
-#ifdef JP
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, format("C:%d:<¥³¥Þ¥ó¥É¥¡¼>: ", (rogue_like_commands ? KEYMAP_MODE_ROGUE : KEYMAP_MODE_ORIG)));
-#else
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, format("C:%d:<Keypress>: ", (rogue_like_commands ? KEYMAP_MODE_ROGUE : KEYMAP_MODE_ORIG)));
-#endif
+ Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW,
+ format(_("C:%d:<コマンドキー>: ", "C:%d:<Keypress>: "), (rogue_like_commands ? KEYMAP_MODE_ROGUE : KEYMAP_MODE_ORIG)));
if (insert_keymap_line(tb))
{
next = inkey();
if (j+2 < MAX_LINELEN)
{
- buf[j++] = key;
- buf[j++] = next;
+ buf[j++] = (char)key;
+ buf[j++] = (char)next;
tb->cx += 2;
}
else
#endif
{
if (j+1 < MAX_LINELEN)
- buf[j++] = key;
+ buf[j++] = (char)key;
tb->cx++;
}
break;
}
}
-
- /* Save the screen */
screen_save();
/* Process requests until done */
draw_text_editor(tb);
/* Display header line */
-#ifdef JP
- prt("(^Q:½ªÎ» ^W:¥»¡¼¥Ö¤·¤Æ½ªÎ», ESC:¥á¥Ë¥å¡¼, ¤½¤Î¾:ÆþÎÏ)", 0, 0);
-#else
- prt("(^Q:Quit, ^W:Save&Quit, ESC:Menu, Other:Input text)", 0, 0);
-#endif
+ prt(_("(^Q:終了 ^W:セーブして終了, ESC:メニュー, その他:入力)",
+ "(^Q:Quit, ^W:Save&Quit, ESC:Menu, Other:Input text)"), 0, 0);
if (!tb->mark)
{
/* Display current position */
tb->old_wid = tb->wid;
tb->old_hgt = tb->hgt;
- /* Get a command */
key = inkey_special(TRUE);
/* Special keys */
/* Other commands */
else
{
- com_id = get_com_id(key);
+ com_id = get_com_id((char)key);
}
if (com_id) quit = do_editor_command(tb, com_id);
} /* while (TRUE) */
-
- /* Restore the screen */
screen_load();
/* Get the filename of preference */
free_text_lines(tb->lines_list);
+ string_free(tb->search_str);
string_free(tb->last_destroyed);
/* Destroy string chain */
process_autopick_file(buf);
/* HACK -- reset start_time so that playtime is not increase while edit */
- start_time = time(NULL);
+ start_time = (u32b)time(NULL);
/* Save cursor location */
cx_save = tb->cx;
OSDN Git Service
