skip load ctor call in teleportloco_load which resets the timer

chaserli · Jan 29, 2024 · 193223e · 193223e
1 parent 00a54cd
commit 193223e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/CREDITS.md b/CREDITS.md
@@ -286,6 +286,7 @@ This page lists all the individual contributions to the project by their author.
    - Powered anims on buildings cease playing upon capture by different house fix
    - TechnoType conversion placeholder
    - EIP 00529A14 crash fix on Linux
+   - Teleport timer reset after load game fix
    - Skip units' turret rotation and jumpjets' wobbling under EMP
    - Misc code refactor & maintenance, CN doc fixes, bugfixes
 - **FlyStar**

diff --git a/docs/Fixed-or-Improved-Logics.md b/docs/Fixed-or-Improved-Logics.md
@@ -145,7 +145,7 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Jumpjets will no longer wobble under EMP.
 - Fixed `AmbientDamage` when used with `IsRailgun=yes` being cut off by elevation changes.
 - Fixed railgun and fire particles being cut off by elevation changes.
-
+- Fixed teleport units' (for example CLEG) frozen-still timer being cleared after load game.
 
 ## Fixes / interactions with other extensions
 

diff --git a/docs/Whats-New.md b/docs/Whats-New.md
@@ -407,6 +407,7 @@ Vanilla fixes:
 - Fixed units' turret rotation and jumpjet wobble under EMP (by Trsdy)
 - Fixed `AmbientDamage` when used with `IsRailgun=yes` being cut off by elevation changes (by Starkku)
 - Fixed railgun and fire particles being cut off by elevation changes (by Starkku)
+- Fixed teleport units' frozen-still timer being reset after load game (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
@@ -802,3 +802,5 @@ DEFINE_HOOK(0x689EB0, ScenarioClass_ReadMap_SkipHeaderInCampaign, 0x6)
 {
 	return SessionClass::IsCampaign() ? 0x689FC0 : 0;
 }
+
+DEFINE_JUMP(LJMP, 0x719CBC, 0x719CD8);//Skip incorrect load ctor call in TeleportLocomotionClass_Load
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     	return SessionClass::IsCampaign() ? 0x689FC0 : 0;
     }
+    DEFINE_JUMP(LJMP, 0x719CBC, 0x719CD8);//Skip incorrect load ctor call in TeleportLocomotionClass_Load