Optimize 36a3b56 TEvent fix

Author: CrimRecya

src/Ext/TEvent/Body.cpp

@@ -33,14 +33,15 @@ void TEventExt::ExtData::SaveToStream(PhobosStreamWriter& Stm)
 	this->Serialize(Stm);
 }
 
-bool TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, ObjectClass* pObject,
-	CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource, bool& bHandled)
+std::optional<bool> TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse,
+	ObjectClass* pObject, CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource)
 {
-	bHandled = true;
 	const auto eventKind = static_cast<PhobosTriggerEvent>(pThis->EventKind);
 
 	switch (eventKind)
 	{
+	// The triggering conditions that need to be checked at any time are written here
+
 		// helper struct
 		struct and_with { bool operator()(int a, int b) { return a & b; } };
 
@@ -128,30 +129,23 @@ bool TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, Obje
 	case PhobosTriggerEvent::CellHasAnyTechnoTypeFromList:
 		return TEventExt::CellHasAnyTechnoTypeFromListTEvent(pThis, pObject, pHouse);
 
+
 	// If it requires an additional object as like mapping events 7 or 48, please fill it in here.
+
+		// They must be the same, but for other triggers to take effect normally, this cannot be judged outside case.
+		auto isSameEvent = [&]() { return eventKind == static_cast<PhobosTriggerEvent>(iEvent); };
+
+	// SomeTriggerAttachedToObject needs to be restricted to situations where ...
 //	case PhobosTriggerEvent::SomeTriggerAttachedToObject:
-	case PhobosTriggerEvent::ShieldBroken:
-		// They must be the same.
-		if (eventKind == static_cast<PhobosTriggerEvent>(iEvent))
-		{
-			switch (eventKind)
-			{
-			// SomeTriggerAttachedToObject needs to be restricted to situations where ...
-//			case PhobosTriggerEvent::SomeTriggerAttachedToObject:
-//				return ...::ThisAttachedToObjectTEvent(pObject, ...);
+//		return isSameEvent() && ...::ThisAttachedToObjectTEvent(pObject, ...);
 
-			// ShieldBroken needs to be restricted to situations where the shield is being attacked.
-			case PhobosTriggerEvent::ShieldBroken:
-				return ShieldClass::ShieldIsBrokenTEvent(pObject);
+	// ShieldBroken needs to be restricted to situations where the shield is being attacked.
+	case PhobosTriggerEvent::ShieldBroken:
+		return isSameEvent() && ShieldClass::ShieldIsBrokenTEvent(pObject);
 
-			default:
-				break;
-			}
-		}
 
 	default:
-		bHandled = false;
-		return true;
+		return std::nullopt;
 	};
 }
 

src/Ext/TEvent/Body.h

@@ -2,9 +2,10 @@
 
 #include <Utilities/Container.h>
 #include <Utilities/Template.h>
-
 #include <Helpers/Template.h>
 
+#include <optional>
+
 #include <TEventClass.h>
 
 class HouseClass;
@@ -82,8 +83,8 @@ class TEventExt
 		void Serialize(T& Stm);
 	};
 
-	static bool Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, ObjectClass* pObject,
-					CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource, bool& bHandled);
+	static std::optional<bool> Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse,
+		ObjectClass* pObject, CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource);
 
 	template<bool IsGlobal, typename _Pr>
 	static bool VariableCheck(TEventClass* pThis);

src/Ext/TEvent/Hooks.cpp

@@ -20,11 +20,13 @@ DEFINE_HOOK(0x71E940, TEventClass_Execute, 0x5)
 	GET_STACK(bool*, isPersitant, 0x14);
 	GET_STACK(TechnoClass*, pSource, 0x18);
 
-	bool handled;
+	const auto result = TEventExt::Execute(pThis, iEvent, pHouse, pObject, pTimer, isPersitant, pSource);
 
-	R->AL(TEventExt::Execute(pThis, iEvent, pHouse, pObject, pTimer, isPersitant, pSource, handled));
+	if (!result.has_value())
+		return 0;
 
-	return handled ? 0x71EA2D : 0;
+	R->AL(result.value());
+	return 0x71EA2D;
 }
 
 DEFINE_HOOK(0x7271F9, TEventClass_GetFlags, 0x5)