Some changes to q-move and attack move for aircraft. Another attempt …

…to kill the crash bug with MIGs.
ChthonVII · Jun 24, 2022 · cafa23c · cafa23c
1 parent 403da38
commit cafa23c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 18 deletions.
diff --git a/REDALERT/AIRCRAFT.CPP b/REDALERT/AIRCRAFT.CPP
@@ -793,7 +793,7 @@ int AircraftClass::Mission_Hunt(void)
 						}
 						Fire_At(targ, 0);
 
-                        // Chthon CFE Note: rank 3 MIGS/Yals fire two missiles per ammo pip (fudge this by restoring 1 ammo between shots) (check for two-shooter in case it's removed via rules.ini edit)
+                        // Chthon CFE Note: rank 3 MIGS/Yaks fire two missiles per ammo pip (fudge this by restoring 1 ammo between shots) (check for two-shooter in case it's removed via rules.ini edit)
                         if ((VeterancyRank == 3) && ((*this == AIRCRAFT_MIG) || (*this == AIRCRAFT_YAK)) && Class->Is_Two_Shooter()){
                             Ammo++;
                         }
@@ -1807,16 +1807,16 @@ int AircraftClass::Mission_Move(void)
 				if (distance < 0x00C0) {
                     // Make q-moves work
                     if (HasNavQueue()){
-                        if (AttackMove && !Ammo){
-                            //Memorize_Navigation_List();
-                            Clear_Navigation_List();
-                        }
-                        else {
+                        //if (AttackMove && !Ammo){
+                            ////Memorize_Navigation_List();
+                            //Clear_Navigation_List();
+                        //}
+                        //else {
                             Assign_Destination(TARGET_NONE);
                             Assign_Target(TARGET_NONE);
                             Enter_Idle_Mode();
                             return(1);
-                        }
+                        //}
                     }
 
                     // Attack Move rework by ChthonVII -- If we're reached the destination, exit attack move and go home
@@ -1909,7 +1909,7 @@ int AircraftClass::Mission_Move(void)
 		case VALIDATE_LZ:
 			// Attack Move rework by ChthonVII -- If "smarter aircraft" mode is also enabled, don't attack move if you don't have any ammo to start with
             if (AttackMove && ActiveCFEPatchConfig.EnableSmarterAircraft && !IsALoaner && !Ammo){
-                //Memorize_Navigation_List();
+                Memorize_Navigation_List();
                 ResetAttackMove();
                 Clear_Navigation_List();
                 Enter_Idle_Mode();
@@ -1962,15 +1962,15 @@ int AircraftClass::Mission_Move(void)
 
                     // Make q-moves work
                     if (HasNavQueue()){
-                        if (AttackMove && !Ammo){
-                            //Memorize_Navigation_List();
-                            Clear_Navigation_List();
-                        } else {
+                        //if (AttackMove && !Ammo){
+                            ////Memorize_Navigation_List();
+                            //Clear_Navigation_List();
+                        //} else {
                             Assign_Destination(TARGET_NONE);
                             Assign_Target(TARGET_NONE);
                             Enter_Idle_Mode();
                             return(1);
-                        }
+                        //}
                     }
 
                     // Attack Move rework by ChthonVII -- helicopters should go home at the end of an attack-move rather than landing
@@ -2064,10 +2064,23 @@ void AircraftClass::Enter_Idle_Mode(bool )
     }
     */
     if (!Target_Legal(NavCom)){
-        if (Handle_Navigation_List()){
-            Assign_Mission(MISSION_MOVE);
-            Commence();
-            return;
+        if (!AttackMove || Ammo){ // if attackmove but no ammo, then fall through to next block to memorize and clear queue
+            if (Handle_Navigation_List()){
+                Assign_Mission(MISSION_MOVE);
+                if (!IsLanding && !IsTakingOff){
+                    Commence();
+                    // if already airborn, change status to skip takeoff
+                    if (Height == FLIGHT_LEVEL){
+                        if (Class->IsFixedWing){
+                            Status = 1; //FLY_TOWARD_TARGET
+                        }
+                        //else { // helicopters still need to validate LZ
+                        //    Status = 2; //FLY_TO_LZ
+                        //}
+                    }
+                }
+                return;
+            }
         }
     }
 

diff --git a/REDALERT/AIRCRAFT.H b/REDALERT/AIRCRAFT.H
@@ -194,7 +194,7 @@ class AircraftClass : public FootClass, public FlyClass
 		*/
 		bool Passenger;
 
-	private:
+	//private: // Chthon CFE Note: these need to be public so we can check them from elsewhere 
 
 		/*
 		**	Aircraft can be in either state of landing, taking off, or in steady altitude.
@@ -205,6 +205,8 @@ class AircraftClass : public FootClass, public FlyClass
 		unsigned IsLanding:1;
 		unsigned IsTakingOff:1;
 
+    private:
+
 		/*
 		**	It is very common for aircraft to be homing in on a target. When this flag is
 		**	true, the aircraft will constantly adjust its facing toward the TarCom. When the

diff --git a/REDALERT/TECHNO.CPP b/REDALERT/TECHNO.CPP
@@ -7799,6 +7799,23 @@ void TechnoClass::AttackMoveEnterMoveMode(){
     //if (Is_Foot()){
         //((FootClass*)this)->SkipNavQueueUpdate = false; // OK to process the nav queue when we go idle because move mode ends .
     //}
+    // aircraft can commence though -- and should so we can skip status ahead past takeoff
+    if (What_Am_I() == RTTI_AIRCRAFT){
+        AircraftClass* meplane = (AircraftClass*)this;
+        if (!meplane->IsLanding && !meplane->IsTakingOff){
+            Commence();
+            if (meplane->Height == FLIGHT_LEVEL){
+                if (meplane->Class->IsFixedWing){
+                    Status = 1; //FLY_TOWARD_TARGET
+                }
+                //else { // helicopters still need to validate LZ
+                //    Status = 2; //FLY_TO_LZ
+                //}
+            }
+        }
+    }
+
+    return;
 }
 
 void TechnoClass::AttackMoveEnterAttackMode(){