altdialogue fix

ThirteenAG · Jan 28, 2024 · a5e642a · a5e642a
1 parent e054ba5
commit a5e642a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,2 @@
-*.ixx linguist-language=C++
-*.hxx linguist-language=C++
-
 # Auto detect text files and perform LF normalization
 * text=auto
diff --git a/source/altdialogue.ixx b/source/altdialogue.ixx
@@ -191,14 +191,14 @@ std::vector<std::vector<std::tuple<std::string_view, uint32_t>>> gAltDialogueVar
         { "bulgarin2", 42939 },
         { "bulgarin2", 42940 },
         { "bulgarin2", 42927 },
-        { "rocco1", 43704 },
-        { "rocco1", 43671 },
-        { "tony1", 43701 },
-        { "tony1", 43708 },
-        { "tony1", 43706 },
-        { "tony1", 43703 },
-        { "tony1", 43707 },
-        { "tony1", 43705 },
+        //{ "rocco1", 43704 }, // conflicts with drink.sco
+        //{ "rocco1", 43671 },
+        //{ "tony1", 43701 },
+        //{ "tony1", 43708 },
+        //{ "tony1", 43706 },
+        //{ "tony1", 43703 },
+        //{ "tony1", 43707 },
+        //{ "tony1", 43705 },
         { "tony10", 43694 },
         { "tony10", 43695 },
         { "tony11", 43672 },
@@ -230,7 +230,7 @@ std::vector<std::vector<std::tuple<std::string_view, uint32_t>>> gAltDialogueVar
         { "tonym8", 43691 },
         { "yusuf2", 42910 },
         { "yusuf3", 43668 },
-        //{ "yusuf4", 42911 },
+        { "yusuf4", 42911 },
     }
 };
 

diff --git a/source/comvars.ixx b/source/comvars.ixx
@@ -102,7 +102,8 @@ public:
             fTimeStep = *pattern.get_first<float*>(4);
 
             pattern = hook::pattern("BE ? ? ? ? 8D 44 24 0C 50 8D 46 10 50");
-            pCGameConfigReader__ms_imgFiles = *pattern.get_first<decltype(pCGameConfigReader__ms_imgFiles)>(1);
+            if (!pattern.empty())
+                pCGameConfigReader__ms_imgFiles = *pattern.get_first<decltype(pCGameConfigReader__ms_imgFiles)>(1);
 
             pattern = hook::pattern("A1 ? ? ? ? 83 F8 08 74 05");
             CCutscenes__m_dwCutsceneState = *pattern.get_first<uint32_t*>(1);