hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

August patch integration: Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection

Browse Source
This commit is contained in:
Justin Marshall
2020-08-06 15:35:00 -07:00
parent a2e06b5c48 ae72fce5dd
commit d7243e8265
33 changed files with 473 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/foot.cpp
+13 -1
View File
@@ -1741,7 +1741,19 @@ int FootClass::Mission_Enter(void)
** Since there is no potential object to enter, then abort this
** mission with some default standby mission.
*/
Enter_Idle_Mode();
if (MissionQueue == MISSION_NONE) {
/*
** If this is a harvester, then return to harvesting.
** Set a hacky target so we know to skip to the proper state.
*/
if (What_Am_I() == RTTI_UNIT && ((UnitClass*)this)->Class->IsToHarvest) {
Assign_Mission(MISSION_HARVEST);
Assign_Target(As_Target());
Assign_Destination(TARGET_NONE);
} else {
Enter_Idle_Mode();
}
}
}
return(MissionControl[Mission].Normal_Delay() + Random_Pick(0, 2));