OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] #37353 wand_effect()のインデント修正。 / Fix indent of wand_effect().
[hengband/hengband.git]
/
src
/
spells1.c
diff --git
a/src/spells1.c
b/src/spells1.c
index
141ee26
..
f23d6b4
100644
(file)
--- a/
src/spells1.c
+++ b/
src/spells1.c
@@
-17,6
+17,8
@@
#include "object-curse.h"
#include "player-damage.h"
#include "monsterrace-hook.h"
#include "object-curse.h"
#include "player-damage.h"
#include "monsterrace-hook.h"
+#include "melee.h"
+#include "world.h"
static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
@@
-248,7
+250,7
@@
static TERM_COLOR spell_color(int type)
SYMBOL_CODE c;
/* Lookup the default colors for this type */
SYMBOL_CODE c;
/* Lookup the default colors for this type */
- cptr s = quark_str(gf_color[type]);
+ c
onc
ptr s = quark_str(gf_color[type]);
if (!s) return (TERM_WHITE);
if (!s) return (TERM_WHITE);
@@
-723,7
+725,7
@@
static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
if (have_flag(f_ptr->flags, FF_TREE))
{
if (have_flag(f_ptr->flags, FF_TREE))
{
- cptr message;
+ c
onc
ptr message;
switch (typ)
{
case GF_POIS:
switch (typ)
{
case GF_POIS:
@@
-1261,7
+1263,7
@@
static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
BIT_FLAGS flgs[TR_FLAG_SIZE];
BIT_FLAGS flgs[TR_FLAG_SIZE];
-
char
o_name[MAX_NLEN];
+
GAME_TEXT
o_name[MAX_NLEN];
KIND_OBJECT_IDX k_idx = 0;
bool is_potion = FALSE;
KIND_OBJECT_IDX k_idx = 0;
bool is_potion = FALSE;
@@
-1282,7
+1284,7
@@
static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
bool ignore = FALSE;
bool do_kill = FALSE;
bool ignore = FALSE;
bool do_kill = FALSE;
- cptr note_kill = NULL;
+ c
onc
ptr note_kill = NULL;
#ifndef JP
/* Get the "plural"-ness */
#ifndef JP
/* Get the "plural"-ness */
@@
-1291,8
+1293,6
@@
static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
-
- /* Extract the flags */
object_flags(o_ptr, flgs);
/* Check for artifact */
object_flags(o_ptr, flgs);
/* Check for artifact */
@@
-1685,16
+1685,16
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
bool heal_leper = FALSE;
/* Hold the monster name */
bool heal_leper = FALSE;
/* Hold the monster name */
-
char m_name[80
];
+
GAME_TEXT m_name[MAX_NLEN
];
char m_poss[10];
PARAMETER_VALUE photo = 0;
/* Assume no note */
char m_poss[10];
PARAMETER_VALUE photo = 0;
/* Assume no note */
- cptr note = NULL;
+ c
onc
ptr note = NULL;
/* Assume a default death */
/* Assume a default death */
- cptr note_dies = extract_note_dies(real_r_idx(m_ptr));
+ c
onc
ptr note_dies = extract_note_dies(real_r_idx(m_ptr));
POSITION ty = m_ptr->fy;
POSITION tx = m_ptr->fx;
POSITION ty = m_ptr->fy;
POSITION tx = m_ptr->fx;
@@
-2565,8
+2565,8
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
else if (dam > 0)
{
int b = damroll(5, dam) / 4;
else if (dam > 0)
{
int b = damroll(5, dam) / 4;
- cptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
- cptr msg = _("あなたは%sの苦痛を%sに変換した!",
+ c
onc
ptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
+ c
onc
ptr msg = _("あなたは%sの苦痛を%sに変換した!",
(seen ? "You convert %s's pain into %s!" :
"You convert %ss pain into %s!"));
msg_format(msg, m_name, str);
(seen ? "You convert %s's pain into %s!" :
"You convert %ss pain into %s!"));
msg_format(msg, m_name, str);
@@
-4032,7
+4032,6
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
/* Special message */
if (see_s_msg)
{
/* Special message */
if (see_s_msg)
{
- /* Get the monster name */
monster_desc(killer, caster_ptr, 0);
msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
}
monster_desc(killer, caster_ptr, 0);
msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
}
@@
-4860,7
+4859,7
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
{
if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
{
- char m2_name[
80
];
+ char m2_name[
MAX_NLEN
];
monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
@@
-4900,11
+4899,9
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
if (((dam > 0) || get_angry) && !do_sleep)
anger_monster(m_ptr);
if (((dam > 0) || get_angry) && !do_sleep)
anger_monster(m_ptr);
- /* Take note */
if ((fear || do_fear) && seen)
{
sound(SOUND_FLEE);
if ((fear || do_fear) && seen)
{
sound(SOUND_FLEE);
-
msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
}
msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
}
@@
-4964,7
+4961,7
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
if (pet) mode |= PM_FORCE_PET;
else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
if (pet) mode |= PM_FORCE_PET;
else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
- count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode);
+ count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode
, '\0'
);
if (!one_in_(6)) break;
}
case 23: case 24: case 25:
if (!one_in_(6)) break;
}
case 23: case 24: case 25:
@@
-4979,7
+4976,7
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
int i = 0;
if (one_in_(13))
{
int i = 0;
if (one_in_(13))
{
- while (i <
6
)
+ while (i <
A_MAX
)
{
do
{
{
do
{
@@
-5005,7
+5002,7
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
{
p_ptr->health_who = c_ptr->m_idx;
p_ptr->redraw |= (PR_HEALTH);
{
p_ptr->health_who = c_ptr->m_idx;
p_ptr->redraw |= (PR_HEALTH);
-
redraw
_stuff();
+
handle
_stuff();
}
/* Verify this code */
}
/* Verify this code */
@@
-5056,8
+5053,6
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
/* Mark the item as fully known */
q_ptr->ident |= (IDENT_MENTAL);
/* Mark the item as fully known */
q_ptr->ident |= (IDENT_MENTAL);
-
- /* Drop it in the dungeon */
(void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
}
(void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
}
@@
-5094,10
+5089,10
@@
static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
* We return "TRUE" if any "obvious" effects were observed. XXX XXX Actually,
* we just assume that the effects were obvious, for historical reasons.
*/
* We return "TRUE" if any "obvious" effects were observed. XXX XXX Actually,
* we just assume that the effects were obvious, for historical reasons.
*/
-static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell)
+static bool project_p(MONSTER_IDX who, c
onc
ptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell)
{
int k = 0;
{
int k = 0;
-
int
rlev = 0;
+
DEPTH
rlev = 0;
/* Hack -- assume obvious */
bool obvious = TRUE;
/* Hack -- assume obvious */
bool obvious = TRUE;
@@
-5112,13
+5107,13
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
monster_type *m_ptr = NULL;
/* Monster name (for attacks) */
monster_type *m_ptr = NULL;
/* Monster name (for attacks) */
-
char m_name[80
];
+
GAME_TEXT m_name[MAX_NLEN
];
/* Monster name (for damage) */
char killer[80];
/* Hack -- messages */
/* Monster name (for damage) */
char killer[80];
/* Hack -- messages */
- cptr act = NULL;
+ c
onc
ptr act = NULL;
int get_damage = 0;
int get_damage = 0;
@@
-5191,12
+5186,8
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
if (who > 0)
{
if (who > 0)
{
- /* Get the source monster */
m_ptr = &m_list[who];
m_ptr = &m_list[who];
- /* Extract the monster level */
rlev = (((&r_info[m_ptr->r_idx])->level >= 1) ? (&r_info[m_ptr->r_idx])->level : 1);
rlev = (((&r_info[m_ptr->r_idx])->level >= 1) ? (&r_info[m_ptr->r_idx])->level : 1);
-
- /* Get the monster name */
monster_desc(m_name, m_ptr, 0);
/* Get the monster's real name (gotten before polymorph!) */
monster_desc(m_name, m_ptr, 0);
/* Get the monster's real name (gotten before polymorph!) */
@@
-5267,8
+5258,7
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
if (p_ptr->resist_pois) dam = (dam + 2) / 3;
if (double_resist) dam = (dam + 2) / 3;
if (p_ptr->resist_pois) dam = (dam + 2) / 3;
if (double_resist) dam = (dam + 2) / 3;
- if ((!(double_resist || p_ptr->resist_pois)) &&
- one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
+ if ((!(double_resist || p_ptr->resist_pois)) && one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
{
do_dec_stat(A_CON);
}
{
do_dec_stat(A_CON);
}
@@
-5369,9
+5359,7
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
(void)set_stun(p_ptr->stun + plus_stun);
}
(void)set_stun(p_ptr->stun + plus_stun);
}
- if (!(p_ptr->resist_fire ||
- IS_OPPOSE_FIRE() ||
- p_ptr->immune_fire))
+ if (!(p_ptr->resist_fire || IS_OPPOSE_FIRE() || p_ptr->immune_fire))
{
inven_damage(set_acid_destroy, 3);
}
{
inven_damage(set_acid_destroy, 3);
}
@@
-5645,13
+5633,9
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
msg_print(_("閃光のため非物質的な影の存在でいられなくなった。",
"The light forces you out of your incorporeal shadow form."));
msg_print(_("閃光のため非物質的な影の存在でいられなくなった。",
"The light forces you out of your incorporeal shadow form."));
- p_ptr->redraw |=
PR_MAP
;
+ p_ptr->redraw |=
(PR_MAP | PR_STATUS)
;
p_ptr->update |= (PU_MONSTERS);
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
p_ptr->update |= (PU_MONSTERS);
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
- /* Redraw status bar */
- p_ptr->redraw |= (PR_STATUS);
-
}
break;
}
break;
@@
-5723,7
+5707,7
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
msg_print(_("あなたは以前ほど力強くなくなってしまった...。",
"You're not as powerful as you used to be..."));
msg_print(_("あなたは以前ほど力強くなくなってしまった...。",
"You're not as powerful as you used to be..."));
- for (k = 0; k <
6
; k++)
+ for (k = 0; k <
A_MAX
; k++)
{
p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 7) / 8;
if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;
{
p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 7) / 8;
if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;
@@
-5946,9
+5930,7
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
learn_spell(monspell);
p_ptr->redraw |= (PR_MANA);
learn_spell(monspell);
p_ptr->redraw |= (PR_MANA);
-
- p_ptr->window |= (PW_PLAYER);
- p_ptr->window |= (PW_SPELL);
+ p_ptr->window |= (PW_PLAYER | PW_SPELL);
if (who > 0)
{
if (who > 0)
{
@@
-6171,7
+6153,7
@@
static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
if ((p_ptr->tim_eyeeye || hex_spelling(HEX_EYE_FOR_EYE))
&& (get_damage > 0) && !p_ptr->is_dead && (who > 0))
{
if ((p_ptr->tim_eyeeye || hex_spelling(HEX_EYE_FOR_EYE))
&& (get_damage > 0) && !p_ptr->is_dead && (who > 0))
{
-
char
m_name_self[80];
+
GAME_TEXT
m_name_self[80];
/* hisself */
monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
/* hisself */
monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
@@
-6235,27
+6217,13
@@
POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION
*/
bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
{
*/
bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
{
- /* Delta */
- POSITION dx, dy;
-
- /* Absolute */
- POSITION ax, ay;
-
- /* Signs */
- POSITION sx, sy;
-
- /* Fractions */
- POSITION qx, qy;
-
- /* Scanners */
- POSITION tx, ty;
-
- /* Scale factors */
- POSITION f1, f2;
-
- /* Slope, or 1/Slope, of LOS */
- POSITION m;
-
+ POSITION dx, dy; /* Delta */
+ POSITION ax, ay; /* Absolute */
+ POSITION sx, sy; /* Signs */
+ POSITION qx, qy; /* Fractions */
+ POSITION tx, ty; /* Scanners */
+ POSITION f1, f2; /* Scale factors */
+ POSITION m; /* Slope, or 1/Slope, of LOS */
/* Extract the offset */
dy = y2 - y1;
/* Extract the offset */
dy = y2 - y1;
@@
-6265,15
+6233,12
@@
bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
ay = ABS(dy);
ax = ABS(dx);
ay = ABS(dy);
ax = ABS(dx);
-
/* Handle adjacent (or identical) grids */
if ((ax < 2) && (ay < 2)) return (TRUE);
/* Handle adjacent (or identical) grids */
if ((ax < 2) && (ay < 2)) return (TRUE);
-
/* Paranoia -- require "safe" origin */
/* if (!in_bounds(y1, x1)) return (FALSE); */
/* Paranoia -- require "safe" origin */
/* if (!in_bounds(y1, x1)) return (FALSE); */
-
/* Directly South/North */
if (!dx)
{
/* Directly South/North */
if (!dx)
{
@@
-6324,12
+6289,10
@@
bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
return (TRUE);
}
return (TRUE);
}
-
/* Extract some signs */
sx = (dx < 0) ? -1 : 1;
sy = (dy < 0) ? -1 : 1;
/* Extract some signs */
sx = (dx < 0) ? -1 : 1;
sy = (dy < 0) ? -1 : 1;
-
/* Vertical "knights" */
if (ax == 1)
{
/* Vertical "knights" */
if (ax == 1)
{
@@
-6348,7
+6311,6
@@
bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
}
}
}
}
-
/* Calculate scale factor div 2 */
f2 = (ax * ay);
/* Calculate scale factor div 2 */
f2 = (ax * ay);
@@
-6740,7
+6702,7
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
bool jump = FALSE;
/* Attacker's name (prepared before polymorph)*/
bool jump = FALSE;
/* Attacker's name (prepared before polymorph)*/
-
char who_name[80
];
+
GAME_TEXT who_name[MAX_NLEN
];
/* Can the player see the source of this effect? */
bool see_s_msg = TRUE;
/* Can the player see the source of this effect? */
bool see_s_msg = TRUE;
@@
-6886,8
+6848,8
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
{
u16b p;
{
u16b p;
-
byte
a;
-
char
c;
+
TERM_COLOR
a;
+
SYMBOL_CODE
c;
/* Obtain the bolt pict */
p = bolt_pict(oy, ox, y, x, typ);
/* Obtain the bolt pict */
p = bolt_pict(oy, ox, y, x, typ);
@@
-6929,37
+6891,37
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
Term_xtra(TERM_XTRA_DELAY, msec);
}
}
Term_xtra(TERM_XTRA_DELAY, msec);
}
}
- if
(project_o(0,0,y,x,dam,GF_SEEKER))notice=
TRUE;
- if
(
is_mirror_grid(&cave[y][x]))
+ if
(project_o(0, 0, y, x, dam, GF_SEEKER))notice =
TRUE;
+ if
(
is_mirror_grid(&cave[y][x]))
{
{
- /* The target of monsterspell becomes tha mirror(broken) */
- monster_target_y
=(s16b)
y;
- monster_target_x
=(s16b)
x;
+
/* The target of monsterspell becomes tha mirror(broken) */
+ monster_target_y
=
y;
+ monster_target_x
=
x;
remove_mirror(y, x);
next_mirror(&oy, &ox, y, x);
remove_mirror(y, x);
next_mirror(&oy, &ox, y, x);
- path_n = i
+project_path(&(path_g[i+
1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
- for(j = last_i; j <= i; j++)
+ path_n = i
+ project_path(&(path_g[i +
1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
+ for
(j = last_i; j <= i; j++)
{
y = GRID_Y(path_g[j]);
x = GRID_X(path_g[j]);
{
y = GRID_Y(path_g[j]);
x = GRID_X(path_g[j]);
- if
(project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice=
TRUE;
- if
(!who && (project_m_n==1) && !jump )
{
-
if(cave[project_m_y][project_m_x].m_idx >0 )
{
- monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
+ if
(project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice =
TRUE;
+ if
(!who && (project_m_n == 1) && !jump)
{
+
if (cave[project_m_y][project_m_x].m_idx > 0)
{
+
monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
- if (m_ptr->ml)
- {
- /* Hack -- auto-recall */
- if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
+
if (m_ptr->ml)
+
{
+
/* Hack -- auto-recall */
+
if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
- /* Hack - auto-track */
- health_track(cave[project_m_y][project_m_x].m_idx);
+ /* Hack - auto-track */
+ health_track(cave[project_m_y][project_m_x].m_idx);
+ }
}
}
- }
}
}
- (void)project_f(0,
0,y,x,dam,
GF_SEEKER);
+ (void)project_f(0,
0, y, x, dam,
GF_SEEKER);
}
last_i = i;
}
}
last_i = i;
}
@@
-6969,10
+6931,10
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
POSITION py, px;
py = GRID_Y(path_g[i]);
px = GRID_X(path_g[i]);
POSITION py, px;
py = GRID_Y(path_g[i]);
px = GRID_X(path_g[i]);
- if(project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
+ if
(project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
notice = TRUE;
notice = TRUE;
- if
(!who && (project_m_n==1) && !jump )
{
- if(cave[project_m_y][project_m_x].m_idx > 0)
+ if
(!who && (project_m_n == 1) && !jump)
{
+ if
(cave[project_m_y][project_m_x].m_idx > 0)
{
monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
{
monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
@@
-7025,7
+6987,7
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
u16b p;
TERM_COLOR a;
u16b p;
TERM_COLOR a;
-
char
c;
+
SYMBOL_CODE
c;
/* Obtain the bolt pict */
p = bolt_pict(oy, ox, y, x, typ);
/* Obtain the bolt pict */
p = bolt_pict(oy, ox, y, x, typ);
@@
-7168,8
+7130,8
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
{
u16b p;
{
u16b p;
-
byte
a;
-
char
c;
+
TERM_COLOR
a;
+
SYMBOL_CODE
c;
/* Obtain the bolt pict */
p = bolt_pict(oy, ox, y, x, typ);
/* Obtain the bolt pict */
p = bolt_pict(oy, ox, y, x, typ);
@@
-7331,7
+7293,7
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
u16b p;
TERM_COLOR a;
u16b p;
TERM_COLOR a;
-
char
c;
+
SYMBOL_CODE
c;
drawn = TRUE;
drawn = TRUE;
@@
-7385,10
+7347,7
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
}
}
}
}
-
- /* Update stuff if needed */
- if (p_ptr->update) update_stuff();
-
+ update_creature(p_ptr);
if (flg & PROJECT_KILL)
{
if (flg & PROJECT_KILL)
{
@@
-7429,8
+7388,7
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
}
}
}
}
- /* Update stuff if needed */
- if (p_ptr->update) update_stuff();
+ update_creature(p_ptr);
/* Check objects */
if (flg & (PROJECT_ITEM))
/* Check objects */
if (flg & (PROJECT_ITEM))
@@
-7729,7
+7687,7
@@
bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
if (p_ptr->riding)
{
if (p_ptr->riding)
{
-
char m_name[80
];
+
GAME_TEXT m_name[MAX_NLEN
];
monster_desc(m_name, &m_list[p_ptr->riding], 0);
monster_desc(m_name, &m_list[p_ptr->riding], 0);