* </pre>
*/
-
#include "angband.h"
+#include "melee.h"
#include "trap.h"
-/*!
- * @brief プレイヤーからモンスターへの射撃命中判定 /
- * Determine if the player "hits" a monster (normal combat).
- * @param chance 基本命中値
- * @param m_ptr モンスターの構造体参照ポインタ
- * @param vis 目標を視界に捕らえているならばTRUEを指定
- * @param o_name メッセージ表示時のモンスター名
- * @return 命中と判定された場合TRUEを返す
- * @note Always miss 5%, always hit 5%, otherwise random.
- */
-bool test_hit_fire(int chance, monster_type *m_ptr, int vis, char* o_name)
-{
- int k, ac;
- monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
- /* Percentile dice */
- k = randint1(100);
-
- /* Snipers with high-concentration reduce instant miss percentage.*/
- k += p_ptr->concent;
-
- /* Hack -- Instant miss or hit */
- if (k <= 5) return (FALSE);
- if (k > 95) return (TRUE);
-
- if (p_ptr->pseikaku == SEIKAKU_NAMAKE)
- if (one_in_(20)) return (FALSE);
-
- /* Never hit */
- if (chance <= 0) return (FALSE);
-
- ac = r_ptr->ac;
- if (p_ptr->concent)
- {
- ac *= (8 - p_ptr->concent);
- ac /= 8;
- }
-
- if(m_ptr->r_idx == MON_GOEMON && !MON_CSLEEP(m_ptr)) ac *= 3;
-
- /* Invisible monsters are harder to hit */
- if (!vis) chance = (chance + 1) / 2;
-
- /* Power competes against armor */
- if (randint0(chance) < (ac * 3 / 4))
- {
- if(m_ptr->r_idx == MON_GOEMON && !MON_CSLEEP(m_ptr))
- {
- char m_name[80];
-
- /* Extract monster name */
- monster_desc(m_name, m_ptr, 0);
- msg_format(_("%sは%sを斬り捨てた！", "%s cuts down %s!"), m_name, o_name);
- }
- return (FALSE);
- }
-
- /* Assume hit */
- return (TRUE);
-}
-
-
-
-
-/*!
- * @brief プレイヤーからモンスターへの射撃クリティカル判定 /
- * Critical hits (from objects thrown by player) Factor in item weight, total plusses, and player level.
- * @param weight 矢弾の重量
- * @param plus_ammo 矢弾の命中修正
- * @param plus_bow 弓の命中修正
- * @param dam 現在算出中のダメージ値
- * @return クリティカル修正が入ったダメージ値
- */
-HIT_POINT critical_shot(int weight, int plus_ammo, int plus_bow, HIT_POINT dam)
-{
- int i, k;
- object_type *j_ptr = &inventory[INVEN_BOW];
-
- /* Extract "shot" power */
- i = p_ptr->to_h_b + plus_ammo;
-
- if (p_ptr->tval_ammo == TV_BOLT)
- i = (p_ptr->skill_thb + (p_ptr->weapon_exp[0][j_ptr->sval] / 400 + i) * BTH_PLUS_ADJ);
- else
- i = (p_ptr->skill_thb + ((p_ptr->weapon_exp[0][j_ptr->sval] - (WEAPON_EXP_MASTER / 2)) / 200 + i) * BTH_PLUS_ADJ);
-
-
- /* Snipers can shot more critically with crossbows */
- if (p_ptr->concent) i += ((i * p_ptr->concent) / 5);
- if ((p_ptr->pclass == CLASS_SNIPER) && (p_ptr->tval_ammo == TV_BOLT)) i *= 2;
-
- /* Good bow makes more critical */
- i += plus_bow * 8 * (p_ptr->concent ? p_ptr->concent + 5 : 5);
-
- /* Critical hit */
- if (randint1(10000) <= i)
- {
- k = weight * randint1(500);
-
- if (k < 900)
- {
- msg_print(_("手ごたえがあった！", "It was a good hit!"));
- dam += (dam / 2);
- }
- else if (k < 1350)
- {
- msg_print(_("かなりの手ごたえがあった！", "It was a great hit!"));
- dam *= 2;
- }
- else
- {
- msg_print(_("会心の一撃だ！", "It was a superb hit!"));
- dam *= 3;
- }
- }
-
- return (dam);
-}
-
-
-
-
/*!
* @brief プレイヤー攻撃の種族スレイング倍率計算
* Note that most brands and slays are x3, except Slay Animal (x2),\n
* Slay Evil (x2), and Kill dragon (x5).\n
*/
-s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown)
+HIT_POINT tot_dam_aux(object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown)
{
MULTIPLY mult = 10;
BIT_FLAGS flgs[TR_FLAG_SIZE];
-
- /* Extract the flags */
object_flags(o_ptr, flgs);
torch_flags(o_ptr, flgs); /* torches has secret flags */
{
OBJECT_IDX this_o_idx, next_o_idx = 0;
cave_type *c_ptr;
-
- /* Access the grid */
c_ptr = &cave[y][x];
/* Invisible trap */
/* Pick a trap */
disclose_grid(y, x);
- /* Message */
msg_print(_("トラップを発見した。", "You have found a trap."));
- /* Disturb */
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
/* Secret door */
if (is_hidden_door(c_ptr))
{
- /* Message */
msg_print(_("隠しドアを発見した。", "You have found a secret door."));
/* Disclose */
disclose_grid(y, x);
- /* Disturb */
- disturb(0, 0);
+ disturb(FALSE, FALSE);
}
/* Scan all objects in the grid */
for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
-
- /* Acquire object */
o_ptr = &o_list[this_o_idx];
/* Acquire next object */
/* Identify once */
if (!object_is_known(o_ptr))
{
- /* Message */
msg_print(_("箱に仕掛けられたトラップを発見した！", "You have discovered a trap on the chest!"));
/* Know the trap */
object_known(o_ptr);
/* Notice it */
- disturb(0, 0);
+ disturb(FALSE, FALSE);
}
}
}
* Add the given dungeon object to the character's inventory.\n
* Delete the object afterwards.\n
*/
-void py_pickup_aux(int o_idx)
+void py_pickup_aux(OBJECT_IDX o_idx)
{
- int slot;
+ INVENTORY_IDX slot;
#ifdef JP
- char o_name[MAX_NLEN];
- char old_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
+ GAME_TEXT old_name[MAX_NLEN];
char kazu_str[80];
int hirottakazu;
#else
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
#endif
object_type *o_ptr;
o_ptr = &o_list[o_idx];
#ifdef JP
- /* Describe the object */
object_desc(old_name, o_ptr, OD_NAME_ONLY);
object_desc_kosuu(kazu_str, o_ptr);
hirottakazu = o_ptr->number;
/* Get the object again */
o_ptr = &inventory[slot];
- /* Delete the object */
delete_object_idx(o_idx);
if (p_ptr->pseikaku == SEIKAKU_MUNCHKIN)
if (o_ptr->marked & OM_AUTODESTROY) return;
}
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
- /* Message */
#ifdef JP
if ((o_ptr->name1 == ART_CRIMSON) && (p_ptr->pseikaku == SEIKAKU_COMBAT))
{
{
cave_type *c_ptr = &cave[p_ptr->y][p_ptr->x];
- s16b this_o_idx, next_o_idx = 0;
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
/* Recenter the map around the player */
verify_panel();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD);
-
- /* Handle stuff */
handle_stuff();
/* Automatically pickup/destroy/inscribe items */
autopick_pickup_items(c_ptr);
-
-#ifdef ALLOW_EASY_FLOOR
-
if (easy_floor)
{
py_pickup_floor(pickup);
return;
}
-#endif /* ALLOW_EASY_FLOOR */
-
/* Scan the pile of objects */
for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
-
- /* Acquire object */
o_ptr = &o_list[this_o_idx];
#ifdef ALLOW_EASY_SENSE /* TNB */
#endif /* ALLOW_EASY_SENSE -- TNB */
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
/* Hack -- disturb */
- disturb(0, 0);
+ disturb(FALSE, FALSE);
/* Pick up gold */
if (o_ptr->tval == TV_GOLD)
/* Delete the gold */
delete_object_idx(this_o_idx);
- /* Message */
msg_format(_(" $%ld の価値がある%sを見つけた。", "You collect %ld gold pieces worth of %s."),
(long)value, o_name);
/* Redraw gold */
p_ptr->redraw |= (PR_GOLD);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
}
/* Clear the flag. */
o_ptr->marked &= ~OM_NOMSG;
}
- /* Describe the object */
else if (!pickup)
{
msg_format(_("%sがある。", "You see %s."), o_name);
* @param n_x プレイヤーの移動先X座標
* @return 移動処理が可能である場合（可能な場合に選択した場合）TRUEを返す。
*/
-bool pattern_seq(int c_y, int c_x, int n_y, int n_x)
+bool pattern_seq(POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x)
{
feature_type *cur_f_ptr = &f_info[cave[c_y][c_x].feat];
feature_type *new_f_ptr = &f_info[cave[n_y][n_x].feat];
* @param mode 移動に関するオプションフラグ
* @return 移動可能ならばTRUEを返す
*/
-bool player_can_enter(s16b feature, u16b mode)
+bool player_can_enter(FEAT_IDX feature, BIT_FLAGS16 mode)
{
feature_type *f_ptr = &f_info[feature];
if (p_ptr->riding) return monster_can_cross_terrain(feature, &r_info[m_list[p_ptr->riding].r_idx], mode | CEM_RIDING);
- /* Pattern */
if (have_flag(f_ptr->flags, FF_PATTERN))
{
if (!(mode & CEM_P_CAN_ENTER_PATTERN)) return FALSE;
}
- /* "CAN" flags */
if (have_flag(f_ptr->flags, FF_CAN_FLY) && p_ptr->levitation) return TRUE;
if (have_flag(f_ptr->flags, FF_CAN_SWIM) && p_ptr->can_swim) return TRUE;
if (have_flag(f_ptr->flags, FF_CAN_PASS) && p_ptr->pass_wall) return TRUE;
* @param mpe_mode 移動オプションフラグ
* @return プレイヤーが死亡やフロア離脱を行わず、実際に移動が可能ならばTRUEを返す。
*/
-bool move_player_effect(POSITION ny, POSITION nx, u32b mpe_mode)
+bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
{
cave_type *c_ptr = &cave[ny][nx];
feature_type *f_ptr = &f_info[c_ptr->feat];
POSITION oy = p_ptr->y;
POSITION ox = p_ptr->x;
cave_type *oc_ptr = &cave[oy][ox];
- IDX om_idx = oc_ptr->m_idx;
- IDX nm_idx = c_ptr->m_idx;
+ MONSTER_IDX om_idx = oc_ptr->m_idx;
+ MONSTER_IDX nm_idx = c_ptr->m_idx;
/* Move the player */
p_ptr->y = ny;
monster_type *om_ptr = &m_list[om_idx];
om_ptr->fy = ny;
om_ptr->fx = nx;
- update_mon(om_idx, TRUE);
+ update_monster(om_idx, TRUE);
}
if (nm_idx > 0) /* Monster on new spot */
monster_type *nm_ptr = &m_list[nm_idx];
nm_ptr->fy = oy;
nm_ptr->fx = ox;
- update_mon(nm_idx, TRUE);
+ update_monster(nm_idx, TRUE);
}
}
- /* Redraw old spot */
lite_spot(oy, ox);
-
- /* Redraw new spot */
lite_spot(ny, nx);
/* Check for new panel (redraw map) */
{
forget_flow();
- /* Mega-Hack -- Forget the view */
p_ptr->update |= (PU_UN_VIEW);
-
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
}
- /* Update stuff */
p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_DISTANCE);
-
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
/* Remove "unsafe" flag */
/* For get everything when requested hehe I'm *NASTY* */
if (dun_level && (d_info[dungeon_type].flags1 & DF1_FORGET)) wiz_dark();
-
- /* Handle stuff */
if (mpe_mode & MPE_HANDLE_STUFF) handle_stuff();
if (p_ptr->pclass == CLASS_NINJA)
/* Handle "store doors" */
if (have_flag(f_ptr->flags, FF_STORE))
{
- /* Disturb */
- disturb(0, 1);
+ disturb(FALSE, TRUE);
p_ptr->energy_use = 0;
/* Hack -- Enter store */
/* Handle "building doors" -KMW- */
else if (have_flag(f_ptr->flags, FF_BLDG))
{
- /* Disturb */
- disturb(0, 1);
+ disturb(FALSE, TRUE);
p_ptr->energy_use = 0;
/* Hack -- Enter building */
/* Handle quest areas -KMW- */
else if (have_flag(f_ptr->flags, FF_QUEST_ENTER))
{
- /* Disturb */
- disturb(0, 1);
+ disturb(FALSE, TRUE);
p_ptr->energy_use = 0;
/* Hack -- Enter quest level */
/* Set off a trap */
else if (have_flag(f_ptr->flags, FF_HIT_TRAP) && !(mpe_mode & MPE_STAYING))
{
- /* Disturb */
- disturb(0, 1);
+ disturb(FALSE, TRUE);
/* Hidden trap */
if (c_ptr->mimic || have_flag(f_ptr->flags, FF_SECRET))
{
- /* Message */
msg_print(_("トラップだ！", "You found a trap!"));
/* Pick a trap */
msg_print(_("* 注意:この先はトラップの感知範囲外です！ *", "*Leaving trap detect region!*"));
}
- if (disturb_trap_detect) disturb(0, 1);
+ if (disturb_trap_detect) disturb(FALSE, TRUE);
}
}
* @param feat 地形ID
* @return トラップが自動的に無効ならばTRUEを返す
*/
-bool trap_can_be_ignored(int feat)
+bool trap_can_be_ignored(FEAT_IDX feat)
{
feature_type *f_ptr = &f_info[feat];
monster_type *riding_m_ptr = &m_list[p_ptr->riding];
monster_race *riding_r_ptr = &r_info[p_ptr->riding ? riding_m_ptr->r_idx : 0]; /* Paranoia */
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
bool p_can_enter = player_can_enter(c_ptr->feat, CEM_P_CAN_ENTER_PATTERN);
bool p_can_kill_walls = FALSE;
msg_print(_("動けない！", "Can't move!"));
p_ptr->energy_use = 0;
oktomove = FALSE;
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
else if (MON_MONFEAR(riding_m_ptr))
{
- char steed_name[80];
-
- /* Acquire the monster name */
+ GAME_TEXT steed_name[MAX_NLEN];
monster_desc(steed_name, riding_m_ptr, 0);
-
- /* Dump a message */
msg_format(_("%sが恐怖していて制御できない。", "%^s is too scared to control."), steed_name);
oktomove = FALSE;
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
else if (p_ptr->riding_ryoute)
{
oktomove = FALSE;
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
else if (have_flag(f_ptr->flags, FF_CAN_FLY) && (riding_r_ptr->flags7 & RF7_CAN_FLY))
{
msg_format(_("%sの上に行けない。", "Can't swim."), f_name + f_info[get_feat_mimic(c_ptr)].name);
p_ptr->energy_use = 0;
oktomove = FALSE;
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
else if (!have_flag(f_ptr->flags, FF_WATER) && (riding_r_ptr->flags7 & RF7_AQUATIC))
{
msg_format(_("%sから上がれない。", "Can't land."), f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name);
p_ptr->energy_use = 0;
oktomove = FALSE;
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
else if (have_flag(f_ptr->flags, FF_LAVA) && !(riding_r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK))
{
msg_format(_("%sの上に行けない。", "Too hot to go through."), f_name + f_info[get_feat_mimic(c_ptr)].name);
p_ptr->energy_use = 0;
oktomove = FALSE;
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
if (oktomove && MON_STUNNED(riding_m_ptr) && one_in_(2))
{
- char steed_name[80];
+ GAME_TEXT steed_name[MAX_NLEN];
monster_desc(steed_name, riding_m_ptr, 0);
msg_format(_("%sが朦朧としていてうまく動けない！", "You cannot control stunned %s!"), steed_name);
oktomove = FALSE;
- disturb(0, 1);
+ disturb(FALSE, TRUE);
}
}
if ((p_ptr->pclass != CLASS_RANGER) && !p_ptr->levitation && (!p_ptr->riding || !(riding_r_ptr->flags8 & RF8_WILD_WOOD))) p_ptr->energy_use *= 2;
}
-#ifdef ALLOW_EASY_DISARM /* TNB */
/* Disarm a visible trap */
else if ((do_pickup != easy_disarm) && have_flag(f_ptr->flags, FF_DISARM) && !c_ptr->mimic)
}
}
-#endif /* ALLOW_EASY_DISARM -- TNB */
/* Player can not walk through "walls" unless in wraith form...*/
else if (!p_can_enter && !p_can_kill_walls)
{
/* Feature code (applying "mimic" field) */
- s16b feat = get_feat_mimic(c_ptr);
+ FEAT_IDX feat = get_feat_mimic(c_ptr);
feature_type *mimic_f_ptr = &f_info[feat];
- cptr name = f_name + mimic_f_ptr->name;
+ concptr name = f_name + mimic_f_ptr->name;
oktomove = FALSE;
/* Wall (or secret door) */
else
{
-#ifdef ALLOW_EASY_OPEN
/* Closed doors */
if (easy_open && is_closed_door(feat) && easy_open_door(y, x)) return;
-#endif /* ALLOW_EASY_OPEN */
#ifdef JP
msg_format("%sが行く手をはばんでいる。", name);
}
}
- /* Disturb the player */
- disturb(0, 1);
+ disturb(FALSE, TRUE);
- /* Sound */
if (!boundary_floor(c_ptr, f_ptr, mimic_f_ptr)) sound(SOUND_HITWALL);
}
}
/* To avoid a loop with running */
- disturb(0, 1);
+ disturb(FALSE, TRUE);
oktomove = FALSE;
}
p_ptr->update |= (PU_FLOW);
}
- /* Sound */
/* sound(SOUND_WALK); */
-#ifdef ALLOW_EASY_DISARM /* TNB */
-
if (do_pickup != always_pickup) mpe_mode |= MPE_DO_PICKUP;
-
-#else /* ALLOW_EASY_DISARM -- TNB */
-
- if (do_pickup) mpe_mode |= MPE_DO_PICKUP;
-
-#endif /* ALLOW_EASY_DISARM -- TNB */
-
if (break_trap) mpe_mode |= MPE_BREAK_TRAP;
/* Move the player */
* @param x 移動元のX座標
* @return 移動先が既知の壁ならばTRUE
*/
-static int see_wall(int dir, int y, int x)
+static bool see_wall(DIRECTION dir, POSITION y, POSITION x)
{
- cave_type *c_ptr;
+ cave_type *c_ptr;
/* Get the new location */
y += ddy[dir];
* @param x 移動元のX座標
* @return 移動先が未知の地形ならばTRUE
*/
-static int see_nothing(int dir, int y, int x)
+static bool see_nothing(DIRECTION dir, POSITION y, POSITION x)
{
/* Get the new location */
y += ddy[dir];
}
-
-
-
-
/*
* Hack -- allow quick "cycling" through the legal directions
*/
-static byte cycle[] =
-{ 1, 2, 3, 6, 9, 8, 7, 4, 1, 2, 3, 6, 9, 8, 7, 4, 1 };
+static byte cycle[] = { 1, 2, 3, 6, 9, 8, 7, 4, 1, 2, 3, 6, 9, 8, 7, 4, 1 };
/*
* Hack -- map each direction into the "middle" of the "cycle[]" array
*/
-static byte chome[] =
-{ 0, 8, 9, 10, 7, 0, 11, 6, 5, 4 };
+static byte chome[] = { 0, 8, 9, 10, 7, 0, 11, 6, 5, 4 };
/*
* The direction we are running
static bool find_breakright;
static bool find_breakleft;
-
-
/*!
* @brief ダッシュ処理の導入 /
* Initialize the running algorithm for a new direction.
* \#x\# \@x\#\n
* \@\@p. p\n
*/
-static void run_init(int dir)
+static void run_init(DIRECTION dir)
{
- int row, col, deepleft, deepright;
- int i, shortleft, shortright;
-
+ int row, col, deepleft, deepright;
+ int i, shortleft, shortright;
/* Save the direction */
find_current = dir;
*/
static bool run_test(void)
{
- int prev_dir, new_dir, check_dir = 0;
- int row, col;
- int i, max, inv;
- int option = 0, option2 = 0;
- cave_type *c_ptr;
- s16b feat;
+ DIRECTION prev_dir, new_dir, check_dir = 0;
+ int row, col;
+ int i, max, inv;
+ int option = 0, option2 = 0;
+ cave_type *c_ptr;
+ FEAT_IDX feat;
feature_type *f_ptr;
/* Where we came from */
/* Look at every newly adjacent square. */
for (i = -max; i <= max; i++)
{
- s16b this_o_idx, next_o_idx = 0;
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
/* New direction */
new_dir = cycle[chome[prev_dir] + i];
for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
-
- /* Acquire object */
o_ptr = &o_list[this_o_idx];
/* Acquire next object */
* @param dir 移動を試みる方向ID
* @return なし
*/
-void run_step(int dir)
+void run_step(DIRECTION dir)
{
/* Start running */
if (dir)
{
sound(SOUND_HITWALL);
- /* Message */
msg_print(_("その方向には走れません。", "You cannot run in that direction."));
- /* Disturb */
- disturb(0, 0);
+ disturb(FALSE, FALSE);
- /* Done */
return;
}
- /* Initialize */
run_init(dir);
}
/* Update run */
if (run_test())
{
- /* Disturb */
- disturb(0, 0);
+ disturb(FALSE, FALSE);
- /* Done */
return;
}
}
p_ptr->energy_use = 100;
/* Move the player, using the "pickup" flag */
-#ifdef ALLOW_EASY_DISARM /* TNB */
-
move_player(find_current, FALSE, FALSE);
-#else /* ALLOW_EASY_DISARM -- TNB */
-
- move_player(find_current, always_pickup, FALSE);
-
-#endif /* ALLOW_EASY_DISARM -- TNB */
-
if (player_bold(p_ptr->run_py, p_ptr->run_px))
{
p_ptr->run_py = 0;
p_ptr->run_px = 0;
- disturb(0, 0);
+ disturb(FALSE, FALSE);
}
}
* @brief トラベル機能の判定処理 /
* Test for traveling
* @param prev_dir 前回移動を行った元の方角ID
- * @return なし
+ * @return 次の方向
*/
-static int travel_test(int prev_dir)
+static DIRECTION travel_test(DIRECTION prev_dir)
{
- int new_dir = 0;
+ DIRECTION new_dir = 0;
int i, max;
const cave_type *c_ptr;
int cost;
for (i = -max; i <= max; i++)
{
/* New direction */
- int dir = cycle[chome[prev_dir] + i];
+ DIRECTION dir = cycle[chome[prev_dir] + i];
/* New location */
- int row = p_ptr->y + ddy[dir];
- int col = p_ptr->x + ddx[dir];
+ POSITION row = p_ptr->y + ddy[dir];
+ POSITION col = p_ptr->x + ddx[dir];
/* Access grid */
c_ptr = &cave[row][col];
/* Get travel direction */
travel.dir = travel_test(travel.dir);
- /* disturb */
if (!travel.dir)
{
if (travel.run == 255)
msg_print(_("道筋が見つかりません！", "No route is found!"));
travel.y = travel.x = 0;
}
- disturb(0, 1);
+ disturb(FALSE, TRUE);
return;
}
OSDN Git Service
