Fix SW hook without Ares and fix incorrect WhatAmI in ~TechnoExtData

Author: CrimRecya

src/Ext/SWType/FireSuperWeapon.cpp

@@ -48,11 +48,8 @@ void SWTypeExt::FireSuperWeaponExt(SuperClass* pSW, const CellStruct& cell)
 		int index = 0;
 		int TagCount = pTags->Count;
 
-		while (true)
+		while (TagCount > 0 && index < TagCount)
 		{
-			if (TagCount <= 0 || index >= TagCount)
-				break;
-
 			const auto pTag = pTags->GetItem(index);
 
 			// don't be confused as to why (TechnoClass*)(pSW) is there, it's something very much needed..

src/Ext/SWType/Hooks.cpp

@@ -21,7 +21,7 @@ DEFINE_HOOK(0x6CC390, SuperClass_Launch, 0x6)
 // Ares hooked at 0x6CC390 and jumped to 0x6CDE40
 // If a super is not handled by Ares however, we do it at the original entry point
 DEFINE_HOOK_AGAIN(0x6CC390, SuperClass_Place_FireExt, 0x6)
-DEFINE_HOOK(0x6CDE40, SuperClass_Place_FireExt, 0x4)
+DEFINE_HOOK(0x6CDE40, SuperClass_Place_FireExt, 0x5)
 {
 	GET(SuperClass* const, pSuper, ECX);
 	GET_STACK(CellStruct const* const, pCell, 0x4);

src/Ext/Techno/Body.cpp

@@ -19,15 +19,16 @@ TechnoExt::ExtData::~ExtData()
 	auto const pTypeExt = this->TypeExtData;
 	auto const pType = pTypeExt->OwnerObject();
 	auto pThis = this->OwnerObject();
-	auto const whatAmI = pThis->WhatAmI();
+	// Besides BuildingClass, calling pThis->WhatAmI() here will only result in AbstractType::None
+	auto const whatAmI = pType->WhatAmI();
 
 	if (pTypeExt->AutoDeath_Behavior.isset())
 	{
 		auto& vec = ScenarioExt::Global()->AutoDeathObjects;
 		vec.erase(std::remove(vec.begin(), vec.end(), this), vec.end());
 	}
 
-	if (whatAmI != AbstractType::Aircraft && whatAmI != AbstractType::Building
+	if (whatAmI != AbstractType::AircraftType && whatAmI != AbstractType::BuildingType
 		&& pType->Ammo > 0 && pTypeExt->ReloadInTransport)
 	{
 		auto& vec = ScenarioExt::Global()->TransportReloaders;

src/Utilities/AresAddressInit.cpp

@@ -67,3 +67,7 @@ void AresFunctions::InitAres3_0p1()
 
 #undef NOTE_ARES_FUN
 
+void AresFunctions::InitNoAres()
+{
+	Patch::Apply_RAW(0x6CDE40, { 0xC2, 0x08, 0x00, 0x90, 0x67 });
+}

src/Utilities/AresFunctions.h

@@ -24,6 +24,7 @@ class AresFunctions
 public:
 	static void InitAres3_0();
 	static void InitAres3_0p1();
+	static void InitNoAres();
 	// TechnoExt
 	static bool(__stdcall* ConvertTypeTo)(TechnoClass* pFoot, TechnoTypeClass* pConvertTo);
 

src/Utilities/AresHelper.cpp

@@ -143,6 +143,7 @@ void AresHelper::Init()
 		break;
 	default:
 		Debug::LogDeferred("[Phobos] Detected a version of Ares that is not supported by Phobos. Disabling integration.\n");
+		AresFunctions::InitNoAres();
 		break;
 	}
 }