Merge pull request #1432 from mouzedrift/oddworld2

fix crash when custom LCD Screen messages were added
AliveTeam · Jan 12, 2022 · 9099f4a · 9099f4a
2 parents ad5028b + a027be0
commit 9099f4a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Source/AliveLibAE/PathDataExtensions.cpp b/Source/AliveLibAE/PathDataExtensions.cpp
@@ -80,10 +80,10 @@ void Path_Set_NewData_FromLvls()
 
                             pChunkData += sizeof(PerPathExtension);
 
-                            // Apply led messages
-                            auto pLedMsgs = reinterpret_cast<StringTable*>(pChunkData);
-                            pChunkData = StringTable::MakeTable(pLedMsgs);
-                            SetLcdMessagesForLvl(*pLedMsgs, static_cast<LevelIds>(lvlIdx), pExt->mPathId);
+                            // Apply LCD Screen messages
+                            auto pLCDScreenMsgs = reinterpret_cast<StringTable*>(pChunkData);
+                            pChunkData = StringTable::MakeTable(pLCDScreenMsgs);
+                            SetLcdMessagesForLvl(*pLCDScreenMsgs, static_cast<LevelIds>(lvlIdx), pExt->mPathId);
 
                             // Will be empty for AE
                             auto pHintFlyMsgs = reinterpret_cast<StringTable*>(pChunkData);

diff --git a/Source/AliveLibAO/PathDataExtensions.cpp b/Source/AliveLibAO/PathDataExtensions.cpp
@@ -87,10 +87,10 @@ void Path_Set_NewData_FromLvls()
 
                             pChunkData += sizeof(PerPathExtension);
 
-                            // Apply led messages
-                            auto pLedMsgs = reinterpret_cast<StringTable*>(pChunkData);
-                            pChunkData = StringTable::MakeTable(pLedMsgs);
-                            SetLcdMessagesForLvl(*pLedMsgs, static_cast<LevelIds>(lvlIdx), pExt->mPathId);
+                            // Apply LCD Screen messages
+                            auto pLCDScreenMsgs = reinterpret_cast<StringTable*>(pChunkData);
+                            pChunkData = StringTable::MakeTable(pLCDScreenMsgs);
+                            SetLcdMessagesForLvl(*pLCDScreenMsgs, static_cast<LevelIds>(lvlIdx), pExt->mPathId);
 
                             // Apply hint fly messages
                             auto pHintFlyMsgs = reinterpret_cast<StringTable*>(pChunkData);

diff --git a/Source/AliveLibCommon/PathDataExtensionsTypes.hpp b/Source/AliveLibCommon/PathDataExtensionsTypes.hpp
@@ -12,7 +12,7 @@ struct StringTable final
         // Read the string count
         u8* pDataIter = reinterpret_cast<u8*>(pTable);
         const u64 stringCount = *reinterpret_cast<u64*>(pDataIter);
-        pDataIter += sizeof(u32);
+        pDataIter += sizeof(u64);
 
         if (stringCount > 0)
         {