#37287 (2.2.0.40) cmd1.c内のC4457警告に対応。 / Deal C4457 warning in cmd1.c.

[hengband/hengband.git] / src / externs.h

diff --git a/src/externs.h b/src/externs.h
index ed1a520..486ea09 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1,16 +1,14 @@
-/* File: externs.h */
-
-/*
+/*!
+ * @file externs.h
+ * @brief Angband(変愚蛮怒)基本関数、グローバル変数ヘッダファイル / 
+ * extern declarations (variables and functions)
+ * @date 2014/08/08
+ * @author
  * Copyright (c) 1997 Ben Harrison
- *
+ * @details
  * 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.
- */
-
-/* Purpose: extern declarations (variables and functions) */
-
-/*
  * Note that some files have their own header files
  * (z-virt.h, z-util.h, z-form.h, term.h, random.h)
  */
@@ -19,7 +17,6 @@
 /*
  * Automatically generated "variable" declarations
  */
-
 extern int max_macrotrigger;
 extern cptr macro_template;
 extern cptr macro_modifier_chr;
@@ -159,7 +156,6 @@ extern s16b command_see;
 extern s16b command_gap;
 extern s16b command_wrk;
 extern s16b command_new;
-extern s16b energy_use;
 extern bool msg_flag;
 extern s16b running;
 extern s16b resting;
@@ -398,15 +394,12 @@ extern bool closing_flag;
 extern s16b panel_row_min, panel_row_max;
 extern s16b panel_col_min, panel_col_max;
 extern s16b panel_col_prt, panel_row_prt;
-extern int py;
-extern int px;
 extern s16b target_who;
 extern s16b target_col;
 extern s16b target_row;
 extern int player_uid;
 extern int player_euid;
 extern int player_egid;
-extern char player_name[32];
 extern char player_base[32];
 extern char savefile[1024];
 extern char savefile_base[40];
@@ -964,6 +957,7 @@ extern bool are_enemies(monster_type *m_ptr1, monster_type *m_ptr2);
 extern bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr);
 extern bool monster_living(monster_race *r_ptr);
 extern bool no_questor_or_bounty_uniques(int r_idx);
+extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char* msg);
 
 
 /* monster2.c */
@@ -1286,7 +1280,7 @@ extern bool polymorph_monster(int y, int x);
 extern bool dimension_door(void);
 extern bool mirror_tunnel(void);
 extern bool summon_kin_player(int level, int y, int x, u32b mode);
-extern void massacre(int py, int px);
+extern void massacre(void);
 
 /* store.c */
 extern bool combine_and_reorder_home(int store_num);
@@ -1298,7 +1292,6 @@ extern void move_to_black_market(object_type * o_ptr);
 
 /* bldg.c */
 extern bool get_nightmare(int r_idx);
-extern void have_nightmare(int r_idx);
 extern void battle_monsters(void);
 extern void do_cmd_bldg(void);
 extern void do_cmd_quest(void);
@@ -1306,7 +1299,7 @@ extern void quest_discovery(int q_idx);
 extern int quest_number(int level);
 extern int random_quest_number(int level);
 extern bool tele_town(void);
-extern s16b calc_crit_ratio_shot(int weight, int plus_ammo,int plus_bow, int dam);
+extern s16b calc_crit_ratio_shot(int plus_ammo,int plus_bow);
 extern s16b calc_expect_crit_shot(int weight, int plus_ammo,int plus_bow, int dam);
 extern s16b calc_expect_crit(int weight, int plus, int dam, s16b meichuu, bool dokubari);
 
@@ -1554,7 +1547,7 @@ extern void race_score(int race_num);
 extern void show_highclass(void);
 
 /* mind.c */
-extern mind_power mind_powers[5];
+extern mind_power const mind_powers[5];
 extern void mindcraft_info(char *p, int use_mind, int power);
 extern void do_cmd_mind(void);
 extern void do_cmd_mind_browse(void);
@@ -1597,6 +1590,9 @@ extern void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, int mode);
 extern bool spell_learnable(int m_idx);
 extern int monspell_to_player(int SPELL_NUM, int y, int x, int m_idx);
 extern int monspell_to_monster(int SPELL_NUM, int y, int x, int m_idx, int t_idx);
+extern int monspell_damage(int SPELL_NUM, int m_idx, int TYPE);
+extern int monspell_race_damage(int SPELL_NUM, int r_idx, int TYPE);
+extern int monspell_bluemage_damage(int SPELL_NUM, int plev, int TYPE);
 
 /* hissatsu.c */
 extern void hissatsu_info(char *p, int power);
@@ -1759,6 +1755,7 @@ extern void sjis2euc(char *str);
 extern void euc2sjis(char *str);
 extern byte codeconv(char *str);
 extern bool iskanji2(cptr s, int x);
+extern void guess_convert_to_system_encoding(char* strbuf, int buflen);
 #endif
 
 #ifdef WORLD_SCORE
@@ -1819,4 +1816,3 @@ extern void revenge_store(int dam);
 extern bool teleport_barrier(int m_idx);
 extern bool magic_barrier(int m_idx);
 extern bool multiply_barrier(int m_idx);
-