From f7274ebf7b56aecaebd2207582ce37879a47b697 Mon Sep 17 00:00:00 2001 From: Vsevolod Kozlov Date: Fri, 6 Nov 2009 19:20:53 +0300 Subject: Remove mons_friendly_real and mons_wont_attack_real. They were the same as non-_real functions. Signed-off-by: Robert Vollmert --- crawl-ref/source/arena.cc | 2 +- crawl-ref/source/beam.cc | 2 +- crawl-ref/source/effects.cc | 4 ++-- crawl-ref/source/fight.cc | 2 +- crawl-ref/source/menu.cc | 2 +- crawl-ref/source/mon-abil.cc | 4 ++-- crawl-ref/source/mon-act.cc | 12 ++++++------ crawl-ref/source/mon-behv.cc | 10 +++++----- crawl-ref/source/mon-cast.cc | 6 +++--- crawl-ref/source/mon-util.cc | 12 +----------- crawl-ref/source/mon-util.h | 2 -- crawl-ref/source/monster.cc | 4 ++-- crawl-ref/source/monstuff.cc | 2 +- crawl-ref/source/monstuff.h | 2 +- crawl-ref/source/showsymb.cc | 2 +- crawl-ref/source/tilepick.cc | 4 ++-- crawl-ref/source/tilesdl.cc | 2 +- 17 files changed, 31 insertions(+), 43 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index 91ee452b32..902407591f 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -145,7 +145,7 @@ namespace arena if (!mon->alive()) continue; - const bool friendly = mons_friendly_real(mon); + const bool friendly = mons_friendly(mon); // Set target to the opposite faction's home base. mon->target = friendly ? place_b : place_a; } diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 1b4426a890..95d2be232a 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -127,7 +127,7 @@ kill_category bolt::whose_kill() const if (!invalid_monster_index(beam_source)) { const monsters *mon = &menv[beam_source]; - if (mons_friendly_real(mon)) + if (mons_friendly(mon)) return (KC_FRIENDLY); } } diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index a8fdb4bc63..92fa7690d0 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -2454,7 +2454,7 @@ static void _set_friendly_foes(bool allow_patrol = false) for (int i = 0; i < MAX_MONSTERS; ++i) { monsters *mon(&menv[i]); - if (!mon->alive() || !mons_near(mon) || !mons_friendly_real(mon) + if (!mon->alive() || !mons_near(mon) || !mons_friendly(mon) || mon->mons_species() == MONS_GIANT_SPORE) { continue; @@ -2474,7 +2474,7 @@ static void _set_allies_patrol_point(bool clear = false) for (int i = 0; i < MAX_MONSTERS; ++i) { monsters *mon(&menv[i]); - if (!mon->alive() || !mons_near(mon) || !mons_friendly_real(mon)) + if (!mon->alive() || !mons_near(mon) || !mons_friendly(mon)) continue; // Berserking monsters cannot be ordered around. diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 3d96da7b96..524aabadd7 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4541,7 +4541,7 @@ void melee_attack::mons_do_napalm() else { napalm_monster(defender_as_monster(), - mons_friendly_real(attacker_as_monster()) ? + mons_friendly(attacker_as_monster()) ? KC_FRIENDLY : KC_OTHER, std::min(4, 1 + random2(attacker->get_experience_level())/2)); } diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index f9b6bb3dbf..2733d2c7ff 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -811,7 +811,7 @@ bool MonsterMenuEntry::get_tiles(std::vector& tileset) const } } - if (mons_friendly_real(m)) + if (mons_friendly(m)) tileset.push_back(tile_def(TILE_HEART, TEX_DEFAULT)); else if (mons_neutral(m)) tileset.push_back(tile_def(TILE_NEUTRAL, TEX_DEFAULT)); diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index cd5d2909ad..8bdf731281 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -644,7 +644,7 @@ static bool _orc_battle_cry(monsters *chief) // Disabling detailed frenzy announcement because it's so spammy. const msg_channel_type channel = - mons_friendly_real(chief) ? MSGCH_MONSTER_ENCHANT + mons_friendly(chief) ? MSGCH_MONSTER_ENCHANT : MSGCH_FRIEND_ENCHANT; if (!seen_affected.empty()) @@ -682,7 +682,7 @@ static bool _orc_battle_cry(monsters *chief) static bool _make_monster_angry(const monsters *mon, monsters *targ) { - if (mons_friendly_real(mon) != mons_friendly_real(targ)) + if (mons_friendly(mon) != mons_friendly(targ)) return (false); // targ is guaranteed to have a foe (needs_berserk checks this). diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 77afabed25..0c6c0648f9 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -121,7 +121,7 @@ static bool _swap_monsters(monsters* mover, monsters* moved) // A friendly or good-neutral monster moving past a fleeing hostile // or neutral monster, or vice versa. - if (mons_wont_attack_real(mover) == mons_wont_attack_real(moved) + if (mons_wont_attack(mover) == mons_wont_attack(moved) || mons_is_fleeing(mover) == mons_is_fleeing(moved)) { return (false); @@ -255,7 +255,7 @@ static bool _allied_monster_at(monsters *mon, coord_def a, coord_def b, // Hostile monsters of normal intelligence only move aside for // monsters of the same genus. - if (mons_intel(mon) <= I_NORMAL && !mons_wont_attack_real(mon) + if (mons_intel(mon) <= I_NORMAL && !mons_wont_attack(mon) && mons_genus(mon->type) != mons_genus(ally->type)) { continue; @@ -558,7 +558,7 @@ static void _handle_movement(monsters *monster) coord_def(-mmov.x, 0), coord_def(-mmov.x, 1)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(-mmov.x, 0)))) { @@ -576,7 +576,7 @@ static void _handle_movement(monsters *monster) coord_def(0, -mmov.y), coord_def(1, -mmov.y)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(0, -mmov.y)))) { @@ -595,7 +595,7 @@ static void _handle_movement(monsters *monster) coord_def(-mmov.x, 0), coord_def(-mmov.x, 1)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(-mmov.x, -mmov.y)))) { @@ -607,7 +607,7 @@ static void _handle_movement(monsters *monster) coord_def(0, -mmov.y), coord_def(1, -mmov.y)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(-mmov.x, -mmov.y)))) { diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index ae406d0e49..b511a9ffb3 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -1086,7 +1086,7 @@ void handle_behaviour(monsters *mon) bool changed = true; bool isFriendly = mons_friendly(mon); bool isNeutral = mons_neutral(mon); - bool wontAttack = mons_wont_attack_real(mon); + bool wontAttack = mons_wont_attack(mon); // Whether the player is in LOS of the monster and can see // or has guessed the player's location. @@ -1222,7 +1222,7 @@ void handle_behaviour(monsters *mon) // Friendly and good neutral monsters do not attack other friendly // and good neutral monsters. if (mon->foe != MHITNOT && mon->foe != MHITYOU - && wontAttack && mons_wont_attack_real(&menv[mon->foe])) + && wontAttack && mons_wont_attack(&menv[mon->foe])) { mon->foe = MHITNOT; } @@ -1617,7 +1617,7 @@ static bool _mons_check_foe(monsters *mon, const coord_def& p, // Choose random nearest monster as a foe. void _set_nearest_monster_foe(monsters *mon) { - const bool friendly = mons_friendly_real(mon); + const bool friendly = mons_friendly(mon); const bool neutral = mons_neutral(mon); for (int k = 1; k <= LOS_RADIUS; ++k) @@ -1660,7 +1660,7 @@ void behaviour_event(monsters *mon, mon_event_type event, int src, const beh_type old_behaviour = mon->behaviour; bool isSmart = (mons_intel(mon) > I_ANIMAL); - bool wontAttack = mons_wont_attack_real(mon); + bool wontAttack = mons_wont_attack(mon); bool sourceWontAttack = false; bool setTarget = false; bool breakCharm = false; @@ -1669,7 +1669,7 @@ void behaviour_event(monsters *mon, mon_event_type event, int src, if (src == MHITYOU) sourceWontAttack = true; else if (src != MHITNOT) - sourceWontAttack = mons_wont_attack_real( &menv[src] ); + sourceWontAttack = mons_wont_attack( &menv[src] ); if (is_sanctuary(mon->pos()) && mons_is_fleeing_sanctuary(mon)) { diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index a309df03b0..9e16f927b6 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -1282,7 +1282,7 @@ static int _monster_abjure_square(const coord_def &pos, return (0); if (!target->alive() - || ((bool)wont_attack == mons_wont_attack_real(target))) + || ((bool)wont_attack == mons_wont_attack(target))) { return (0); } @@ -1371,7 +1371,7 @@ static int _apply_radius_around_square( const coord_def &c, int radius, static int _monster_abjuration(const monsters *caster, bool actual) { - const bool wont_attack = mons_wont_attack_real(caster); + const bool wont_attack = mons_wont_attack(caster); int maffected = 0; if (actual) @@ -2478,7 +2478,7 @@ void mons_cast_noise(monsters *monster, bolt &pbolt, spell_type spell_cast) const msg_channel_type chan = (unseen ? MSGCH_SOUND : - mons_friendly_real(monster) ? MSGCH_FRIEND_SPELL + mons_friendly(monster) ? MSGCH_FRIEND_SPELL : MSGCH_MONSTER_SPELL); if (silent) diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 4dc815106d..f071fad698 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1979,11 +1979,6 @@ bool mons_friendly(const monsters *m) return (m->attitude == ATT_FRIENDLY || m->has_ench(ENCH_CHARM)); } -bool mons_friendly_real(const monsters *m) -{ - return (m->attitude == ATT_FRIENDLY || m->has_ench(ENCH_CHARM)); -} - bool mons_neutral(const monsters *m) { return (m->attitude == ATT_NEUTRAL || m->has_ench(ENCH_NEUTRAL) @@ -2011,11 +2006,6 @@ bool mons_wont_attack(const monsters *m) return (mons_friendly(m) || mons_good_neutral(m) || mons_strict_neutral(m)); } -bool mons_wont_attack_real(const monsters *m) -{ - return (mons_friendly_real(m) || mons_good_neutral(m) || mons_strict_neutral(m)); -} - bool mons_att_wont_attack(mon_attitude_type fr) { return (fr == ATT_FRIENDLY || fr == ATT_GOOD_NEUTRAL || fr == ATT_STRICT_NEUTRAL); @@ -2023,7 +2013,7 @@ bool mons_att_wont_attack(mon_attitude_type fr) mon_attitude_type mons_attitude(const monsters *m) { - if (mons_friendly_real(m)) + if (mons_friendly(m)) return ATT_FRIENDLY; else if (mons_good_neutral(m)) return ATT_GOOD_NEUTRAL; diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 60c7a5d1e7..ec09c7167b 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -609,13 +609,11 @@ bool mons_aligned(int m1, int m2); bool mons_atts_aligned(mon_attitude_type fr1, mon_attitude_type fr2); bool mons_friendly(const monsters *m); -bool mons_friendly_real(const monsters *m); bool mons_neutral(const monsters *m); bool mons_good_neutral(const monsters *m); bool mons_strict_neutral(const monsters *m); bool mons_is_pacified(const monsters *m); bool mons_wont_attack(const monsters *m); -bool mons_wont_attack_real(const monsters *m); bool mons_att_wont_attack(mon_attitude_type fr); mon_attitude_type mons_attitude(const monsters *m); diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 4d02e431b3..6c584297b3 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -3418,7 +3418,7 @@ int monsters::hurt(const actor *agent, int amount, beam_type flavour, // jelly). kill_category whose = (agent == NULL) ? KC_OTHER : (agent->atype() == ACT_PLAYER) ? KC_YOU : - mons_friendly_real((monsters*)agent) ? KC_FRIENDLY : + mons_friendly((monsters*)agent) ? KC_FRIENDLY : KC_OTHER; react_to_damage(amount, flavour, whose); } @@ -4985,7 +4985,7 @@ void monsters::scale_hp(int num, int den) kill_category monsters::kill_alignment() const { - return (mons_friendly_real(this) ? KC_FRIENDLY : KC_OTHER); + return (mons_friendly(this) ? KC_FRIENDLY : KC_OTHER); } bool monsters::sicken(int amount) diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 47306728ab..15c3bfd9ee 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2930,7 +2930,7 @@ bool simple_monster_message(const monsters *monster, const char *event, msg += event; msg = apostrophise_fixup(msg); - if (channel == MSGCH_PLAIN && mons_wont_attack_real(monster)) + if (channel == MSGCH_PLAIN && mons_wont_attack(monster)) channel = MSGCH_FRIEND_ACTION; mpr(msg.c_str(), channel, param); diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index 6b1de15f19..cd75d6b29f 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -48,7 +48,7 @@ public: || (x) == KILL_YOU_CONF) #define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE) -#define SAME_ATTITUDE(x) (mons_friendly_real(x) ? BEH_FRIENDLY : \ +#define SAME_ATTITUDE(x) (mons_friendly(x) ? BEH_FRIENDLY : \ mons_good_neutral(x) ? BEH_GOOD_NEUTRAL : \ mons_strict_neutral(x) ? BEH_STRICT_NEUTRAL : \ mons_neutral(x) ? BEH_NEUTRAL \ diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index c399bdbb48..a8ed747f6a 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -198,7 +198,7 @@ int get_mons_colour(const monsters *mons) if (mons->has_ench(ENCH_BERSERK)) col = RED; - if (mons_friendly_real(mons)) + if (mons_friendly(mons)) { col |= COLFLAG_FRIENDLY_MONSTER; } diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 47caa84e56..e1d910240f 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1055,7 +1055,7 @@ int tileidx_monster(const monsters *mons, bool detected) if (mons->has_ench(ENCH_STICKY_FLAME)) ch |= TILE_FLAG_FLAME; - if (mons_friendly_real(mons)) + if (mons_friendly(mons)) ch |= TILE_FLAG_PET; else if (mons_neutral(mons)) ch |= TILE_FLAG_NEUTRAL; @@ -4655,7 +4655,7 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground, bool detected) else if (!mon->is_named()) return; - if (pref != TAGPREF_NAMED && mons_friendly_real(mon)) + if (pref != TAGPREF_NAMED && mons_friendly(mon)) return; // HACK. Names cover up pan demons in a weird way. diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 6c0e103fcc..095ea2f1f7 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -1335,7 +1335,7 @@ void TilesFramework::update_minimap(int gx, int gy, map_feature f) else if (monster_at(gc) && f == MF_MONS_HOSTILE) { const monsters *mon = monster_at(gc); - if (mons_friendly_real(mon)) + if (mons_friendly(mon)) f = MF_MONS_FRIENDLY; else if (mons_neutral(mon)) f = MF_MONS_NEUTRAL; -- cgit v1.2.3-54-g00ecf