#include "angband.h"
#include "init.h"
+#include "trap.h"
+#include "rooms.h"
#ifndef MACINTOSH
#ifdef CHECK_MODIFICATION_TIME
/* Allow "fat binary" usage with NeXT */
if (TRUE)
{
- cptr next = NULL;
+ concptr next = NULL;
# if defined(m68k)
next = "m68k";
/*!
* エラーメッセージの名称定義 / Standard error message text
*/
-cptr err_str[PARSE_ERROR_MAX] =
+concptr err_str[PARSE_ERROR_MAX] =
{
NULL,
#ifdef JP
* @param template_file ファイル名
* @return テキストの方が新しいか、rawファイルがなく更新の必要がある場合-1、更新の必要がない場合0。
*/
-static errr check_modification_date(int fd, cptr template_file)
+static errr check_modification_date(int fd, concptr template_file)
{
char buf[1024];
* 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,
+static errr init_info(concptr filename, header *head,
void **info, char **name, char **text, char **tag)
{
int fd;
/* Errors */
if (err)
{
- cptr oops;
+ concptr oops;
#ifdef JP
/* Error string */
oops = (((err > 0) && (err < PARSE_ERROR_MAX)) ? err_str[err] : "未知の");
- /* Oops */
msg_format("'%s.txt'ファイルの %d 行目にエラー。", filename, error_line);
msg_format("レコード %d は '%s' エラーがあります。", error_idx, oops);
msg_format("構文 '%s'。", buf);
/* Error string */
oops = (((err > 0) && (err < PARSE_ERROR_MAX)) ? err_str[err] : "unknown");
- /* Oops */
msg_format("Error %d at line %d of '%s.txt'.", err, error_line, filename);
msg_format("Record %d contains a '%s' error.", error_idx, oops);
msg_format("Parsing '%s'.", buf);
if (fd >= 0)
{
/* Dump it */
- fd_write(fd, (cptr)(head), head->head_size);
+ fd_write(fd, (concptr)(head), head->head_size);
/* Dump the "*_info" array */
fd_write(fd, head->info_ptr, head->info_size);
* Initialize quest array
* @return 地形ID
*/
-s16b f_tag_to_index_in_init(cptr str)
+s16b f_tag_to_index_in_init(concptr str)
{
- s16b feat = f_tag_to_index(str);
+ FEAT_IDX feat = f_tag_to_index(str);
if (feat < 0) feat_tag_is_not_found = TRUE;
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_heavy_cold_zone = f_tag_to_index_in_init("HEAVY_COLD_ZONE");
+ feat_cold_zone = f_tag_to_index_in_init("COLD_ZONE");
+ feat_heavy_electrical_zone = f_tag_to_index_in_init("HEAVY_ELECTRICAL_ZONE");
+ feat_electrical_zone = f_tag_to_index_in_init("ELECTRICAL_ZONE");
+ feat_deep_acid_puddle = f_tag_to_index_in_init("DEEP_ACID_PUDDLE");
+ feat_shallow_acid_puddle = f_tag_to_index_in_init("SHALLOW_ACID_PUDDLE");
+ feat_deep_poisonous_puddle = f_tag_to_index_in_init("DEEP_POISONOUS_PUDDLE");
+ feat_shallow_poisonous_puddle = f_tag_to_index_in_init("SHALLOW_POISONOUS_PUDDLE");
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");
/*** Prepare the various "bizarre" arrays ***/
/* Macro variables */
- C_MAKE(macro__pat, MACRO_MAX, cptr);
- C_MAKE(macro__act, MACRO_MAX, cptr);
+ C_MAKE(macro__pat, MACRO_MAX, concptr);
+ C_MAKE(macro__act, MACRO_MAX, concptr);
C_MAKE(macro__cmd, MACRO_MAX, bool);
/* Macro action buffer */
* Window 1 : Display messages
* Window 2 : Display inven/equip
*/
- window_flag[1] = 1L << 6;
+ window_flag[1] = 1L << A_MAX;
window_flag[2] = 1L << 0;
* Hack -- take notes on line 23
* @return なし
*/
-static void note(cptr str)
+static void note(concptr str)
{
Term_erase(0, 23, 255);
Term_putstr(20, 23, -1, TERM_WHITE, str);
* @return なし
* @note
* <pre>
- * XXX XXX XXX This function is "messy" because various things
+ * 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.
* </pre>
*/
-static void init_angband_aux(cptr why)
+static void init_angband_aux(concptr why)
{
/* Why */
plog(why);
* @return なし
* @note
* <pre>
- * XXX XXX XXX This function is "messy" because various things
+ * 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
{
char why[1024];
- /* Message */
sprintf(why, _("'%s'ファイルにアクセスできません!", "Cannot access the '%s' file!"), buf);
/* Crash and burn */
/*** Display the "news" file ***/
-
- /* Clear screen */
Term_clear();
/* Build the filename */
{
char why[1024];
- /* Message */
sprintf(why, _("'%s'ファイルを作成できません!", "Cannot create the '%s' file!"), buf);
/* Crash and burn */
/* Process that file */
process_pref_file(buf);
- /* Done */
note(_("[初期化終了]", "[Initialization complete]"));
}
* @brief サムチェック情報を出力 / Get check sum in string form
* @return サムチェック情報の文字列
*/
-cptr get_check_sum(void)
+concptr get_check_sum(void)
{
return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x",
f_head.v_extra,