Support for 1.54

updated some classes to be more correct

Author: dariowouters

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.54
+- Updated to support 1.54
+
 ## 1.53
 - Updated to support 1.53
 

dist/ts-fmod-plugin.dll

@@ -2,8 +2,8 @@
 
 namespace common
 {
-    inline const char* plugin_version = "1.53";
-    constexpr uint32_t supported_game_version = 53;
+    inline const char* plugin_version = "1.54";
+    constexpr uint32_t supported_game_version = 54;
 
     inline FMOD_GUID get_guid(const std::string& s_guid)
     {

ts-fmod-plugin/common.h

@@ -175,7 +175,7 @@ SCSAPI_VOID telemetry_tick(const scs_event_t event, const void* const event_info
             }
         }
 
-        const auto* interior = *reinterpret_cast<unk_interior**>(unk_interior_ptr);
+        const auto* interior = *reinterpret_cast<sound_library_t**>(unk_interior_ptr);
 
         if (interior != nullptr)
         {

ts-fmod-plugin/dllmain.cpp

@@ -0,0 +1,28 @@
+#pragma once
+#include <cstdint>
+
+#pragma pack( push, 1 )
+namespace ts_fmod_plugin::prism
+{
+    template < class T > class array_t
+    {
+    public:
+        T* value;
+        uint64_t size;
+
+    public:
+        T& at( uint64_t index ) { return value[ index ]; }
+
+        T& operator[]( const uint64_t index ) { return value[ index ]; }
+
+        T* begin() { return &value[ 0 ]; }
+        T* end() { return &value[ size ]; }
+
+    private:
+        virtual void destructor();
+    };
+
+    static_assert( sizeof( array_t< uint64_t > ) == 0x18, "array_t is incorrect in size" );
+}
+
+#pragma pack( pop )

ts-fmod-plugin/memory_structure.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "./array.h"
+#include <cstdint>
+
+#pragma pack( push, 1 )
+namespace ts_fmod_plugin::prism
+{
+    template < class T > class array_dyn_t : public array_t< T >
+    {
+    public:
+        uint64_t capacity;
+    };
+
+    static_assert( sizeof( array_dyn_t< void* > ) == 0x20, "array_dyn_t is incorrect in size" );
+}
+#pragma pack( pop )

ts-fmod-plugin/prism/collections/array.h

@@ -0,0 +1,31 @@
+#pragma once
+#include <cstdint>
+
+#pragma pack( push, 1 )
+namespace ts_fmod_plugin::prism
+{
+    // Some of this is a pure guess, but it does seem to work
+
+    template < class T > class list_dyn_node_t
+    {
+    public:
+        list_dyn_node_t< T >* next;
+        list_dyn_node_t< T >* prev;
+        T item;
+    };
+
+    template < class T > class list_dyn_t // Size: 0x0038
+    {
+    public:
+        uint64_t size;               // 0x0008 (0x08)
+        list_dyn_node_t< T >* begin; // 0x0010 (0x08)
+        list_dyn_node_t< T >* end;   // 0x0018 (0x08)
+        T* empty_item;               // 0x0020 (0x08)
+        uint64_t capacity;           // 0x0028 (0x08)
+        char pad_0030[ 8 ];          // 0x0030 (0x08)
+
+        virtual void destructor();
+    };
+    static_assert( sizeof( list_dyn_t< void* > ) == 0x38 );
+}
+#pragma pack( pop )

ts-fmod-plugin/prism/collections/array_dyn.h

@@ -0,0 +1,28 @@
+#pragma once
+#include <cstdint>
+
+#pragma pack( push, 1 )
+namespace ts_fmod_plugin::prism
+{
+    struct string
+    {
+        explicit string( const char* const s ) : m_string( s ) {}
+
+        const char* m_string = nullptr;
+    };
+
+    static_assert( sizeof( string ) == 0x08, "string is incorrect in size" );
+
+    class string_dyn_t
+    {
+    public:
+        string str;
+        uint32_t size;
+        uint32_t capacity;
+
+        virtual void destructor();
+    };
+
+    static_assert( sizeof( string_dyn_t ) == 0x018, "string_dyn_t is incorrect in size" );
+}
+#pragma pack( pop )

ts-fmod-plugin/prism/collections/list_dyn.h

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,53,0,0
- PRODUCTVERSION 1,53,0,0
+ FILEVERSION 1,54,0,0
+ PRODUCTVERSION 1,54,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dario Wouters"
             VALUE "FileDescription", "Sound Plugin for ATS/ETS2"
-            VALUE "FileVersion", "1.53.0.0"
+            VALUE "FileVersion", "1.54.0.0"
             VALUE "InternalName", "ts-fmod-plugin.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "ts-fmod-plugin.dll"
             VALUE "ProductName", "Sound Plugin for ATS/ETS2"
-            VALUE "ProductVersion", "1.53.0.0"
+            VALUE "ProductVersion", "1.54.0.0"
         END
     END
     BLOCK "VarFileInfo"

ts-fmod-plugin/prism/string.h

@@ -178,6 +178,10 @@
     <ClInclude Include="memory_structure.h" />
     <ClInclude Include="nlohmann\json.hpp" />
     <ClInclude Include="pch.h" />
+    <ClInclude Include="prism\collections\array.h" />
+    <ClInclude Include="prism\collections\array_dyn.h" />
+    <ClInclude Include="prism\collections\list_dyn.h" />
+    <ClInclude Include="prism\string.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="sdk_stores.h" />
     <ClInclude Include="telemetry_data.h" />

ts-fmod-plugin/ts-fmod-plugin.rc

@@ -44,6 +44,18 @@
     <ClInclude Include="config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="prism\collections\array.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="prism\collections\array_dyn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="prism\collections\list_dyn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="prism\string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">