Fix incorrectly imported types

psiberx · May 15, 2024 · 40cbe8b · 40cbe8b
1 parent 8d77b46
commit 40cbe8b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/scripts/Base/Imports/gameuiBaseUIData.reds b/scripts/Base/Imports/gameuiBaseUIData.reds
diff --git a/scripts/Base/Overrides/gameuiBaseUIData.reds b/scripts/Base/Overrides/gameuiBaseUIData.reds
@@ -0,0 +1,3 @@
+public abstract native class gameuiBaseUIData extends ISerializable {
+  native let id: Int64;
+}
diff --git a/scripts/Base/Imports/scnChatter.reds → scripts/Base/Overrides/scnChatter.reds b/scripts/Base/Imports/scnChatter.reds → scripts/Base/Overrides/scnChatter.reds
@@ -1,4 +1,4 @@
-public native struct scnChatter {
+public native class scnChatter extends ISerializable {
   native let id: Uint16;
   native let voicesetComponent: wref<VoicesetComponent>;
 }
diff --git a/src/App/Project.hpp b/src/App/Project.hpp
@@ -12,5 +12,5 @@ constexpr auto Author = "psiberx";
 constexpr auto NameW = L"Codeware";
 constexpr auto AuthorW = L"psiberx";
 
-constexpr auto Version = semver::from_string_noexcept("1.9.2").value();
+constexpr auto Version = semver::from_string_noexcept("1.9.3").value();
 }
diff --git a/src/App/Scripting/ScriptingService.cpp b/src/App/Scripting/ScriptingService.cpp
@@ -12,7 +12,9 @@ constexpr auto ResourceScriptReferenceAlias = Red::CName(Red::redResourceReferen
 constexpr auto ResourceReferencePrefix = Red::GetTypePrefixStr<Red::ResourceReference>();
 constexpr auto ResourceAsyncReferencePrefix = Red::GetTypePrefixStr<Red::ResourceAsyncReference>();
 
-constexpr auto KnowNameConflict = Red::CName("inkWidgetLibraryResource");
+constexpr auto inkWidgetLibraryResourceTypeName = Red::CName("inkWidgetLibraryResource");
+constexpr auto gameuiBaseUIDataTypeName = Red::CName("gameuiBaseUIData");
+constexpr auto scnChatterTypeName = Red::CName("scnChatter");
 }
 
 App::ScriptingService::ScriptingService(const std::filesystem::path& aStateDir)
@@ -54,6 +56,9 @@ void App::ScriptingService::OnInitializeGameInstance()
 
 void App::ScriptingService::OnValidateScripts(void* aValidator, Red::ScriptBundle* aBundle, void* aReport)
 {
+    Red::GetClass<gameuiBaseUIDataTypeName>()->parent = Red::GetClass<ISerializableTypeName>();
+    Red::GetClass<scnChatterTypeName>()->parent = Red::GetClass<ISerializableTypeName>();
+
     for (auto& classDef : aBundle->classes)
     {
         if (classDef->flags.isNative)
@@ -81,7 +86,7 @@ void App::ScriptingService::OnValidateScripts(void* aValidator, Red::ScriptBundl
                 }
             }
 
-            if (classDef->flags.isStruct && classDef->name != KnowNameConflict)
+            if (classDef->flags.isStruct && classDef->name != inkWidgetLibraryResourceTypeName)
             {
                 if (auto nativeClass = Red::GetScriptClass(classDef->name))
                 {

diff --git a/src/App/Version.rc b/src/App/Version.rc
@@ -1,9 +1,9 @@
-#define VER_PRODUCTVERSION     1,9,2,0
-#define VER_FILEVERSION        1,9,2,2405042045
+#define VER_PRODUCTVERSION     1,9,3,0
+#define VER_FILEVERSION        1,9,3,2405151847
 
 #define VER_PRODUCTNAME_STR    "Codeware\0"
-#define VER_PRODUCTVERSION_STR "1.9.2\0"
-#define VER_FILEVERSION_STR    "1.9.2.2405042045\0"
+#define VER_PRODUCTVERSION_STR "1.9.3\0"
+#define VER_FILEVERSION_STR    "1.9.3.2405151847\0"
 
 1 VERSIONINFO
 FILEVERSION     VER_FILEVERSION

diff --git a/xmake.lua b/xmake.lua
@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("Codeware")
-set_version("1.9.2", {build = "%y%m%d%H%M"})
+set_version("1.9.3", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx2a")