Changes for YRpp PR#17 (#1173)

* Changes for YRpp PR#17 * Update YRpp
Phobos-developers · Jan 2, 2024 · 4ca5078 · 4ca5078
1 parent f6d849d
commit 4ca5078
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/YRpp b/YRpp
diff --git a/src/Ext/SWType/FireSuperWeapon.cpp b/src/Ext/SWType/FireSuperWeapon.cpp
@@ -271,7 +271,7 @@ void SWTypeExt::ExtData::ApplySWNext(SuperClass* pSW, const CellStruct& cell)
 		{
 			const auto pNextTypeExt = SWTypeExt::ExtMap.Find(pSuper->Type);
 			if (!this->SW_Next_RealLaunch ||
-				(pSuper->Granted && pSuper->IsCharged && !pSuper->IsOnHold && pHouse->CanTransactMoney(pNextTypeExt->Money_Amount)))
+				(pSuper->IsPresent && pSuper->IsReady && !pSuper->IsSuspended && pHouse->CanTransactMoney(pNextTypeExt->Money_Amount)))
 			{
 				if (this->SW_Next_IgnoreInhibitors || !pNextTypeExt->HasInhibitor(pHouse, cell)
 					&& (this->SW_Next_IgnoreDesignators || pNextTypeExt->HasDesignator(pHouse, cell)))

diff --git a/src/Ext/Script/Body.cpp b/src/Ext/Script/Body.cpp
@@ -1237,9 +1237,9 @@ void ScriptExt::ChronoshiftTeamToTarget(TeamClass* pTeam, TechnoClass* pTeamLead
 		return;
 	}
 
-	if (!pSuperChronosphere->IsCharged || (pSuperChronosphere->IsPowered() && !pOwner->Is_Powered()))
+	if (!pSuperChronosphere->IsReady || (pSuperChronosphere->IsPowered() && !pOwner->Is_Powered()))
 	{
-		if (pSuperChronosphere->Granted)
+		if (pSuperChronosphere->IsPresent)
 		{
 			int rechargeTime = pSuperChronosphere->GetRechargeTime();
 			int timeLeft = pSuperChronosphere->RechargeTimer.GetTimeLeft();

diff --git a/src/Ext/WarheadType/Detonate.cpp b/src/Ext/WarheadType/Detonate.cpp
@@ -69,7 +69,7 @@ void WarheadTypeExt::ExtData::Detonate(TechnoClass* pOwner, HouseClass* pHouse,
 				const auto pSWExt = SWTypeExt::ExtMap.Find(pSuper->Type);
 				const auto cell = CellClass::Coord2Cell(coords);
 
-				if (pHouse->CanTransactMoney(pSWExt->Money_Amount) && (!this->LaunchSW_RealLaunch || (pSuper->Granted && pSuper->IsCharged && !pSuper->IsOnHold)))
+				if (pHouse->CanTransactMoney(pSWExt->Money_Amount) && (!this->LaunchSW_RealLaunch || (pSuper->IsPresent && pSuper->IsReady && !pSuper->IsSuspended)))
 				{
 					if (this->LaunchSW_IgnoreInhibitors || !pSWExt->HasInhibitor(pHouse, cell)
 					&& (this->LaunchSW_IgnoreDesignators || pSWExt->HasDesignator(pHouse, cell)))
+4 −2		BuildingClass.h
+0 −133		HeapClass.h
+3 −0		HouseClass.h
+3 −0		IonBlastClass.h
+2 −4		ParticleClass.h
+151 −0		PriorityQueueClass.h
+3 −0		SmudgeTypeClass.h
+3 −0		SpotlightClass.h
+6 −6		SuperClass.h
+1 −1		TacticalClass.h
+2 −2		TechnoClass.h
+16 −35		TiberiumClass.h
+55 −40		VeinholeMonsterClass.h