fix 0x529A14 crash on linux

Phobos-developers · Jan 2, 2024 · f6d849d · f6d849d
1 parent 7cca818
commit f6d849d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/CREDITS.md b/CREDITS.md
@@ -281,6 +281,7 @@ This page lists all the individual contributions to the project by their author.
    - Permanent healthbar display on units targeted by temporal weapons fix
    - Powered anims on buildings cease playing upon capture by different house fix
    - TechnoType conversion placeholder
+   - EIP 00529A14 crash fix on Linux 
    - Misc code refactor & maintenance, CN doc fixes, bugfixes
 - **FlyStar**
    - Campaign load screen PCX support

diff --git a/docs/Fixed-or-Improved-Logics.md b/docs/Fixed-or-Improved-Logics.md
@@ -140,6 +140,8 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Attached animations on flying units now have their layer updated immediately after the parent unit, if on same layer they always draw above the parent.
 - Fixed the issue where the powered anims of `Powered`/`PoweredSpecial` buildings cease to update when being captured by enemies.
 - Fix a glitch related to incorrect target setting for missiles.
+- Fix [EIP 00529A14](https://modenc.renegadeprojects.com/Internal_Error/YR#eip_00529A14) when attempting to read `[Header]` section of campaign maps.
+
 ## Fixes / interactions with other extensions
 
 - All forms of type conversion (including Ares') now correctly update `OpenTopped` state of passengers in transport that is converted.

diff --git a/docs/Whats-New.md b/docs/Whats-New.md
@@ -397,6 +397,7 @@ Vanilla fixes:
 - Fixed `TurretOffset` to be supported for SHP vehicles (by TwinkleStar)
 - `Powered`/`PoweredSpecial` buildings' powered anims will update as usual when being captured by enemies (by Trsdy)
 - Fixed a glitch related to incorrect target setting for missiles (by Belonit)
+- Skipped parsing `[Header]` section of compaign maps which led to occasional crashes on Linux (by Trsdy)
 
 Phobos fixes:
 - Fixed a few errors of calling for superweapon launch by `LaunchSW` or building infiltration (by Trsdy)

diff --git a/src/Misc/Hooks.BugFixes.cpp b/src/Misc/Hooks.BugFixes.cpp
@@ -813,3 +813,8 @@ DEFINE_HOOK(0x6B75AC, SpawnManagerClass_AI_SetDestinationForMissiles, 0x5)
 
 	return 0x6B75BC;
 }
+
+DEFINE_HOOK(0x689EB0, ScenarioClass_ReadMap_SkipHeaderInCampaign, 0x6)
+{
+	return SessionClass::IsCampaign() ? 0x689FC0 : 0;
+}