Merge pull request #10 from Silver-Ore-Team/feature/dialog-distance

Increase the default display dialogue distance if needed - zCDialogDistanceController

README.md

@@ -5,7 +5,7 @@ based on the solution form [AFSP Trialogue package](https://github.com/Bad-Scien
 ## ToDo
 
 - [x] Implement the basic functionality of the multilogue system
-- [ ] Increase the default display dialogue distance if needed
+- [x] Increase the default display dialogue distance if needed
 - [ ] Custom camera system
 - [x] Gothic 1 compatibility
 

src/Gothic/zMul_Distance.hpp

@@ -0,0 +1,36 @@
+namespace GOTHIC_NAMESPACE {
+    static float newDiagDist;
+
+    class zCDialogDistanceController
+    {
+    private:
+        float m_BackupDistance = 0;
+        int m_Address = zSwitch(0x6B2A07, 0x758740) + 2;
+    public:
+        void SetDistance(float distance);
+        float GetDefaultDistance();
+        float GetDistance();
+        void RestoreDistance() { SetDistance(m_BackupDistance); }
+    };
+
+    inline float zCDialogDistanceController::GetDefaultDistance()
+    {
+        if (!m_BackupDistance) {
+            auto rawMem = ::Union::RawMemory::GetAccess(reinterpret_cast<void*>(m_Address), reinterpret_cast<void*>(m_Address + 0x4));
+            void* addr = rawMem->Get<void*>(0);
+            m_BackupDistance = sqrt(*static_cast<float*>(addr));
+        }
+        return m_BackupDistance;
+    }
+
+    inline void zCDialogDistanceController::SetDistance(float distance)
+    {
+        static NH::Logger* log = NH::CreateLogger("zCDialogDistanceController::SetDistance");
+        GetDefaultDistance();
+        newDiagDist = distance * distance;
+        auto rawMem = ::Union::RawMemory::GetAccess(reinterpret_cast<void*>(m_Address), reinterpret_cast<void*>(m_Address + 0x4));
+        rawMem->Get<int>(0) = reinterpret_cast<int>(&newDiagDist);
+        rawMem->Push();
+        log->Info("Distance set to {0}.", distance);
+    }
+}

src/Gothic/zMultilogue.hpp

@@ -6,6 +6,7 @@ namespace GOTHIC_NAMESPACE
     {
     private:
         zCMultilogueCameraAdapter m_CameraAdapter;
+        zCDialogDistanceController m_DistanceController;
         oCNpc* m_LastSelf = nullptr;
         std::unordered_map<int, oCNpc*> m_Npcs;
         bool m_Running = false;
@@ -120,6 +121,7 @@ namespace GOTHIC_NAMESPACE
         m_Running = false;
         m_LastSelf = nullptr;
         m_CameraAdapter.SetTarget(nullptr);
+        m_DistanceController.RestoreDistance();
         log->Info("Finishing multilogue with {0} NPCs.", m_Npcs.size());
         m_Npcs.clear();
     }
@@ -196,6 +198,12 @@ namespace GOTHIC_NAMESPACE
             static NH::Logger* log = NH::CreateLogger("zCMultilogue::EV_Next");
             log->Info("Next NPC: {0}", id);
             item->second->talkOther = nullptr;
+
+            float npcDistance = player->GetDistanceToVobApprox(*static_cast<zCVob*>(GetSelfInstance()));
+            log->Debug("Distance to player: {0}", npcDistance);
+            if (npcDistance > m_DistanceController.GetDefaultDistance()) {
+                m_DistanceController.SetDistance(npcDistance);
+            }
             // Currently does nothing
             m_CameraAdapter.SetTarget(item->second);
         }

src/Plugin.cpp

@@ -2,6 +2,7 @@
 #pragma warning(disable: 4005)
 
 #include <Union/Hook.h>
+#include <Union/RawMemory.h>
 #include <ZenGin/zGothicAPI.h>
 
 #include "NH/Logger.h"

src/Plugin.hpp

@@ -1,5 +1,6 @@
 #include "Gothic/zMul_Helper.hpp"
 #include "Gothic/zMul_Camera.hpp"
+#include "Gothic/zMul_Distance.hpp"
 #include "Gothic/zMultilogue.hpp"
 #include "Gothic/Externals.hpp"
 #include "Gothic/Hooks.hpp"