diff options
Diffstat (limited to 'hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch')
-rw-r--r-- | hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch b/hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch deleted file mode 100644 index a03a172..0000000 --- a/hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8618c68bafe113d8c6e301e8eb23d7df2292d91d Mon Sep 17 00:00:00 2001 -From: Chaosvolt <chaosvolt@users.noreply.github.com> -Date: Tue, 9 Jan 2024 17:56:09 -0600 -Subject: [PATCH] fix: monsters ignore mechs that aren't being piloted (#4083) - ---- - src/monster.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/monster.cpp b/src/monster.cpp -index 5cadb78107f..1c8c755f760 100644 ---- a/src/monster.cpp -+++ b/src/monster.cpp -@@ -1223,6 +1223,10 @@ Attitude monster::attitude_to( const Creature &other ) const - if( m == this ) { - return Attitude::A_FRIENDLY; - } -+ // Ignore inactive mechs -+ if( m->has_flag( MF_RIDEABLE_MECH ) && !m->has_effect( effect_ridden ) ) { -+ return Attitude::A_NEUTRAL; -+ } - - static const string_id<monfaction> faction_zombie( "zombie" ); - auto faction_att = faction.obj().attitude( m->faction ); --- -2.43.0 - |