From 7358da8a134c7f9911e69e1ec6162e51aed82ed0 Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 26 Oct 2017 09:30:04 +0900 Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20=E5=9E=8B?= =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?= =?utf8?q?=E3=80=82=20/=20Ongoing=20type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 8 ++++---- src/object1.c | 2 +- src/snipe.c | 2 +- src/spells1.c | 4 ++-- src/spells2.c | 2 +- src/spells3.c | 2 +- src/types.h | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/externs.h b/src/externs.h index 7337d0ba0..847e20f33 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1091,12 +1091,12 @@ extern bool save_floor(saved_floor_type *sf_ptr, u32b mode); /* spells1.c */ extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2); -extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ); +extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int typ); extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell); extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ); extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg); extern int dist_to_line(int y, int x, int y1, int x1, int y2, int x2); -extern bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell); +extern bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell); extern int project_length; extern bool binding_field(int dam); extern void seal_of_mirror(int dam); @@ -1179,7 +1179,7 @@ extern bool tree_creation(void); extern bool glyph_creation(void); extern bool destroy_doors_touch(void); extern bool disarm_traps_touch(void); -extern bool animate_dead(int who, int y, int x); +extern bool animate_dead(MONSTER_IDX who, POSITION y, POSITION x); extern bool sleep_monsters_touch(void); extern bool activate_ty_curse(bool stop_ty, int *count); extern int activate_hi_summon(POSITION y, POSITION x, bool can_pet); @@ -1251,7 +1251,7 @@ extern bool identify_fully(bool only_equip); extern bool recharge(int num); extern bool bless_weapon(void); extern bool pulish_shield(void); -extern bool potion_smash_effect(int who, POSITION y, POSITION x, int k_idx); +extern bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OBJECT_IDX k_idx); extern void display_spell_list(void); extern s16b experience_of_spell(int spell, int realm); extern int mod_need_mana(int need_mana, int spell, int realm); diff --git a/src/object1.c b/src/object1.c index 66119b22a..b09175844 100644 --- a/src/object1.c +++ b/src/object1.c @@ -2081,7 +2081,7 @@ static void prepare_label_string(char *label, int mode) /* Move each label */ for (i = 0; i < 52; i++) { - int index; + COMMAND_CODE index; char c = alphabet_chars[i]; /* Find a tag with this label */ diff --git a/src/snipe.c b/src/snipe.c index b671f5327..12b07af3a 100644 --- a/src/snipe.c +++ b/src/snipe.c @@ -619,7 +619,7 @@ void do_cmd_snipe(void) */ void do_cmd_snipe_browse(void) { - int n = 0; + COMMAND_CODE n = 0; int j, line; char temp[62 * 4]; diff --git a/src/spells1.c b/src/spells1.c index 083cb0d35..4c83e3917 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -6544,7 +6544,7 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2) /* * breath shape */ -void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ) +void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int typ) { POSITION by = y1; POSITION bx = x1; @@ -6773,7 +6773,7 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *g * and "update_view()" and "update_monsters()" need to be called. * */ -bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell) +bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell) { int i, t, dist; diff --git a/src/spells2.c b/src/spells2.c index 3277ab704..e0559f553 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -5339,7 +5339,7 @@ bool sleep_monsters_touch(void) * @param x 起点X座標 * @return 作用が実際にあった場合TRUEを返す */ -bool animate_dead(int who, int y, int x) +bool animate_dead(MONSTER_IDX who, POSITION y, POSITION x) { int flg = PROJECT_ITEM | PROJECT_HIDE; return (project(who, 5, y, x, 0, GF_ANIM_DEAD, flg, -1)); diff --git a/src/spells3.c b/src/spells3.c index f6f4b88b5..ebcbf84dc 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -3482,7 +3482,7 @@ msg_format("%sは輝いた！", o_name); * o_ptr --- pointer to the potion object. * */ -bool potion_smash_effect(int who, POSITION y, POSITION x, int k_idx) +bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OBJECT_IDX k_idx) { int radius = 2; int dt = 0; diff --git a/src/types.h b/src/types.h index 8f5aaa049..8f8042f01 100644 --- a/src/types.h +++ b/src/types.h @@ -455,13 +455,13 @@ struct cave_type { u16b info; /* Hack -- cave flags */ - IDX feat; /* Hack -- feature type */ - IDX o_idx; /* Object in this grid */ + FEAT_IDX feat; /* Hack -- feature type */ + OBJECT_IDX o_idx; /* Object in this grid */ MONSTER_IDX m_idx; /* Monster in this grid */ s16b special; /* Special cave info */ - s16b mimic; /* Feature to mimic */ + FEAT_IDX mimic; /* Feature to mimic */ byte cost; /* Hack -- cost of flowing */ byte dist; /* Hack -- distance from player */ @@ -515,7 +515,7 @@ typedef struct object_type object_type; struct object_type { - IDX k_idx; /* Kind index (zero if "dead") */ + KIND_OBJECT_IDX k_idx; /* Kind index (zero if "dead") */ POSITION iy; /* Y-position on map, or zero */ POSITION ix; /* X-position on map, or zero */ -- 2.11.0