Merge pull request #715 from tiltedphoques/dev

v1.6.8

Author: maximegmd

.github/workflows/linux.yml

@@ -18,7 +18,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Checkout submodules
       run: |
@@ -28,32 +28,27 @@ jobs:
     # Install dependencies
     - name: Update apt repositories
       run: sudo apt-get update
-      
-    - name: Install GCC12
-      shell: bash
-      run:  |
-          sudo apt update
-          sudo apt install gcc-12 g++-12
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 110 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
-          
+
     # Install xmake
     - name: Setup xmake
       uses: xmake-io/github-action-setup-xmake@v1
       with:
-        xmake-version: '2.9.2'
+        xmake-version: '2.9.5'
 
     # Update xmake repository (in order to have the file that will be cached)
     - name: Update xmake repository
       run: xmake repo --update
 
     # Setup compilation mode and install project dependencies
+    # (continue-on-error + timeout is a temporary solution until sentry-native is fixed; shouldn't affect the building step)
     - name: Configure xmake and install dependencies
-      run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes
+      continue-on-error: true
+      run: timeout 15m xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes
 
-    # Build the game
+    # Build the server
     - name: Build
-      run: xmake
-    
+      run: xmake -y
+
     # Create install
     #- name: Install
     # run: xmake install -o packaged

.github/workflows/windows.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Setup xmake
       uses: xmake-io/github-action-setup-xmake@v1
       with:
-        xmake-version: '2.9.2'
+        xmake-version: '2.9.5'
 
     # Install node
     #- name: Setup nodejs

Code/client/Events/ActivateEvent.h

@@ -22,13 +22,14 @@ struct ActivateEvent
     {
     }
 #elif TP_SKYRIM64
-    ActivateEvent(TESObjectREFR* apObject, Actor* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, uint8_t aUnk1, bool aActivateFlag = false)
+    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)
         , pObjectToGet(apObjectToGet)
         , Count(aCount)
         , DefaultProcessing(aDefaultProcessing)
         , Unk1(aUnk1)
+        , PreActivationOpenState(aPreActivationOpenState)
         , ActivateFlag(aActivateFlag)
     {
     }
@@ -46,5 +47,6 @@ struct ActivateEvent
     uint8_t Unk1;
 #endif
 
+    TESObjectREFR::OpenState PreActivationOpenState;
     bool ActivateFlag;
 };

Code/client/Events/SetTimeCommandEvent.h

@@ -0,0 +1,16 @@
+#pragma once
+
+struct SetTimeCommandEvent
+{
+    SetTimeCommandEvent() = delete;
+    SetTimeCommandEvent(uint8_t aHours, uint8_t aMinutes, uint32_t aPlayerId)
+        : Hours(aHours)
+        , Minutes(aMinutes)
+        , PlayerId(aPlayerId)
+    {
+    }
+
+    uint8_t Hours;
+    uint8_t Minutes;
+    uint32_t PlayerId;
+};

Code/client/Games/Fallout4/TESObjectREFR.h

@@ -31,6 +31,15 @@ struct TESObjectREFR : TESForm
         IRR_STORE_IN_TEAMMATE = 0x5,
     };
 
+    enum OpenState : uint8_t
+    {
+        kNone = 0,
+        kOpen,
+        kOpening,
+        kClosed,
+        kClosing,
+    };
+
     struct RemoveItemData
     {
         uint8_t stackData[0x20]{};
@@ -194,6 +203,7 @@ struct TESObjectREFR : TESForm
     void LockChange() noexcept;
 
     const float GetHeight() noexcept;
+    OpenState GetOpenState() noexcept;
 
     Inventory GetInventory() const noexcept;
     void SetInventory(const Inventory& acContainer) noexcept;

Code/client/Games/References.cpp

@@ -690,6 +690,15 @@ const float TESObjectREFR::GetHeight() noexcept
     return boundMax.z - GetBoundMin().z;
 }
 
+TESObjectREFR::OpenState TESObjectREFR::GetOpenState() noexcept
+{
+    using ObjectReference = TESObjectREFR;
+
+    PAPYRUS_FUNCTION(TESObjectREFR::OpenState, ObjectReference, GetOpenState);
+
+    return s_pGetOpenState(this);
+}
+
 bool ActorState::SetWeaponDrawn(bool aDraw) noexcept
 {
     TP_THIS_FUNCTION(TSetWeaponState, bool, ActorState, bool aDraw);

Code/client/Games/Skyrim/Forms/MagicItem.cpp

@@ -31,6 +31,17 @@ bool MagicItem::IsBuffSpell() const noexcept
     }
 }
 
+bool MagicItem::IsBoundWeaponSpell() noexcept
+{
+    for (EffectItem* pEffect : listOfEffects)
+    {
+        if (pEffect->pEffectSetting && pEffect->pEffectSetting->eArchetype == EffectArchetypes::ArchetypeID::kBoundWeapon)
+            return true;
+    }
+
+    return false;
+}
+
 EffectItem* MagicItem::GetEffect(const uint32_t aEffectId) noexcept
 {
     for (EffectItem* pEffect : listOfEffects)

Code/client/Games/Skyrim/Forms/MagicItem.h

@@ -13,6 +13,7 @@ struct MagicItem : TESBoundObject
     bool IsInvisibilitySpell() const noexcept;
     bool IsHealingSpell() const noexcept;
     bool IsBuffSpell() const noexcept;
+    bool IsBoundWeaponSpell() noexcept;
 
     EffectItem* GetEffect(const uint32_t aEffectId) noexcept;
 

Code/client/Games/Skyrim/TESObjectREFR.cpp

@@ -611,7 +611,15 @@ bool TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, u
     // Exclude books from activation since only reading them removes them from the cell
     // Note: Books are now unsynced 
     if (pActivator && apThis->baseForm->formType != FormType::Book)
-        World::Get().GetRunner().Trigger(ActivateEvent(apThis, pActivator, apObjectToGet, aUnk1, aCount, aDefaultProcessing));
+    {
+        auto openState = TESObjectREFR::kNone;
+        if (apThis->baseForm->formType == FormType::Door)
+            openState = apThis->GetOpenState();
+
+        World::Get().GetRunner().Trigger(
+            ActivateEvent(apThis, pActivator, apObjectToGet, aCount, aDefaultProcessing, aUnk1, openState)
+        );
+    }
 
     return TiltedPhoques::ThisCall(RealActivate, apThis, apActivator, aUnk1, apObjectToGet, aCount, aDefaultProcessing);
 }

Code/client/Games/Skyrim/TESObjectREFR.h

@@ -47,6 +47,15 @@ struct TESObjectREFR : TESForm
         CHANGE_REFR_EXTRA_GAME_ONLY = 1u << 31,
     };
 
+    enum OpenState : uint8_t
+    {
+        kNone = 0,
+        kOpen,
+        kOpening,
+        kClosed,
+        kClosing,
+    };
+
     static TESObjectREFR* GetByHandle(uint32_t aHandle) noexcept;
     static uint32_t* GetNullHandle() noexcept;
 
@@ -188,6 +197,7 @@ struct TESObjectREFR : TESForm
 
     const float GetHeight() noexcept;
     void EnableImpl() noexcept;
+    OpenState GetOpenState() noexcept;
 
     Inventory GetInventory() const noexcept;
     Inventory GetInventory(std::function<bool(TESForm&)> aFilter) const noexcept;