Merge pull request #729 from tiltedphoques/tweak/yeetFallout

yeet fallout together

Author: RobbeBryssinck

Code/client/Events/ActivateEvent.h

@@ -9,19 +9,6 @@ struct TESBoundObject;
  */
 struct ActivateEvent
 {
-#if TP_FALLOUT4
-    ActivateEvent(TESObjectREFR* apObject, Actor* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping, bool aActivateFlag = false)
-        : pObject(apObject)
-        , pActivator(apActivator)
-        , pObjectToGet(apObjectToGet)
-        , Count(aCount)
-        , DefaultProcessing(aDefaultProcessing)
-        , FromScript(aFromScript)
-        , IsLooping(aIsLooping)
-        , ActivateFlag(aActivateFlag)
-    {
-    }
-#elif TP_SKYRIM64
     ActivateEvent(TESObjectREFR* apObject, Actor* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, uint8_t aUnk1, TESObjectREFR::OpenState aPreActivationOpenState, bool aActivateFlag = false)
         : pObject(apObject)
         , pActivator(apActivator)
@@ -33,20 +20,13 @@ struct ActivateEvent
         , ActivateFlag(aActivateFlag)
     {
     }
-#endif
 
     TESObjectREFR* pObject;
     Actor* pActivator;
     TESBoundObject* pObjectToGet;
     int32_t Count;
     bool DefaultProcessing;
-#if TP_FALLOUT4
-    bool FromScript;
-    bool IsLooping;
-#elif TP_SKYRIM64
     uint8_t Unk1;
-#endif
-
     TESObjectREFR::OpenState PreActivationOpenState;
     bool ActivateFlag;
 };

Code/client/Events/ProjectileLaunchedEvent.h

@@ -24,16 +24,6 @@ struct ProjectileLaunchedEvent
     bool AutoAim;
     bool DeferInitialization;
     bool ForceConeOfFire;
-
-#if TP_FALLOUT4
-    float ConeOfFireRadiusMult;
-    bool Tracer;
-    bool IntentionalMiss;
-    bool Allow3D;
-    bool Penetrates;
-    bool IgnoreNearCollisions;
-#else
     bool UnkBool1;
     bool UnkBool2;
-#endif
 };

Code/client/FalloutVM.cpp

@@ -59,18 +59,11 @@ uint8_t TP_MAKE_THISCALL(HookPerformAction, ActorMediator, TESActionData* apActi
         return res;
     }
 
-#if TP_FALLOUT4
-    // Let the ActionInstantInitializeGraphToBaseState event go through
-    if (apAction->action->formID == 0x5704c)
-        return TiltedPhoques::ThisCall(RealPerformAction, apThis, apAction);
-#endif
-
     return 0;
 }
 
 ActorMediator* ActorMediator::Get() noexcept
 {
-    POINTER_FALLOUT4(ActorMediator*, s_actorMediator, 1358859);
     POINTER_SKYRIMSE(ActorMediator*, s_actorMediator, 403567);
 
     return *(s_actorMediator.Get());
@@ -116,17 +109,14 @@ bool ActorMediator::ForceAction(TESActionData* apAction) noexcept
     POINTER_SKYRIMSE(TAnimationStep, PerformComplexAction, 38953);
     POINTER_SKYRIMSE(void*, qword_142F271B8, 403566);
 
-    POINTER_FALLOUT4(TAnimationStep, PerformComplexAction, 1445653);
     uint8_t result = 0;
 
     auto pActor = static_cast<Actor*>(apAction->actor);
     if (!pActor || pActor->animationGraphHolder.IsReady())
     {
         result = TiltedPhoques::ThisCall(PerformComplexAction, this, apAction);
 
-#if TP_SKYRIM64
         ApplyAnimationVariables(*qword_142F271B8.Get(), apAction);
-#endif
     }
 
     return result;
@@ -175,7 +165,6 @@ BGSActionData::BGSActionData(uint32_t aParam1, Actor* apActor, BGSAction* apActi
 TESActionData::TESActionData(uint32_t aParam1, Actor* apActor, BGSAction* apAction, TESObjectREFR* apTarget)
     : BGSActionData(aParam1, apActor, apAction, apTarget)
 {
-    POINTER_FALLOUT4(void*, s_vtbl, 780201);
     POINTER_SKYRIMSE(void*, s_vtbl, 188603);
 
     someFlag = false;
@@ -192,7 +181,6 @@ TESActionData::~TESActionData()
 static TiltedPhoques::Initializer s_animationHook(
     []()
     {
-        POINTER_FALLOUT4(TPerformAction, performAction, 502377);
         POINTER_SKYRIMSE(TPerformAction, performAction, 38949);
 
         RealPerformAction = performAction.Get();

Code/client/Games/Animation.cpp

@@ -9,11 +9,6 @@ struct IAnimationGraphManagerHolder
 
     virtual bool SendAnimationEvent(BSFixedString* apAnimEvent);
 
-#if TP_FALLOUT4
-    virtual void sub_2a();
-    virtual void sub_2c();
-#endif
-
     virtual bool GetBSAnimationGraph(BSAnimationGraphManager** aPtr) const;
     virtual uint32_t sub_3();
     virtual uint32_t sub_4();
@@ -29,10 +24,6 @@ struct IAnimationGraphManagerHolder
     virtual uint32_t sub_E();
     virtual uint32_t sub_F();
 
-#if TP_FALLOUT4
-    virtual uint32_t sub_12();
-#endif
-
     virtual bool GetVariableFloat(BSFixedString* apVariable, float* apReturn);
     virtual bool GetVariableInt(BSFixedString* apVariable, uint32_t* apReturn);
     virtual bool GetVariableBool(BSFixedString* apVariable, bool* apReturn);

Code/client/Games/Animation/IAnimationGraphManagerHolder.h

@@ -3,6 +3,5 @@
 BGSCreatedObjectManager* BGSCreatedObjectManager::Get() noexcept
 {
     POINTER_SKYRIMSE(BGSCreatedObjectManager*, pObjManager, 400320);
-    POINTER_FALLOUT4(BGSCreatedObjectManager*, pObjManager, 1000679);
     return *pObjManager.Get();
 }