X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Finit2.c;h=1a182ee5251c872590711541817efa0f545005e7;hb=a55fcffc6673dd5b7a79f87233961be0f4533b83;hp=9eea4344b59ed4da4b6f3f70700b0be2d5898920;hpb=0a976e3183d82776ecadc033d5bcb6f6b39e296d;p=hengband%2Fhengband.git diff --git a/src/init2.c b/src/init2.c index 9eea4344b..1a182ee52 100644 --- a/src/init2.c +++ b/src/init2.c @@ -1,75 +1,81 @@ -/* File: init2.c */ - -/* Purpose: Initialization (part 2) -BEN- */ - -#include "angband.h" - -#include "init.h" - -#ifndef MACINTOSH -#ifdef CHECK_MODIFICATION_TIME -#include -#include -#endif /* CHECK_MODIFICATION_TIME */ -#endif - -/* +/*! + * @file init2.c + * @brief ゲームデータ初期化2 / Initialization (part 2) -BEN- + * @date 2014/01/28 + * @author + * 
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
+ * 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.  Other copyrights may also apply.
+ * 2014 Deskull rearranged comment for Doxygen.\n
+ *
+ * @details + * 
  * This file is used to initialize various variables and arrays for the
  * Angband game.  Note the use of "fd_read()" and "fd_write()" to bypass
  * the common limitation of "read()" and "write()" to only 32767 bytes
  * at a time.
- *
  * Several of the arrays for Angband are built from "template" files in
  * the "lib/file" directory, from which quick-load binary "image" files
  * are constructed whenever they are not present in the "lib/data"
  * directory, or if those files become obsolete, if we are allowed.
- *
  * Warning -- the "ascii" file parsers use a minor hack to collect the
  * name and text information in a single pass.  Thus, the game will not
  * be able to load any template file with more than 20K of names or 60K
  * of text, even though technically, up to 64K should be legal.
- *
  * The "init1.c" file is used only to parse the ascii template files,
  * to create the binary image files.  If you include the binary image
  * files instead of the ascii template files, then you can undefine
  * "ALLOW_TEMPLATES", saving about 20K by removing "init1.c".  Note
  * that the binary image files are extremely system dependant.
+ *
*/ +#include "angband.h" +#include "init.h" -/* +#ifndef MACINTOSH +#ifdef CHECK_MODIFICATION_TIME +#include +#include +#endif /* CHECK_MODIFICATION_TIME */ +#endif + +static void put_title(void); + +/*! + * @brief 各データファイルを読み取るためのパスを取得する * Find the default paths to all of our important sub-directories. - * + * @param path パス保管先の文字列 + * @return なし + * @details + * 
  * The purpose of each sub-directory is described in "variable.c".
- *
  * All of the sub-directories should, by default, be located inside
  * the main "lib" directory, whose location is very system dependant.
- *
  * This function takes a writable buffer, initially containing the
  * "path" to the "lib" directory, for example, "/pkg/lib/angband/",
  * or a system dependant string, for example, ":lib:".  The buffer
  * must be large enough to contain at least 32 more characters.
- *
  * Various command line options may allow some of the important
  * directories to be changed to user-specified directories, most
  * importantly, the "info" and "user" and "save" directories,
  * but this is done after this function, see "main.c".
- *
  * In general, the initial path should end in the appropriate "PATH_SEP"
  * string.  All of the "sub-directory" paths (created below or supplied
  * by the user) will NOT end in the "PATH_SEP" string, see the special
  * "path_build()" function in "util.c" for more information.
- *
  * Mega-Hack -- support fat raw files under NEXTSTEP, using special
  * "suffixed" directories for the "ANGBAND_DIR_DATA" directory, but
  * requiring the directories to be created by hand by the user.
- *
  * Hack -- first we free all the strings, since this is known
  * to succeed even if the strings have not been allocated yet,
  * as long as the variables start out as "NULL".  This allows
  * this function to be called multiple times, for example, to
  * try several base "path" values until a good one is found.
+ *
*/ void init_file_paths(char *path) { @@ -106,28 +112,6 @@ void init_file_paths(char *path) /* Prepare to append to the Base Path */ tail = path + strlen(path); - -#ifdef VM - - /*** Use "flat" paths with VM/ESA ***/ - - /* Use "blank" path names */ - ANGBAND_DIR_APEX = string_make(""); - ANGBAND_DIR_BONE = string_make(""); - ANGBAND_DIR_DATA = string_make(""); - ANGBAND_DIR_EDIT = string_make(""); - ANGBAND_DIR_SCRIPT = string_make(""); - ANGBAND_DIR_FILE = string_make(""); - ANGBAND_DIR_HELP = string_make(""); - ANGBAND_DIR_INFO = string_make(""); - ANGBAND_DIR_SAVE = string_make(""); - ANGBAND_DIR_USER = string_make(""); - ANGBAND_DIR_XTRA = string_make(""); - - -#else /* VM */ - - /*** Build the sub-directory names ***/ /* Build a path name */ @@ -173,7 +157,7 @@ void init_file_paths(char *path) #ifdef PRIVATE_USER_PATH /* Build the path to the user specific directory */ - path_build(buf, 1024, PRIVATE_USER_PATH, VERSION_NAME); + path_build(buf, sizeof(buf), PRIVATE_USER_PATH, VERSION_NAME); /* Build a relative path name */ ANGBAND_DIR_USER = string_make(buf); @@ -190,8 +174,6 @@ void init_file_paths(char *path) strcpy(tail, "xtra"); ANGBAND_DIR_XTRA = string_make(path); -#endif /* VM */ - #ifdef NeXT @@ -240,26 +222,27 @@ void init_file_paths(char *path) /* * Hack -- help give useful error messages */ -int error_idx; -int error_line; +int error_idx; /*!< データ読み込み/初期化時に汎用的にエラーコードを保存するグローバル変数 */ +int error_line; /*!< データ読み込み/初期化時に汎用的にエラー行数を保存するグローバル変数 */ -/* - * Standard error message text +/*! + * エラーメッセージの名称定義 / Standard error message text */ cptr err_str[PARSE_ERROR_MAX] = { NULL, #ifdef JP - "ʸˡ¥¨¥é¡¼", - "¸Å¤¤¥Õ¥¡¥¤¥ë", - "µ­Ï¿¥Ø¥Ã¥À¤¬¤Ê¤¤", - "ÉÔϢ³¥ì¥³¡¼¥É", - "¤ª¤«¤·¤Ê¥Õ¥é¥°Â¸ºß", - "̤ÄêµÁÌ¿Îá", - "¥á¥â¥êÉÔ­", - "ºÂɸÈϰϳ°", - "°ú¿ôÉÔ­", + "文法エラー", + "古いファイル", + "記録ヘッダがない", + "不連続レコード", + "おかしなフラグ存在", + "未定義命令", + "メモリ不足", + "座標範囲外", + "引数不足", + "未定義地形タグ", #else "parse error", "obsolete file", @@ -270,6 +253,7 @@ cptr err_str[PARSE_ERROR_MAX] = "out of memory", "coordinates out of bounds", "too few arguments", + "undefined terrain tag", #endif }; @@ -281,18 +265,25 @@ cptr err_str[PARSE_ERROR_MAX] = /* * File headers */ -header v_head; -header f_head; -header k_head; -header a_head; -header e_head; -header r_head; -header d_head; -header s_head; -header m_head; +header v_head; /*!< Vault情報のヘッダ構造体 */ +header f_head; /*!< 地形情報のヘッダ構造体 */ +header k_head; /*!< ペースアイテム情報のヘッダ構造体 */ +header a_head; /*!< 固定アーティファクト情報のヘッダ構造体 */ +header e_head; /*!< アイテムエゴ情報のヘッダ構造体 */ +header r_head; /*!< モンスター種族情報のヘッダ構造体 */ +header d_head; /*!< ダンジョン情報のヘッダ構造体 */ +header s_head; /*!< プレイヤー職業技能情報のヘッダ構造体 */ +header m_head; /*!< プレイヤー職業魔法情報のヘッダ構造体 */ #ifdef CHECK_MODIFICATION_TIME +/*! + * @brief テキストファイルとrawファイルの更新時刻を比較する + * Find the default paths to all of our important sub-directories. + * @param fd ファイルディスクリプタ + * @param template_file ファイル名 + * @return テキストの方が新しいか、rawファイルがなく更新の必要がある場合-1、更新の必要がない場合0。 + */ static errr check_modification_date(int fd, cptr template_file) { char buf[1024]; @@ -300,7 +291,7 @@ static errr check_modification_date(int fd, cptr template_file) struct stat txt_stat, raw_stat; /* Build the filename */ - path_build(buf, 1024, ANGBAND_DIR_EDIT, template_file); + path_build(buf, sizeof(buf), ANGBAND_DIR_EDIT, template_file); /* Access stats on text file */ if (stat(buf, &txt_stat)) @@ -332,8 +323,12 @@ static errr check_modification_date(int fd, cptr template_file) /*** Initialize from binary image files ***/ -/* +/*! + * @brief rawファイルからのデータの読み取り処理 * Initialize the "*_info" array, by parsing a binary "image" file + * @param fd ファイルディスクリプタ + * @param head rawファイルのヘッダ + * @return エラーコード */ static errr init_info_raw(int fd, header *head) { @@ -344,7 +339,6 @@ static errr init_info_raw(int fd, header *head) (test.v_major != head->v_major) || (test.v_minor != head->v_minor) || (test.v_patch != head->v_patch) || - (test.v_extra != head->v_extra) || (test.info_num != head->info_num) || (test.info_len != head->info_len) || (test.head_size != head->head_size) || @@ -385,14 +379,30 @@ static errr init_info_raw(int fd, header *head) fd_read(fd, head->text_ptr, head->text_size); } + + if (head->tag_size) + { + /* Allocate the "*_tag" array */ + C_MAKE(head->tag_ptr, head->tag_size, char); + + /* Read the "*_tag" array */ + fd_read(fd, head->tag_ptr, head->tag_size); + } + + /* Success */ return (0); } -/* +/*! + * @brief ヘッダ構造体の更新 * Initialize the header of an *_info.raw file. + * @param head rawファイルのヘッダ + * @param num データ数 + * @param len データの長さ + * @return エラーコード */ static void init_header(header *head, int num, int len) { @@ -412,14 +422,22 @@ static void init_header(header *head, int num, int len) } -/* +/*! + * @brief ヘッダ構造体の更新 * Initialize the "*_info" array - * + * @param filename ファイル名(拡張子txt/raw) + * @param head 処理に用いるヘッダ構造体 + * @param info データ保管先の構造体ポインタ + * @param name 名称用可変文字列の保管先 + * @param text テキスト用可変文字列の保管先 + * @param tag タグ用可変文字列の保管先 + * @return エラーコード + * @note * Note that we let each entry have a unique "name" and "text" string, * even if the string happens to be empty (everyone has a unique '\0'). */ static errr init_info(cptr filename, header *head, - void **info, char **name, char **text) + void **info, char **name, char **text, char **tag) { int fd; @@ -438,11 +456,7 @@ static errr init_info(cptr filename, header *head, /*** Load the binary image file ***/ /* Build the filename */ -#ifdef JP - path_build(buf, 1024, ANGBAND_DIR_DATA, format("%s_j.raw", filename)); -#else - path_build(buf, 1024, ANGBAND_DIR_DATA, format("%s.raw", filename)); -#endif + path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, format(_("%s_j.raw", "%s.raw"), filename)); /* Attempt to open the "raw" file */ @@ -453,7 +467,7 @@ static errr init_info(cptr filename, header *head, { #ifdef CHECK_MODIFICATION_TIME - err = check_modification_date(fd, format("%s_j.txt", filename)); + err = check_modification_date(fd, format("%s.txt", filename)); #endif /* CHECK_MODIFICATION_TIME */ @@ -477,27 +491,24 @@ static errr init_info(cptr filename, header *head, /* Hack -- make "fake" arrays */ if (name) C_MAKE(head->name_ptr, FAKE_NAME_SIZE, char); if (text) C_MAKE(head->text_ptr, FAKE_TEXT_SIZE, char); + if (tag) C_MAKE(head->tag_ptr, FAKE_TAG_SIZE, char); if (info) (*info) = head->info_ptr; if (name) (*name) = head->name_ptr; if (text) (*text) = head->text_ptr; + if (tag) (*tag) = head->tag_ptr; /*** Load the ascii template file ***/ /* Build the filename */ - path_build(buf, 1024, ANGBAND_DIR_EDIT, format("%s_j.txt", filename)); + path_build(buf, sizeof(buf), ANGBAND_DIR_EDIT, format("%s.txt", filename)); /* Open the file */ fp = my_fopen(buf, "r"); /* Parse it */ -#ifdef JP - if (!fp) quit(format("'%s_j.txt'¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£", filename)); -#else - if (!fp) quit(format("Cannot open '%s.txt' file.", filename)); -#endif - + if (!fp) quit(format(_("'%s.txt'ファイルをオープンできません。", "Cannot open '%s.txt' file."), filename)); /* Parse the file */ err = init_info_txt(fp, buf, head, head->parse_info_txt); @@ -512,16 +523,16 @@ static errr init_info(cptr filename, header *head, #ifdef JP /* Error string */ - oops = ((err > 0) ? err_str[err] : "̤ÃΤÎ"); + oops = (((err > 0) && (err < PARSE_ERROR_MAX)) ? err_str[err] : "未知の"); /* Oops */ - msg_format("'%s_j.txt'¥Õ¥¡¥¤¥ë¤Î %d ¹ÔÌܤ˥¨¥é¡¼¡£", filename, error_line); - msg_format("¥ì¥³¡¼¥É %d ¤Ï '%s' ¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£", error_idx, oops); - msg_format("¹½Ê¸ '%s'¡£", buf); + msg_format("'%s.txt'ファイルの %d 行目にエラー。", filename, error_line); + msg_format("レコード %d は '%s' エラーがあります。", error_idx, oops); + msg_format("構文 '%s'。", buf); msg_print(NULL); /* Quit */ - quit(format("'%s_j.txt'¥Õ¥¡¥¤¥ë¤Ë¥¨¥é¡¼", filename)); + quit(format("'%s.txt'ファイルにエラー", filename)); #else /* Error string */ oops = (((err > 0) && (err < PARSE_ERROR_MAX)) ? err_str[err] : "unknown"); @@ -539,18 +550,25 @@ static errr init_info(cptr filename, header *head, } + /*** Make final retouch on fake tags ***/ + + if (head->retouch) + { + (*head->retouch)(head); + } + + /*** Dump the binary image file ***/ /* File type is "DATA" */ FILE_TYPE(FILE_TYPE_DATA); /* Build the filename */ -#ifdef JP - path_build(buf, 1024, ANGBAND_DIR_DATA, format("%s_j.raw", filename)); -#else - path_build(buf, 1024, ANGBAND_DIR_DATA, format("%s.raw", filename)); -#endif + path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, format(_("%s_j.raw", "%s.raw"), filename)); + + /* Grab permissions */ + safe_setuid_grab(); /* Kill the old file */ (void)fd_kill(buf); @@ -558,13 +576,16 @@ static errr init_info(cptr filename, header *head, /* Attempt to create the raw file */ fd = fd_make(buf, mode); + /* Drop permissions */ + safe_setuid_drop(); + /* Dump to the file */ if (fd >= 0) { /* Dump it */ fd_write(fd, (cptr)(head), head->head_size); - /* Dump the "*_info" array */ + /* Dump the "*_info" array */ fd_write(fd, head->info_ptr, head->info_size); /* Dump the "*_name" array */ @@ -573,6 +594,9 @@ static errr init_info(cptr filename, header *head, /* Dump the "*_text" array */ fd_write(fd, head->text_ptr, head->text_size); + /* Dump the "*_tag" array */ + fd_write(fd, head->tag_ptr, head->tag_size); + /* Close */ (void)fd_close(fd); } @@ -586,6 +610,7 @@ static errr init_info(cptr filename, header *head, /* Hack -- Free the "fake" arrays */ if (name) C_KILL(head->name_ptr, FAKE_NAME_SIZE, char); if (text) C_KILL(head->text_ptr, FAKE_TEXT_SIZE, char); + if (tag) C_KILL(head->tag_ptr, FAKE_TAG_SIZE, char); #endif /* ALLOW_TEMPLATES */ @@ -593,23 +618,13 @@ static errr init_info(cptr filename, header *head, /*** Load the binary image file ***/ /* Build the filename */ -#ifdef JP - path_build(buf, 1024, ANGBAND_DIR_DATA, format("%s_j.raw", filename)); -#else - path_build(buf, 1024, ANGBAND_DIR_DATA, format("%s.raw", filename)); -#endif - + path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, format(_("%s_j.raw", "%s.raw"), filename)); /* Attempt to open the "raw" file */ fd = fd_open(buf, O_RDONLY); /* Process existing "raw" file */ -#ifdef JP - if (fd < 0) quit(format("'%s_j.raw'¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¡£", filename)); -#else - if (fd < 0) quit(format("Cannot load '%s.raw' file.", filename)); -#endif - + if (fd < 0) quit(format(_("'%s_j.raw'ファイルをロードできません。", "Cannot load '%s.raw' file."), filename)); /* Attempt to parse the "raw" file */ err = init_info_raw(fd, head); @@ -618,11 +633,7 @@ static errr init_info(cptr filename, header *head, (void)fd_close(fd); /* Error */ -#ifdef JP - if (err) quit(format("'%s_j.raw'¥Õ¥¡¥¤¥ë¤ò²òÀϤǤ­¤Þ¤»¤ó¡£", filename)); -#else - if (err) quit(format("Cannot parse '%s.raw' file.", filename)); -#endif + if (err) quit(format(_("'%s_j.raw'ファイルを解析できません。", "Cannot parse '%s.raw' file."), filename)); #ifdef ALLOW_TEMPLATES } @@ -631,14 +642,17 @@ static errr init_info(cptr filename, header *head, if (info) (*info) = head->info_ptr; if (name) (*name) = head->name_ptr; if (text) (*text) = head->text_ptr; + if (tag) (*tag) = head->tag_ptr; /* Success */ return (0); } -/* +/*! + * @brief 地形情報読み込みのメインルーチン / * Initialize the "f_info" array + * @return エラーコード */ static errr init_f_info(void) { @@ -650,15 +664,20 @@ static errr init_f_info(void) /* Save a pointer to the parsing function */ f_head.parse_info_txt = parse_f_info; + /* Save a pointer to the retouch fake tags */ + f_head.retouch = retouch_f_info; + #endif /* ALLOW_TEMPLATES */ return init_info("f_info", &f_head, - (void*)&f_info, (void*)&f_name, (void*)&f_text); + (void*)&f_info, &f_name, NULL, &f_tag); } -/* +/*! + * @brief ベースアイテム情報読み込みのメインルーチン / * Initialize the "k_info" array + * @return エラーコード */ static errr init_k_info(void) { @@ -673,13 +692,15 @@ static errr init_k_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("k_info", &k_head, - (void*)&k_info, (void*)&k_name, (void*)&k_text); + (void*)&k_info, &k_name, &k_text, NULL); } -/* +/*! + * @brief 固定アーティファクト情報読み込みのメインルーチン / * Initialize the "a_info" array + * @return エラーコード */ static errr init_a_info(void) { @@ -694,13 +715,15 @@ static errr init_a_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("a_info", &a_head, - (void*)&a_info, (void*)&a_name, (void*)&a_text); + (void*)&a_info, &a_name, &a_text, NULL); } -/* +/*! + * @brief 固定アーティファクト情報読み込みのメインルーチン / * Initialize the "e_info" array + * @return エラーコード */ static errr init_e_info(void) { @@ -715,13 +738,15 @@ static errr init_e_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("e_info", &e_head, - (void*)&e_info, (void*)&e_name, (void*)&e_text); + (void*)&e_info, &e_name, &e_text, NULL); } -/* +/*! + * @brief モンスター種族情報読み込みのメインルーチン / * Initialize the "r_info" array + * @return エラーコード */ static errr init_r_info(void) { @@ -736,13 +761,15 @@ static errr init_r_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("r_info", &r_head, - (void*)&r_info, (void*)&r_name, (void*)&r_text); + (void*)&r_info, &r_name, &r_text, NULL); } -/* +/*! + * @brief ダンジョン情報読み込みのメインルーチン / * Initialize the "d_info" array + * @return エラーコード */ static errr init_d_info(void) { @@ -757,13 +784,15 @@ static errr init_d_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("d_info", &d_head, - (void*)&d_info, (void*)&d_name, (void*)&d_text); + (void*)&d_info, &d_name, &d_text, NULL); } -/* +/*! + * @brief Vault情報読み込みのメインルーチン / * Initialize the "v_info" array - * + * @return エラーコード + * @note * Note that we let each entry have a unique "name" and "text" string, * even if the string happens to be empty (everyone has a unique '\0'). */ @@ -780,12 +809,14 @@ errr init_v_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("v_info", &v_head, - (void*)&v_info, (void*)&v_name, (void*)&v_text); + (void*)&v_info, &v_name, &v_text, NULL); } -/* +/*! + * @brief 職業技能情報読み込みのメインルーチン / * Initialize the "s_info" array + * @return エラーコード */ static errr init_s_info(void) { @@ -800,12 +831,14 @@ static errr init_s_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("s_info", &s_head, - (void*)&s_info, (void*)&s_name, (void*)&s_text); + (void*)&s_info, NULL, NULL, NULL); } -/* +/*! + * @brief 職業魔法情報読み込みのメインルーチン / * Initialize the "m_info" array + * @return エラーコード */ static errr init_m_info(void) { @@ -820,15 +853,15 @@ static errr init_m_info(void) #endif /* ALLOW_TEMPLATES */ return init_info("m_info", &m_head, - (void*)&m_info, (void*)&m_name, (void*)&m_text); + (void*)&m_info, NULL, NULL, NULL); } /*** Initialize others ***/ -/* - * Hack -- Objects sold in the stores -- by tval/sval pair. +/*! + * 店舗で販売するオブジェクトを定義する / Hack -- Objects sold in the stores -- by tval/sval pair. */ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { @@ -880,16 +913,14 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { TV_FOOD, SV_FOOD_RATION }, { TV_FOOD, SV_FOOD_RATION }, - { TV_LITE, SV_LITE_TORCH }, - { TV_LITE, SV_LITE_TORCH }, + { TV_POTION, SV_POTION_WATER }, + { TV_POTION, SV_POTION_WATER }, { TV_LITE, SV_LITE_LANTERN }, { TV_LITE, SV_LITE_LANTERN }, - { TV_FLASK, 0 }, - { TV_FLASK, 0 }, - + { TV_FOOD, SV_FOOD_WAYBREAD }, + { TV_FOOD, SV_FOOD_WAYBREAD }, { TV_CAPTURE, 0 }, - { TV_FIGURINE, 0 }, { TV_SHOT, SV_AMMO_NORMAL }, @@ -1061,14 +1092,14 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { TV_LIFE_BOOK, 0 }, { TV_LIFE_BOOK, 0 }, - { TV_LIFE_BOOK, 0 }, - { TV_LIFE_BOOK, 0 }, - - { TV_LIFE_BOOK, 1 }, - { TV_LIFE_BOOK, 1 }, { TV_LIFE_BOOK, 1 }, { TV_LIFE_BOOK, 1 }, + { TV_CRUSADE_BOOK, 0 }, + { TV_CRUSADE_BOOK, 0 }, + { TV_CRUSADE_BOOK, 1 }, + { TV_CRUSADE_BOOK, 1 }, + { TV_HAFTED, SV_WHIP }, { TV_HAFTED, SV_MACE }, { TV_HAFTED, SV_BALL_AND_CHAIN }, @@ -1116,7 +1147,7 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { TV_SCROLL, SV_SCROLL_DETECT_INVIS }, { TV_SCROLL, SV_SCROLL_RECHARGING }, - { TV_SCROLL, SV_SCROLL_SATISFY_HUNGER }, + { TV_SCROLL, SV_SCROLL_TELEPORT }, { TV_SCROLL, SV_SCROLL_WORD_OF_RECALL }, { TV_SCROLL, SV_SCROLL_WORD_OF_RECALL }, @@ -1150,9 +1181,9 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { TV_SCROLL, SV_SCROLL_ENCHANT_ARMOR }, { TV_SCROLL, SV_SCROLL_RECHARGING }, - { TV_SCROLL, SV_SCROLL_SATISFY_HUNGER }, - { TV_SCROLL, SV_SCROLL_SATISFY_HUNGER }, - { TV_SCROLL, SV_SCROLL_SATISFY_HUNGER } + { TV_SCROLL, SV_SCROLL_PHASE_DOOR }, + { TV_SCROLL, SV_SCROLL_ENCHANT_WEAPON_TO_HIT }, + { TV_SCROLL, SV_SCROLL_ENCHANT_WEAPON_TO_DAM }, }, @@ -1160,7 +1191,7 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = /* Magic-User store */ { TV_RING, SV_RING_PROTECTION }, - { TV_RING, SV_RING_FEATHER_FALL }, + { TV_RING, SV_RING_LEVITATION_FALL }, { TV_RING, SV_RING_PROTECTION }, { TV_RING, SV_RING_RESIST_FIRE }, @@ -1326,10 +1357,10 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { TV_ARCANE_BOOK, 2 }, { TV_ARCANE_BOOK, 3 }, - { TV_ENCHANT_BOOK, 0 }, - { TV_ENCHANT_BOOK, 0 }, - { TV_ENCHANT_BOOK, 1 }, - { TV_ENCHANT_BOOK, 1 }, + { TV_CRAFT_BOOK, 0 }, + { TV_CRAFT_BOOK, 0 }, + { TV_CRAFT_BOOK, 1 }, + { TV_CRAFT_BOOK, 1 }, { TV_DAEMON_BOOK, 0 }, { TV_DAEMON_BOOK, 0 }, @@ -1340,6 +1371,11 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { TV_MUSIC_BOOK, 0 }, { TV_MUSIC_BOOK, 1 }, { TV_MUSIC_BOOK, 1 }, + + { TV_HEX_BOOK, 0 }, + { TV_HEX_BOOK, 0 }, + { TV_HEX_BOOK, 1 }, + { TV_HEX_BOOK, 1 }, }, { @@ -1380,20 +1416,24 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = }; -/* +/*! + * @brief 基本情報読み込みのメインルーチン / * Initialize misc. values + * @return エラーコード */ static errr init_misc(void) { /* Initialize the values */ - process_dungeon_file("misc_j.txt", 0, 0, 0, 0); + process_dungeon_file("misc.txt", 0, 0, 0, 0); return 0; } -/* +/*! + * @brief 町情報読み込みのメインルーチン / * Initialize town array + * @return エラーコード */ static errr init_towns(void) { @@ -1422,9 +1462,9 @@ static errr init_towns(void) /* Assume full stock */ /* - * ²æ¤¬²È¤¬ 20 ¥Ú¡¼¥¸¤Þ¤Ç»È¤¨¤ë±£¤·µ¡Ç½¤Î¤¿¤á¤Î½àÈ÷¡£ - * ¥ª¥×¥·¥ç¥ó¤¬Í­¸ú¤Ç¤â¤½¤¦¤Ç¤Ê¤¯¤Æ¤â°ì±þ¥¹¥Ú¡¼¥¹ - * ¤òºî¤Ã¤Æ¤ª¤¯¡£ + * 我が家が 20 ページまで使える隠し機能のための準備。 + * オプションが有効でもそうでなくても一応スペース + * を作っておく。 */ if (j == STORE_HOME) { @@ -1455,7 +1495,7 @@ static errr init_towns(void) /* Scan the choices */ for (k = 0; k < STORE_CHOICES; k++) { - int k_idx; + KIND_OBJECT_IDX k_idx; /* Extract the tval/sval codes */ int tv = store_table[j][k][0]; @@ -1482,8 +1522,10 @@ static errr init_towns(void) return 0; } -/* +/*! + * @brief 店情報初期化のメインルーチン / * Initialize buildings + * @return エラーコード */ errr init_buildings(void) { @@ -1525,8 +1567,10 @@ errr init_buildings(void) } -/* +/*! + * @brief クエスト情報初期化のメインルーチン / * Initialize quest array + * @return エラーコード */ static errr init_quests(void) { @@ -1546,9 +1590,176 @@ static errr init_quests(void) return 0; } +/*! 地形タグ情報から地形IDを得られなかった場合にTRUEを返すグローバル変数 */ +static bool feat_tag_is_not_found = FALSE; -/* +/*! + * @brief 地形タグからIDを得る / + * Initialize quest array + * @return 地形ID + */ +s16b f_tag_to_index_in_init(cptr str) +{ + s16b feat = f_tag_to_index(str); + + if (feat < 0) feat_tag_is_not_found = TRUE; + + return feat; +} + + +/*! + * @brief 地形の汎用定義をタグを通じて取得する / + * Initialize feature variables + * @return エラーコード + */ +static errr init_feat_variables(void) +{ + FEAT_IDX i; + + /* Nothing */ + feat_none = f_tag_to_index_in_init("NONE"); + + /* Floor */ + feat_floor = f_tag_to_index_in_init("FLOOR"); + + /* Objects */ + feat_glyph = f_tag_to_index_in_init("GLYPH"); + feat_explosive_rune = f_tag_to_index_in_init("EXPLOSIVE_RUNE"); + feat_mirror = f_tag_to_index_in_init("MIRROR"); + + /* Doors */ + feat_door[DOOR_DOOR].open = f_tag_to_index_in_init("OPEN_DOOR"); + feat_door[DOOR_DOOR].broken = f_tag_to_index_in_init("BROKEN_DOOR"); + feat_door[DOOR_DOOR].closed = f_tag_to_index_in_init("CLOSED_DOOR"); + + /* Locked doors */ + for (i = 1; i < MAX_LJ_DOORS; i++) + { + s16b door = f_tag_to_index(format("LOCKED_DOOR_%d", i)); + if (door < 0) break; + feat_door[DOOR_DOOR].locked[i - 1] = door; + } + if (i == 1) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG; + feat_door[DOOR_DOOR].num_locked = i - 1; + + /* Jammed doors */ + for (i = 0; i < MAX_LJ_DOORS; i++) + { + s16b door = f_tag_to_index(format("JAMMED_DOOR_%d", i)); + if (door < 0) break; + feat_door[DOOR_DOOR].jammed[i] = door; + } + if (!i) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG; + feat_door[DOOR_DOOR].num_jammed = i; + + /* Glass doors */ + feat_door[DOOR_GLASS_DOOR].open = f_tag_to_index_in_init("OPEN_GLASS_DOOR"); + feat_door[DOOR_GLASS_DOOR].broken = f_tag_to_index_in_init("BROKEN_GLASS_DOOR"); + feat_door[DOOR_GLASS_DOOR].closed = f_tag_to_index_in_init("CLOSED_GLASS_DOOR"); + + /* Locked glass doors */ + for (i = 1; i < MAX_LJ_DOORS; i++) + { + s16b door = f_tag_to_index(format("LOCKED_GLASS_DOOR_%d", i)); + if (door < 0) break; + feat_door[DOOR_GLASS_DOOR].locked[i - 1] = door; + } + if (i == 1) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG; + feat_door[DOOR_GLASS_DOOR].num_locked = i - 1; + + /* Jammed glass doors */ + for (i = 0; i < MAX_LJ_DOORS; i++) + { + s16b door = f_tag_to_index(format("JAMMED_GLASS_DOOR_%d", i)); + if (door < 0) break; + feat_door[DOOR_GLASS_DOOR].jammed[i] = door; + } + if (!i) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG; + feat_door[DOOR_GLASS_DOOR].num_jammed = i; + + /* Curtains */ + feat_door[DOOR_CURTAIN].open = f_tag_to_index_in_init("OPEN_CURTAIN"); + feat_door[DOOR_CURTAIN].broken = feat_door[DOOR_CURTAIN].open; + feat_door[DOOR_CURTAIN].closed = f_tag_to_index_in_init("CLOSED_CURTAIN"); + feat_door[DOOR_CURTAIN].locked[0] = feat_door[DOOR_CURTAIN].closed; + feat_door[DOOR_CURTAIN].num_locked = 1; + feat_door[DOOR_CURTAIN].jammed[0] = feat_door[DOOR_CURTAIN].closed; + feat_door[DOOR_CURTAIN].num_jammed = 1; + + /* Stairs */ + feat_up_stair = f_tag_to_index_in_init("UP_STAIR"); + feat_down_stair = f_tag_to_index_in_init("DOWN_STAIR"); + feat_entrance = f_tag_to_index_in_init("ENTRANCE"); + + /* Normal traps */ + init_normal_traps(); + + /* Special traps */ + feat_trap_open = f_tag_to_index_in_init("TRAP_OPEN"); + feat_trap_armageddon = f_tag_to_index_in_init("TRAP_ARMAGEDDON"); + feat_trap_piranha = f_tag_to_index_in_init("TRAP_PIRANHA"); + + /* Rubble */ + feat_rubble = f_tag_to_index_in_init("RUBBLE"); + + /* Seams */ + feat_magma_vein = f_tag_to_index_in_init("MAGMA_VEIN"); + feat_quartz_vein = f_tag_to_index_in_init("QUARTZ_VEIN"); + + /* Walls */ + feat_granite = f_tag_to_index_in_init("GRANITE"); + feat_permanent = f_tag_to_index_in_init("PERMANENT"); + + /* Glass floor */ + feat_glass_floor = f_tag_to_index_in_init("GLASS_FLOOR"); + + /* Glass walls */ + feat_glass_wall = f_tag_to_index_in_init("GLASS_WALL"); + feat_permanent_glass_wall = f_tag_to_index_in_init("PERMANENT_GLASS_WALL"); + + /* Pattern */ + feat_pattern_start = f_tag_to_index_in_init("PATTERN_START"); + feat_pattern_1 = f_tag_to_index_in_init("PATTERN_1"); + feat_pattern_2 = f_tag_to_index_in_init("PATTERN_2"); + feat_pattern_3 = f_tag_to_index_in_init("PATTERN_3"); + feat_pattern_4 = f_tag_to_index_in_init("PATTERN_4"); + feat_pattern_end = f_tag_to_index_in_init("PATTERN_END"); + feat_pattern_old = f_tag_to_index_in_init("PATTERN_OLD"); + feat_pattern_exit = f_tag_to_index_in_init("PATTERN_EXIT"); + feat_pattern_corrupted = f_tag_to_index_in_init("PATTERN_CORRUPTED"); + + /* Various */ + feat_black_market = f_tag_to_index_in_init("BLACK_MARKET"); + feat_town = f_tag_to_index_in_init("TOWN"); + + /* Terrains */ + feat_deep_water = f_tag_to_index_in_init("DEEP_WATER"); + feat_shallow_water = f_tag_to_index_in_init("SHALLOW_WATER"); + feat_deep_lava = f_tag_to_index_in_init("DEEP_LAVA"); + feat_shallow_lava = f_tag_to_index_in_init("SHALLOW_LAVA"); + feat_dirt = f_tag_to_index_in_init("DIRT"); + feat_grass = f_tag_to_index_in_init("GRASS"); + feat_flower = f_tag_to_index_in_init("FLOWER"); + feat_brake = f_tag_to_index_in_init("BRAKE"); + feat_tree = f_tag_to_index_in_init("TREE"); + feat_mountain = f_tag_to_index_in_init("MOUNTAIN"); + feat_swamp = f_tag_to_index_in_init("SWAMP"); + + /* Unknown grid (not detected) */ + feat_undetected = f_tag_to_index_in_init("UNDETECTED"); + + /* Wilderness terrains */ + init_wilderness_terrains(); + + return feat_tag_is_not_found ? PARSE_ERROR_UNDEFINED_TERRAIN_TAG : 0; +} + + +/*! + * @brief その他の初期情報更新 / * Initialize some other arrays + * @return エラーコード */ static errr init_other(void) { @@ -1563,8 +1774,14 @@ static errr init_other(void) /* Allocate and Wipe the monster list */ C_MAKE(m_list, max_m_idx, monster_type); - /* Allocate and Wipe the max dungeon level */ - C_MAKE(max_dlv, max_d_idx, s16b); + /* Allocate and Wipe the monster process list */ + for (i = 0; i < MAX_MTIMED; i++) + { + C_MAKE(mproc_list[i], max_m_idx, s16b); + } + + /* Allocate and Wipe the max dungeon level */ + C_MAKE(max_dlv, max_d_idx, DEPTH); /* Allocate and wipe each line of the cave */ for (i = 0; i < MAX_HGT; i++) @@ -1585,10 +1802,10 @@ static errr init_other(void) C_MAKE(macro__buf, 1024, char); /* Quark variables */ - C_MAKE(quark__str, QUARK_MAX, cptr); + quark_init(); /* Message variables */ - C_MAKE(message__ptr, MESSAGE_MAX, u16b); + C_MAKE(message__ptr, MESSAGE_MAX, u32b); C_MAKE(message__buf, MESSAGE_BUF, char); /* Hack -- No messages yet */ @@ -1601,47 +1818,6 @@ static errr init_other(void) C_MAKE(inventory, INVEN_TOTAL, object_type); - /*** Pre-allocate the basic "auto-inscriptions" ***/ - - /* The "basic" feelings */ -#ifdef JP - (void)quark_add("¼ö¤ï¤ì¤Æ¤¤¤ë"); - (void)quark_add("²õ¤ì¤Æ¤¤¤ë"); - (void)quark_add("ÊÂ"); - (void)quark_add("¾å¼Á"); -#else - (void)quark_add("cursed"); - (void)quark_add("broken"); - (void)quark_add("average"); - (void)quark_add("good"); -#endif - - - /* The "extra" feelings */ -#ifdef JP - (void)quark_add("¹âµéÉÊ"); - (void)quark_add("̵²ÁÃÍ"); - (void)quark_add("ÆÃÊÌÀ½"); - (void)quark_add("¶²¤í¤·¤¤"); -#else - (void)quark_add("excellent"); - (void)quark_add("worthless"); - (void)quark_add("special"); - (void)quark_add("terrible"); -#endif - - - /* Some extra strings */ -#ifdef JP - (void)quark_add("¼ö¤¤¤Ê¤·"); - (void)quark_add("Çä½ÐÃæ"); -#else - (void)quark_add("uncursed"); - (void)quark_add("on sale"); -#endif - - - /*** Prepare the options ***/ /* Scan the options */ @@ -1688,12 +1864,12 @@ static errr init_other(void) } /* - * Set the "default" window flags + * Set the "default" window flags * Window 1 : Display messages * Window 2 : Display inven/equip */ - window_flag[1] = 1L << 6; - window_flag[2] = 1L << 0; + window_flag[1] = 1L << 6; + window_flag[2] = 1L << 0; /*** Pre-allocate space for the "format()" buffer ***/ @@ -1707,9 +1883,122 @@ static errr init_other(void) } +/*! + * @brief オブジェクト配列を初期化する / + * Initialize some other arrays + * @return エラーコード + */ +static errr init_object_alloc(void) +{ + int i, j; + object_kind *k_ptr; + alloc_entry *table; + s16b num[MAX_DEPTH]; + s16b aux[MAX_DEPTH]; + -/* + /*** Analyze object allocation info ***/ + + /* Clear the "aux" array */ + (void)C_WIPE(&aux, MAX_DEPTH, s16b); + + /* Clear the "num" array */ + (void)C_WIPE(&num, MAX_DEPTH, s16b); + + /* Free the old "alloc_kind_table" (if it exists) */ + if (alloc_kind_table) + { + C_KILL(alloc_kind_table, alloc_kind_size, alloc_entry); + } + + /* Size of "alloc_kind_table" */ + alloc_kind_size = 0; + + /* Scan the objects */ + for (i = 1; i < max_k_idx; i++) + { + k_ptr = &k_info[i]; + + /* Scan allocation pairs */ + for (j = 0; j < 4; j++) + { + /* Count the "legal" entries */ + if (k_ptr->chance[j]) + { + /* Count the entries */ + alloc_kind_size++; + + /* Group by level */ + num[k_ptr->locale[j]]++; + } + } + } + + /* Collect the level indexes */ + for (i = 1; i < MAX_DEPTH; i++) + { + /* Group by level */ + num[i] += num[i-1]; + } + + /* Paranoia */ + if (!num[0]) quit(_("町のアイテムがない！", "No town objects!")); + + /*** Initialize object allocation info ***/ + + /* Allocate the alloc_kind_table */ + C_MAKE(alloc_kind_table, alloc_kind_size, alloc_entry); + + /* Access the table entry */ + table = alloc_kind_table; + + /* Scan the objects */ + for (i = 1; i < max_k_idx; i++) + { + k_ptr = &k_info[i]; + + /* Scan allocation pairs */ + for (j = 0; j < 4; j++) + { + /* Count the "legal" entries */ + if (k_ptr->chance[j]) + { + int p, x, y, z; + + /* Extract the base level */ + x = k_ptr->locale[j]; + + /* Extract the base probability */ + p = (100 / k_ptr->chance[j]); + + /* Skip entries preceding our locale */ + y = (x > 0) ? num[x-1] : 0; + + /* Skip previous entries at this locale */ + z = y + aux[x]; + + /* Load the entry */ + table[z].index = (KIND_OBJECT_IDX)i; + table[z].level = (DEPTH)x; + table[z].prob1 = (PROB)p; + table[z].prob2 = (PROB)p; + table[z].prob3 = (PROB)p; + + /* Another entry complete for this locale */ + aux[x]++; + } + } + } + + /* Success */ + return (0); +} + + +/*! + * @brief モンスター配列と生成テーブルを初期化する / * Initialize some other arrays + * @return エラーコード */ static errr init_alloc(void) { @@ -1727,7 +2016,7 @@ static errr init_alloc(void) for (i = 1; i < max_r_idx; i++) { elements[i].tag = r_info[i].level; - elements[i].pointer = (void*)i; + elements[i].index = i; } tag_sort(elements, max_r_idx); @@ -1744,7 +2033,7 @@ static errr init_alloc(void) for (i = 1; i < max_r_idx; i++) { /* Get the i'th race */ - r_ptr = &r_info[(int)elements[i].pointer]; + r_ptr = &r_info[elements[i].index]; /* Count valid pairs */ if (r_ptr->rarity) @@ -1758,14 +2047,17 @@ static errr init_alloc(void) p = (100 / r_ptr->rarity); /* Load the entry */ - alloc_race_table[i].index = (int)elements[i].pointer; - alloc_race_table[i].level = x; - alloc_race_table[i].prob1 = p; - alloc_race_table[i].prob2 = p; - alloc_race_table[i].prob3 = p; + alloc_race_table[i].index = (KIND_OBJECT_IDX)elements[i].index; + alloc_race_table[i].level = (DEPTH)x; + alloc_race_table[i].prob1 = (PROB)p; + alloc_race_table[i].prob2 = (PROB)p; + alloc_race_table[i].prob3 = (PROB)p; } } + /* Free the "r_info" array */ + C_KILL(elements, max_r_idx, tag_type); + #else /* SORT_R_INFO */ int j; @@ -1809,13 +2101,7 @@ static errr init_alloc(void) } /* Paranoia */ -#ifdef JP - if (!num[0]) quit("Ä®¤Î¥â¥ó¥¹¥¿¡¼¤¬¤Ê¤¤¡ª"); -#else - if (!num[0]) quit("No town monsters!"); -#endif - - + if (!num[0]) quit(_("町のモンスターがない！", "No town monsters!")); /*** Initialize monster allocation info ***/ @@ -1871,8 +2157,10 @@ static errr init_alloc(void) -/* +/*! + * @brief 画面左下にシステムメッセージを表示する / * Hack -- take notes on line 23 + * @return なし */ static void note(cptr str) { @@ -1883,12 +2171,16 @@ static void note(cptr str) -/* +/*! + * @brief 全ゲームデータ読み込みのサブルーチン / * Hack -- Explain a broken "lib" folder and quit (see below). - * + * @return なし + * @note + * 
  * XXX XXX XXX This function is "messy" because various things
  * may or may not be initialized, but the "plog()" and "quit()"
  * functions are "supposed" to work under any conditions.
+ *
*/ static void init_angband_aux(cptr why) { @@ -1897,16 +2189,16 @@ static void init_angband_aux(cptr why) #ifdef JP /* Explain */ - plog("'lib'¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¤«²õ¤ì¤Æ¤¤¤ë¤è¤¦¤Ç¤¹¡£"); + plog("'lib'ディレクトリが存在しないか壊れているようです。"); /* More details */ - plog("¤Ò¤ç¤Ã¤È¤¹¤ë¤È¥¢¡¼¥«¥¤¥Ö¤¬Àµ¤·¤¯²òÅव¤ì¤Æ¤¤¤Ê¤¤¤Î¤«¤â¤·¤ì¤Þ¤»¤ó¡£"); + plog("ひょっとするとアーカイブが正しく解凍されていないのかもしれません。"); /* Explain */ - plog("³ºÅö¤¹¤ë'README'¥Õ¥¡¥¤¥ë¤òÆɤó¤Ç³Îǧ¤·¤Æ¤ß¤Æ²¼¤µ¤¤¡£"); + plog("該当する'README'ファイルを読んで確認してみて下さい。"); /* Quit with error */ - quit("Ã×̿Ū¤Ê¥¨¥é¡¼¡£"); + quit("致命的なエラー。"); #else /* Explain */ plog("The 'lib' directory is probably missing or broken."); @@ -1924,26 +2216,29 @@ static void init_angband_aux(cptr why) } -/* +/*! + * @brief 全ゲームデータ読み込みのメインルーチン / * Hack -- main Angband initialization entry point - * + * @return なし + * @note + * 
+ * XXX XXX XXX This function is "messy" because various things
+ * may or may not be initialized, but the "plog()" and "quit()"
+ * functions are "supposed" to work under any conditions.
  * Verify some files, display the "news.txt" file, create
  * the high score file, initialize all internal arrays, and
  * load the basic "user pref files".
- *
  * Be very careful to keep track of the order in which things
  * are initialized, in particular, the only thing *known* to
  * be available when this function is called is the "z-term.c"
  * package, and that may not be fully initialized until the
  * end of this function, when the default "user pref files"
  * are loaded and "Term_xtra(TERM_XTRA_REACT,0)" is called.
- *
  * Note that this function attempts to verify the "news" file,
  * and the game aborts (cleanly) on failure, since without the
  * "news" file, it is likely that the "lib" folder has not been
  * correctly located.  Otherwise, the news file is displayed for
  * the user.
- *
  * Note that this function attempts to verify (or create) the
  * "high score" file, and the game aborts (cleanly) on failure,
  * since one of the most common "extraction" failures involves
@@ -1954,28 +2249,24 @@ static void init_angband_aux(cptr why)
  * code below, since the "lib/apex" directory, being empty in the
  * standard distributions, is most likely to be "lost", making it
  * impossible to create the high score file.
- *
  * Note that various things are initialized by this function,
  * including everything that was once done by "init_some_arrays".
- *
  * This initialization involves the parsing of special files
  * in the "lib/data" and sometimes the "lib/edit" directories.
- *
  * Note that the "template" files are initialized first, since they
  * often contain errors.  This means that macros and message recall
  * and things like that are not available until after they are done.
- *
  * We load the default "user pref files" here in case any "color"
  * changes are needed before character creation.
- *
  * Note that the "graf-xxx.prf" file must be loaded separately,
  * if needed, in the first (?) pass through "TERM_XTRA_REACT".
+ *
*/ void init_angband(void) { int fd = -1; - int mode = 0644; + int mode = 0664; FILE *fp; @@ -1985,12 +2276,7 @@ void init_angband(void) /*** Verify the "news" file ***/ /* Build the filename */ -#ifdef JP - path_build(buf, 1024, ANGBAND_DIR_FILE, "news_j.txt"); -#else - path_build(buf, 1024, ANGBAND_DIR_FILE, "news.txt"); -#endif - + path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, _("news_j.txt", "news.txt")); /* Attempt to open the file */ fd = fd_open(buf, O_RDONLY); @@ -2001,12 +2287,7 @@ void init_angband(void) char why[1024]; /* Message */ -#ifdef JP - sprintf(why, "'%s'¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó!", buf); -#else - sprintf(why, "Cannot access the '%s' file!", buf); -#endif - + sprintf(why, _("'%s'ファイルにアクセスできません!", "Cannot access the '%s' file!"), buf); /* Crash and burn */ init_angband_aux(why); @@ -2022,12 +2303,7 @@ void init_angband(void) Term_clear(); /* Build the filename */ -#ifdef JP - path_build(buf, 1024, ANGBAND_DIR_FILE, "news_j.txt"); -#else - path_build(buf, 1024, ANGBAND_DIR_FILE, "news.txt"); -#endif - + path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, _("news_j.txt", "news.txt")); /* Open the News file */ fp = my_fopen(buf, "r"); @@ -2038,7 +2314,7 @@ void init_angband(void) int i = 0; /* Dump the file to the screen */ - while (0 == my_fgets(fp, buf, 1024)) + while (0 == my_fgets(fp, buf, sizeof(buf))) { /* Display and advance */ Term_putstr(0, i++, -1, TERM_WHITE, buf); @@ -2049,13 +2325,13 @@ void init_angband(void) } /* Flush it */ - Term_fresh(); + Term_flush(); /*** Verify (or create) the "high score" file ***/ /* Build the filename */ - path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); + path_build(buf, sizeof(buf), ANGBAND_DIR_APEX, "scores.raw"); /* Attempt to open the high score file */ fd = fd_open(buf, O_RDONLY); @@ -2066,21 +2342,22 @@ void init_angband(void) /* File type is "DATA" */ FILE_TYPE(FILE_TYPE_DATA); + /* Grab permissions */ + safe_setuid_grab(); + /* Create a new high score file */ fd = fd_make(buf, mode); + /* Drop permissions */ + safe_setuid_drop(); + /* Failure */ if (fd < 0) { char why[1024]; /* Message */ -#ifdef JP - sprintf(why, "'%s'¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤»¤ó!", buf); -#else - sprintf(why, "Cannot create the '%s' file!", buf); -#endif - + sprintf(why, _("'%s'ファイルを作成できません!", "Cannot create the '%s' file!"), buf); /* Crash and burn */ init_angband_aux(why); @@ -2090,81 +2367,49 @@ void init_angband(void) /* Close it */ (void)fd_close(fd); + put_title(); /*** Initialize some arrays ***/ /* Initialize misc. values */ -#ifdef JP -note("[ÊÑ¿ô¤ò½é´ü²½¤·¤Æ¤¤¤Þ¤¹...(¤½¤Î¾)"); -#else - note("[Initializing values... (misc)]"); -#endif - -#ifdef JP -if (init_misc()) quit("¤½¤Î¾¤ÎÊÑ¿ô¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó"); -#else - if (init_misc()) quit("Cannot initialize misc. values"); -#endif - + note(_("[変数を初期化しています...(その他)", "[Initializing values... (misc)]")); + if (init_misc()) quit(_("その他の変数を初期化できません", "Cannot initialize misc. values")); /* Initialize feature info */ #ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (ÃÏ·Á)]"); - if (init_f_info()) quit("ÃÏ·Á½é´ü²½ÉÔǽ"); + note("[データの初期化中... (地形)]"); + if (init_f_info()) quit("地形初期化不能"); + if (init_feat_variables()) quit("地形初期化不能"); #else note("[Initializing arrays... (features)]"); if (init_f_info()) quit("Cannot initialize features"); + if (init_feat_variables()) quit("Cannot initialize features"); #endif /* Initialize object info */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (¥¢¥¤¥Æ¥à)]"); - if (init_k_info()) quit("¥¢¥¤¥Æ¥à½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (objects)]"); - if (init_k_info()) quit("Cannot initialize objects"); -#endif + note(_("[データの初期化中... (アイテム)]", "[Initializing arrays... (objects)]")); + if (init_k_info()) quit(_("アイテム初期化不能", "Cannot initialize objects")); /* Initialize artifact info */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (ÅÁÀâ¤Î¥¢¥¤¥Æ¥à)]"); - if (init_a_info()) quit("ÅÁÀâ¤Î¥¢¥¤¥Æ¥à½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (artifacts)]"); - if (init_a_info()) quit("Cannot initialize artifacts"); -#endif + note(_("[データの初期化中... (伝説のアイテム)]", "[Initializing arrays... (artifacts)]")); + if (init_a_info()) quit(_("伝説のアイテム初期化不能", "Cannot initialize artifacts")); /* Initialize ego-item info */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (̾¤Î¤¢¤ë¥¢¥¤¥Æ¥à)]"); - if (init_e_info()) quit("̾¤Î¤¢¤ë¥¢¥¤¥Æ¥à½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (ego-items)]"); - if (init_e_info()) quit("Cannot initialize ego-items"); -#endif + note(_("[データの初期化中... (名のあるアイテム)]", "[Initializing arrays... (ego-items)]")); + if (init_e_info()) quit(_("名のあるアイテム初期化不能", "Cannot initialize ego-items")); /* Initialize monster info */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (¥â¥ó¥¹¥¿¡¼)]"); - if (init_r_info()) quit("¥â¥ó¥¹¥¿¡¼½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (monsters)]"); - if (init_r_info()) quit("Cannot initialize monsters"); -#endif + note(_("[データの初期化中... (モンスター)]", "[Initializing arrays... (monsters)]")); + if (init_r_info()) quit(_("モンスター初期化不能", "Cannot initialize monsters")); /* Initialize dungeon info */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (¥À¥ó¥¸¥ç¥ó)]"); - if (init_d_info()) quit("¥À¥ó¥¸¥ç¥ó½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (dungeon)]"); - if (init_d_info()) quit("Cannot initialize dungeon"); -#endif + note(_("[データの初期化中... (ダンジョン)]", "[Initializing arrays... (dungeon)]")); + if (init_d_info()) quit(_("ダンジョン初期化不能", "Cannot initialize dungeon")); { int i; for (i = 1; i < max_d_idx; i++) @@ -2173,110 +2418,51 @@ if (init_misc()) quit(" } /* Initialize magic info */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (ËâË¡)]"); - if (init_m_info()) quit("ËâË¡½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (magic)]"); - if (init_m_info()) quit("Cannot initialize magic"); -#endif + note(_("[データの初期化中... (魔法)]", "[Initializing arrays... (magic)]")); + if (init_m_info()) quit(_("魔法初期化不能", "Cannot initialize magic")); /* Initialize weapon_exp info */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (½ÏÎýÅÙ)]"); - if (init_s_info()) quit("½ÏÎýÅÙ½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (skill)]"); - if (init_s_info()) quit("Cannot initialize skill"); -#endif + note(_("[データの初期化中... (熟練度)]", "[Initializing arrays... (skill)]")); + if (init_s_info()) quit(_("熟練度初期化不能", "Cannot initialize skill")); /* Initialize wilderness array */ -#ifdef JP -note("[ÇÛÎó¤ò½é´ü²½¤·¤Æ¤¤¤Þ¤¹... (¹ÓÌî)]"); -#else - note("[Initializing arrays... (wilderness)]"); -#endif + note(_("[配列を初期化しています... (荒野)]", "[Initializing arrays... (wilderness)]")); -#ifdef JP -if (init_wilderness()) quit("¹ÓÌî¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó"); -#else - if (init_wilderness()) quit("Cannot initialize wilderness"); -#endif + if (init_wilderness()) quit(_("荒野を初期化できません", "Cannot initialize wilderness")); /* Initialize town array */ -#ifdef JP -note("[ÇÛÎó¤ò½é´ü²½¤·¤Æ¤¤¤Þ¤¹... (³¹)]"); -#else - note("[Initializing arrays... (towns)]"); -#endif - -#ifdef JP -if (init_towns()) quit("³¹¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó"); -#else - if (init_towns()) quit("Cannot initialize towns"); -#endif + note(_("[配列を初期化しています... (街)]", "[Initializing arrays... (towns)]")); + if (init_towns()) quit(_("街を初期化できません", "Cannot initialize towns")); /* Initialize building array */ -#ifdef JP -note("[ÇÛÎó¤ò½é´ü²½¤·¤Æ¤¤¤Þ¤¹... (·úʪ)]"); -#else - note("[Initializing arrays... (buildings)]"); -#endif - -#ifdef JP -if (init_buildings()) quit("·úʪ¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó"); -#else - if (init_buildings()) quit("Cannot initialize buildings"); -#endif + note(_("[配列を初期化しています... (建物)]", "[Initializing arrays... (buildings)]")); + if (init_buildings()) quit(_("建物を初期化できません", "Cannot initialize buildings")); /* Initialize quest array */ -#ifdef JP -note("[ÇÛÎó¤ò½é´ü²½¤·¤Æ¤¤¤Þ¤¹... (¥¯¥¨¥¹¥È)]"); -#else - note("[Initializing arrays... (quests)]"); -#endif - -#ifdef JP -if (init_quests()) quit("¥¯¥¨¥¹¥È¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó"); -#else - if (init_quests()) quit("Cannot initialize quests"); -#endif + note(_("[配列を初期化しています... (クエスト)]", "[Initializing arrays... (quests)]")); + if (init_quests()) quit(_("クエストを初期化できません", "Cannot initialize quests")); + /* Initialize vault info */ + if (init_v_info()) quit(_("vault 初期化不能", "Cannot initialize vaults")); /* Initialize some other arrays */ -#ifdef JP - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (¤½¤Î¾)]"); - if (init_other()) quit("¤½¤Î¾¤Î¥Ç¡¼¥¿½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (other)]"); - if (init_other()) quit("Cannot initialize other stuff"); -#endif + note(_("[データの初期化中... (その他)]", "[Initializing arrays... (other)]")); + if (init_other()) quit(_("その他のデータ初期化不能", "Cannot initialize other stuff")); /* Initialize some other arrays */ -#ifdef JP - /* translation */ - note("[¥Ç¡¼¥¿¤Î½é´ü²½Ãæ... (¥¢¥í¥±¡¼¥·¥ç¥ó)]"); - if (init_alloc()) quit("¥¢¥í¥±¡¼¥·¥ç¥ó¡¦¥¹¥¿¥Ã¥Õ½é´ü²½ÉÔǽ"); -#else - note("[Initializing arrays... (alloc)]"); - if (init_alloc()) quit("Cannot initialize alloc stuff"); -#endif + note(_("[データの初期化中... (アロケーション)]", "[Initializing arrays... (alloc)]")); + if (init_alloc()) quit(_("アロケーション・スタッフ初期化不能", "Cannot initialize alloc stuff")); /*** Load default user pref files ***/ /* Initialize feature info */ -#ifdef JP -note("[¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤ò½é´ü²½¤·¤Æ¤¤¤Þ¤¹...]"); -#else - note("[Initializing user pref files...]"); -#endif - + note(_("[ユーザー設定ファイルを初期化しています...]", "[Initializing user pref files...]")); /* Access the "basic" pref file */ strcpy(buf, "pref.prf"); @@ -2284,29 +2470,50 @@ note("[ /* Process that file */ process_pref_file(buf); - /* Access the "user" pref file */ - sprintf(buf, "user.prf"); - - /* Process that file */ - process_pref_file(buf); - /* Access the "basic" system pref file */ sprintf(buf, "pref-%s.prf", ANGBAND_SYS); /* Process that file */ process_pref_file(buf); - /* Access the "user" system pref file */ - sprintf(buf, "user-%s.prf", ANGBAND_SYS); - - /* Process that file */ - process_pref_file(buf); - /* Done */ -#ifdef JP - note("[½é´ü²½½ªÎ»]"); + note(_("[初期化終了]", "[Initialization complete]")); +} + +/*! + * @brief タイトル記述 + * @return なし + */ +static void put_title(void) +{ + char title[120]; + int col; +#if H_VER_EXTRA > 0 + sprintf(title, _("変愚蛮怒 %d.%d.%d.%d(%s)", "Hengband %d.%d.%d.%d(%s)"), H_VER_MAJOR, H_VER_MINOR, H_VER_PATCH, H_VER_EXTRA, #else - note("[Initialization complete]"); + sprintf(title, _("変愚蛮怒 %d.%d.%d(%s)", "Hengband %d.%d.%d(%s)"), H_VER_MAJOR, H_VER_MINOR, H_VER_PATCH, #endif + IS_STABLE_VERSION ? _("安定版", "Stable") : _("開発版", "Developing")); + col = (80 - strlen(title)) / 2; + col = col < 0 ? 0 : col; + prt(title, VER_INFO_ROW, col); +} +/*! + * @brief サムチェック情報を出力 / Get check sum in string form + * @return サムチェック情報の文字列 + */ +cptr get_check_sum(void) +{ + return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x", + f_head.v_extra, + k_head.v_extra, + a_head.v_extra, + e_head.v_extra, + r_head.v_extra, + d_head.v_extra, + m_head.v_extra, + s_head.v_extra, + v_head.v_extra); } +