summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/acr.cc2
-rw-r--r--crawl-ref/source/beam.cc2
-rw-r--r--crawl-ref/source/effects.cc2
-rw-r--r--crawl-ref/source/fight.cc2
-rw-r--r--crawl-ref/source/misc.cc2
-rw-r--r--crawl-ref/source/mon-abil.cc2
-rw-r--r--crawl-ref/source/mon-act.cc14
-rw-r--r--crawl-ref/source/mon-cast.cc2
-rw-r--r--crawl-ref/source/mon-info.cc2
-rw-r--r--crawl-ref/source/mon-util.cc5
-rw-r--r--crawl-ref/source/mon-util.h1
-rw-r--r--crawl-ref/source/monster.cc4
-rw-r--r--crawl-ref/source/monstuff.cc6
-rw-r--r--crawl-ref/source/traps.cc4
-rw-r--r--crawl-ref/source/xom.cc4
15 files changed, 24 insertions, 30 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index f7c244e801..02ee5a3772 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3072,7 +3072,7 @@ static bool _untrap_target(const coord_def move, bool check_confused)
monsters* mon = monster_at(target);
if (mon && player_can_hit_monster(mon))
{
- if (mons_is_caught(mon) && mons_friendly(mon)
+ if (mon->caught() && mons_friendly(mon)
&& player_can_open_doors() && !you.confused())
{
const std::string prompt =
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 6ad38c53f5..48a28d0076 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3060,7 +3060,7 @@ void bolt::drop_object()
monsters* m = monster_at(pos());
// Player or monster at position is caught in net.
if (you.pos() == pos() && you.attribute[ATTR_HELD]
- || m && mons_is_caught(m))
+ || m && m->caught())
{
// If no trapping net found mark this one.
if (get_trapping_net(pos(), true) == NON_ITEM)
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 1ba8d89aa7..3ea777daa9 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -4218,7 +4218,7 @@ void update_level(double elapsedTime)
}
// Handle nets specially to remove the trapping property of the net.
- if (mons_is_caught(mon))
+ if (mon->caught())
mon->del_ench(ENCH_HELD, true);
_catchup_monster_moves(mon, turns);
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 3d88c58563..003b546b59 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -313,7 +313,7 @@ unchivalric_attack_type is_unchivalric_attack(const actor *attacker,
unchivalric = UCAT_INVISIBLE;
// held in a net
- if (def && mons_is_caught(def))
+ if (def && def->caught())
unchivalric = UCAT_HELD_IN_NET;
// petrifying
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 55650b1041..9f10f2ad3c 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -3295,7 +3295,7 @@ void swap_with_monster(monsters *mon_to_swap)
return;
}
- const bool mon_caught = mons_is_caught(&mon);
+ const bool mon_caught = mon.caught();
const bool you_caught = you.attribute[ATTR_HELD];
// If it was submerged, it surfaces first.
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 7152d78eed..680c86f02d 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -1048,7 +1048,7 @@ bool mon_special_ability(monsters *monster, bolt & beem)
case MONS_KILLER_KLOWN:
case MONS_PRINCE_RIBBIT:
case MONS_GOLDEN_EYE:
- if (one_chance_in(7) || mons_is_caught(monster) && one_chance_in(3))
+ if (one_chance_in(7) || monster->caught() && one_chance_in(3))
used = monster_blink(monster);
break;
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index ffa34a4804..09f3a93c80 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -537,7 +537,7 @@ static void _handle_movement(monsters *monster)
|| monster_at(newpos) && monster->foe == mgrd(newpos))
&& mons_intel(monster) >= I_ANIMAL
&& coinflip()
- && !mons_is_confused(monster) && !mons_is_caught(monster)
+ && !mons_is_confused(monster) && !monster->caught()
&& !monster->has_ench(ENCH_BERSERK))
{
// If the monster is moving parallel to the x or y axis, check
@@ -821,7 +821,7 @@ static bool _handle_scroll(monsters *monster)
case SCR_TELEPORTATION:
if (!monster->has_ench(ENCH_TP))
{
- if (mons_is_caught(monster) || mons_is_fleeing(monster)
+ if (monster->caught() || mons_is_fleeing(monster)
|| mons_is_pacified(monster))
{
simple_monster_message(monster, " reads a scroll.");
@@ -833,7 +833,7 @@ static bool _handle_scroll(monsters *monster)
break;
case SCR_BLINKING:
- if (mons_is_caught(monster) || mons_is_fleeing(monster)
+ if (monster->caught() || mons_is_fleeing(monster)
|| mons_is_pacified(monster))
{
if (mons_near(monster))
@@ -997,7 +997,7 @@ static bool _handle_wand(monsters *monster, bolt &beem)
case WAND_TELEPORTATION:
if (monster->hit_points <= monster->max_hit_points / 2
- || mons_is_caught(monster))
+ || monster->caught())
{
if (!monster->has_ench(ENCH_TP)
&& !one_chance_in(20))
@@ -1850,7 +1850,7 @@ static void _handle_monster_move(monsters *monster)
}
}
- if (mons_is_caught(monster))
+ if (monster->caught())
{
// Struggling against the net takes time.
_swim_or_move_energy(monster);
@@ -1976,7 +1976,7 @@ static void _handle_monster_move(monsters *monster)
}
}
- if (!mons_is_caught(monster))
+ if (!monster->caught())
{
if (monster->pos() + mmov == you.pos())
{
@@ -2207,7 +2207,7 @@ static bool _monster_eat_item(monsters *monster, bool nearby)
hps_changed += (quant * item_mass(*si)) / 20 + quant;
eaten += quant;
- if (mons_is_caught(monster)
+ if (monster->caught()
&& si->base_type == OBJ_MISSILES
&& si->sub_type == MI_THROWING_NET
&& item_is_stationary(*si))
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index 0c78d3e7ef..cd1ae62f50 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -940,7 +940,7 @@ bool handle_mon_spell(monsters *monster, bolt &beem)
// Monsters caught in a net try to get away.
// This is only urgent if enemies are around.
if (!finalAnswer && mon_enemies_around(monster)
- && mons_is_caught(monster) && one_chance_in(4))
+ && monster->caught() && one_chance_in(4))
{
for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)
{
diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc
index 619a89d4e4..767f49c4a8 100644
--- a/crawl-ref/source/mon-info.cc
+++ b/crawl-ref/source/mon-info.cc
@@ -149,7 +149,7 @@ bool monster_info::less_than(const monster_info& m1,
static std::string _verbose_info(const monsters* m)
{
- if (mons_is_caught(m))
+ if (m->caught())
return (" (caught)");
if (mons_behaviour_perceptible(m))
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 80bfe7ac0e..a7739075c3 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -2078,11 +2078,6 @@ bool mons_is_confused(const monsters *m, bool class_too)
&& (class_too || !mons_class_flag(m->type, M_CONFUSED)));
}
-bool mons_is_caught(const monsters *m)
-{
- return (m->has_ench(ENCH_HELD));
-}
-
bool mons_is_wandering(const monsters *m)
{
return (m->behaviour == BEH_WANDER);
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 88a544a8a8..90e61393a9 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -624,7 +624,6 @@ bool mons_is_native_in_branch(const monsters *monster,
const branch_type branch = you.where_are_you);
bool mons_is_poisoner(const monsters *mon);
bool mons_is_confused(const monsters *m, bool class_too = false);
-bool mons_is_caught(const monsters *m);
bool mons_is_wandering(const monsters *m);
bool mons_is_seeking(const monsters *m);
bool mons_is_fleeing(const monsters *m);
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index a06fd2e94b..f8ef9febe5 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -1591,7 +1591,7 @@ bool monsters::pickup_missile(item_def &item, int near, bool force)
if (item.sub_type == MI_THROWING_NET)
{
// Monster may not pick up trapping net.
- if (mons_is_caught(this) && item_is_stationary(item))
+ if (this->caught() && item_is_stationary(item))
return (false);
}
else // None of these exceptions hold for throwing nets.
@@ -2782,7 +2782,7 @@ bool monsters::haloed() const
bool monsters::caught() const
{
- return (mons_is_caught(this));
+ return this->has_ench(ENCH_HELD);
}
int monsters::shield_bonus() const
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 661e7c62d6..a3a67393b9 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -2311,7 +2311,7 @@ bool monster_polymorph(monsters *monster, monster_type targetc,
const int old_hp = monster->hit_points;
const int old_hp_max = monster->max_hit_points;
- const bool old_mon_caught = mons_is_caught(monster);
+ const bool old_mon_caught = monster->caught();
const char old_ench_countdown = monster->ench_countdown;
mon_enchant abj = monster->get_ench(ENCH_ABJ);
@@ -2641,7 +2641,7 @@ bool swap_check(monsters *monster, coord_def &loc, bool quiet)
return (false);
}
- if (mons_is_caught(monster))
+ if (monster->caught())
{
if (!quiet)
simple_monster_message(monster, " is held in a net!");
@@ -3667,7 +3667,7 @@ void monster_teleport(monsters *monster, bool instan, bool silent)
void mons_clear_trapping_net(monsters *mon)
{
- if (!mons_is_caught(mon))
+ if (!mon->caught())
return;
const int net = get_trapping_net(mon->pos());
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 3db80ac806..54d20dbf56 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -257,7 +257,7 @@ void monster_caught_in_net(monsters *mon, bolt &pbolt)
return;
}
- if (!mons_is_caught(mon) && mon->add_ench(ENCH_HELD))
+ if (!mon->caught() && mon->add_ench(ENCH_HELD))
{
if (mons_near(mon) && !mon->visible_to(&you))
mpr("Something gets caught in the net!");
@@ -578,7 +578,7 @@ void trap_def::trigger(actor& triggerer, bool flat_footed)
item_def item = this->generate_trap_item();
copy_item_to_grid(item, triggerer.pos());
- if (mons_is_caught(m))
+ if (m->caught())
mark_net_trapping(m->pos());
trap_destroyed = true;
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 05a51fcc82..d6ab40cecc 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1480,8 +1480,8 @@ static bool _swap_monsters(monsters *m1, monsters *m2)
monsters& mon1(*m1);
monsters& mon2(*m2);
- const bool mon1_caught = mons_is_caught(&mon1);
- const bool mon2_caught = mons_is_caught(&mon2);
+ const bool mon1_caught = mon1.caught();
+ const bool mon2_caught = mon2.caught();
const coord_def mon1_pos = mon1.pos();
const coord_def mon2_pos = mon2.pos();
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-12 21:43:33 +0000