фикс журнала

modules/moonwell/src/MoonWell.cpp

@@ -6,6 +6,7 @@
 // boot phase, before GlueXML is loaded.
 
 #include "core/Logger.hpp"
+#include "core/Hook.hpp"
 #include "core/Mem.hpp"
 #include "runtime/LuaBindings.hpp"
 #include "runtime/ModuleInstall.hpp"
@@ -25,6 +26,88 @@ namespace moonwell
         using GxSetProjectionFn = wxl::offsets::engine::gx::GxSetProjectionFn;
         GxSetProjectionFn g_nextSetProjection = nullptr;
 
+        // FrameXML's stock SetCreature only accepts a creature entry and waits
+        // for its client cache record. Encounter Journal already has the exact
+        // CreatureDisplayInfo ID, so accept it as an optional second argument.
+        constexpr uintptr_t kSetCreature = 0x00597960;
+        constexpr uintptr_t kGetCurrentModelFrame = 0x004A81B0;
+        constexpr uintptr_t kModelFrameTypeToken = 0x00C0E4D4;
+        constexpr uintptr_t kApplyCreatureCacheRecord = 0x00597700;
+
+        using SetCreatureFn = int(__cdecl*)(void* state);
+        using ApplyCreatureCacheRecordFn = void(__fastcall*)(void* frame, void* edx,
+                                                              const void* cacheRecord);
+        SetCreatureFn g_nextSetCreature = nullptr;
+        alignas(4) std::array<uint32_t, 10> g_encounterJournalCreatureRecord{};
+
+        void* GetCurrentModelFrame(void* state, uint32_t typeToken)
+        {
+            // FrameScript_GetObject takes the type token on the stack, but the
+            // 3.3.5 client also expects lua_State in ESI (an internal calling
+            // convention not expressible with a regular C function pointer).
+            void* frame = nullptr;
+            __asm
+            {
+                mov esi, state
+                push typeToken
+                mov eax, kGetCurrentModelFrame
+                call eax
+                add esp, 4
+                mov frame, eax
+            }
+            return frame;
+        }
+
+        int __cdecl SetCreatureDisplayInfoHook(void* state)
+        {
+            const int result = g_nextSetCreature ? g_nextSetCreature(state) : 0;
+            if (!state || !wxl::runtime::lua::IsNumber(state, 3))
+                return result;
+
+            const double requestedDisplayInfo = wxl::runtime::lua::ToNumber(state, 3);
+            if (requestedDisplayInfo <= 0.0 || requestedDisplayInfo > 4294967295.0)
+                return result;
+
+            const auto displayInfo = static_cast<uint32_t>(requestedDisplayInfo);
+            __try
+            {
+                const uint32_t typeToken = *reinterpret_cast<const uint32_t*>(kModelFrameTypeToken);
+                if (!typeToken)
+                    return result;
+
+                void* frame = GetCurrentModelFrame(state, typeToken);
+                if (!frame)
+                    return result;
+
+                // Both the initial loader and the later character-appearance
+                // pass read displayInfo at +0x24. Keep this record alive and
+                // attach it to the frame: character models use it asynchronously
+                // to resolve CreatureDisplayInfoExtra, baked skin and equipment.
+                g_encounterJournalCreatureRecord.fill(0);
+                g_encounterJournalCreatureRecord[9] = displayInfo;
+                *reinterpret_cast<const void**>(static_cast<uint8_t*>(frame) + 0x378) =
+                    g_encounterJournalCreatureRecord.data();
+                reinterpret_cast<ApplyCreatureCacheRecordFn>(kApplyCreatureCacheRecord)(
+                    frame, nullptr, g_encounterJournalCreatureRecord.data());
+            }
+            __except (EXCEPTION_EXECUTE_HANDLER)
+            {
+                WLOG_ERROR("moonwell: SetCreature displayInfo bridge failed for %u", displayInfo);
+            }
+            return result;
+        }
+
+        void InstallEncounterJournalModelPreview()
+        {
+            if (!wxl::core::hook::Install("MoonWellSetCreatureDisplayInfo", kSetCreature,
+                                          &SetCreatureDisplayInfoHook, &g_nextSetCreature))
+            {
+                WLOG_ERROR("moonwell: encounter journal model hook installation failed");
+                return;
+            }
+            WLOG_INFO("moonwell: encounter journal displayInfo model bridge installed");
+        }
+
         struct CameraTransition
         {
             float zoom = 1.0f;
@@ -314,6 +397,8 @@ namespace moonwell
                 wxl::runtime::modules::RegisterBoot("moonwell", &InstallBoot);
                 wxl::runtime::modules::Register(
                     "moonwell-character-create-camera", &InstallCharacterCreateCamera);
+                wxl::runtime::modules::Register(
+                    "moonwell-encounter-journal-models", &InstallEncounterJournalModelPreview);
                 wxl::runtime::modules::Register("moonwell-log-flush", &InstallRuntimeLogFlush);
             }
         } g_registration;