Remove RA2Mode specialization for it

CnCNet · Sep 17, 2024 · 63f72f4 · 63f72f4
1 parent 916afee
commit 63f72f4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/YRpp b/YRpp
diff --git a/src/HardEndStuff/Ra2Mode.cpp b/src/HardEndStuff/Ra2Mode.cpp
@@ -178,23 +178,6 @@ bool Ra2Mode::CheckSaveGameID(const char* saveGameName)
 	return false;
 }
 
-// Allow allies to repair on service depot
-DEFINE_HOOK(0x700594, TechnoClass_WhatAction__AllowAlliesRepair, 0x5)
-{
-	if (!Ra2Mode::IsEnabled())
-		return 0;
-
-	GET(TechnoClass*, pThis, ESI);
-	GET(ObjectClass*, pObject, EDI);
-
-	auto const pBuilding = abstract_cast<BuildingClass* const>(pObject);
-	auto const pBuildingOwner = pBuilding ? pBuilding->Owner : nullptr;
-
-	return (pBuildingOwner && pBuildingOwner->IsAlliedWith(pThis))
-		? 0x70059D
-		: 0x7005E6;
-}
-
 // Allow to repair the BlackHawk Transport on service depot
 #pragma region AllowRepairFlyMZone
 

diff --git a/src/Misc/Observers.Visibility.cpp b/src/Misc/Observers.Visibility.cpp
@@ -165,7 +165,6 @@ DEFINE_HOOK(0x4AE62B, DisplayClass_HelpText_Cloak, 0x5)
 	return CheckSensedByHouses;
 }
 
-#ifndef IS_HARDEND_VER
 // Allow showing the select cursor on the object
 DEFINE_HOOK(0x700594, TechnoClass_WhatAction__AllowAllies, 0x5)
 {
@@ -174,7 +173,6 @@ DEFINE_HOOK(0x700594, TechnoClass_WhatAction__AllowAllies, 0x5)
 
 	return pThis->Owner->IsAlliedWith(pObject) ? 0x70059D : 0x7005E6;
 }
-#endif
 
 // Show disguised units (Spy and Mirage) for observer
 #pragma region