From 43e1595cc651201b79b03b2aa4add18ad009cabe Mon Sep 17 00:00:00 2001 From: ChthonVII Date: Wed, 23 Jun 2021 11:14:27 +0900 Subject: [PATCH] oops! forgot to save file before last commit --- REDALERT/.INFANTRY.CPP.kate-swp | Bin 2066 -> 0 bytes REDALERT/INFANTRY.CPP | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 REDALERT/.INFANTRY.CPP.kate-swp diff --git a/REDALERT/.INFANTRY.CPP.kate-swp b/REDALERT/.INFANTRY.CPP.kate-swp deleted file mode 100644 index 0ee04697ece048fe04d65410493635735d264176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2066 zcmbu=%W@Jy6b9g7VHpUy7!x(#LZaplLk5tGMjZ*MqO@FyrKP(8W&+Ah7!uw3Ccc9k zA3$Hmm3y`9zcW++F=iL4sN$Q`efo5BX2vj#xhIbACTd5{AhF->xCtwjHVk9F@#ggp zyZPyR^mB6O+uNsmUwI_VpeLrGWFk;X#(Tz z1}yU3gjYC!2`v7VDdEmHBZWMnwJ{*k;^<8*~O1y_SVV{WFrvQumMOfU6C0NYAcVhf~_#M~Vg+(hofW>+bVbKbYV6lH27ULho1LiNo zqMkkYi17+MWIMp>Ru4N1!z(1R?Q!y{$yKuOIjED1;`Y__Ud#6fqmpSJwEfn&o@(^F z=8KkVk4A2{-uY+`yH3+FUpl>Zr{g5c{oebrJ2VI5PRGn<(xw{TZTlm$;N`8NXB9JE z#GrJaT29YlGsU%8`m3C zw@A2f5DtlRh%$;}n&4!8YT{H*JvEUW<73rei#k_zWHaz$M181S%Xse9t lH=6LA8iOuJ&3M7$4YYVXJY+<)Df;XSia-$9JyX+F{sO|sV1fVu diff --git a/REDALERT/INFANTRY.CPP b/REDALERT/INFANTRY.CPP index 635a59eb4..427354ec3 100644 --- a/REDALERT/INFANTRY.CPP +++ b/REDALERT/INFANTRY.CPP @@ -4091,7 +4091,8 @@ void InfantryClass::Movement_AI(void) /* ** Scatter infantry off buildings in guard modes. */ - if (!IsTethered && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord].Cell_Building() != NULL) { + // Chthon CFE Note: bugfix missing IsActive check, as per https://github.com/TheAssemblyArmada/Vanilla-Conquer/pull/430 + if (IsActive && !IsTethered && (Mission == MISSION_GUARD || Mission == MISSION_GUARD_AREA) && MissionQueue == MISSION_NONE && Map[Coord].Cell_Building() != NULL) { Scatter(0, true, true); }