Skip to content

Commit e2889c7

Browse files
committed
Revert "fix some variables not being processed in save load"
This reverts commit 8c41e04.
1 parent a9fa186 commit e2889c7

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

src/Ext/OverlayType/Body.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ template <typename T>
1414
void OverlayTypeExt::ExtData::Serialize(T& Stm)
1515
{
1616
Stm
17-
.Process(this->ZAdjust)
1817
.Process(this->PaletteFile)
1918
;
2019
}

src/Misc/Hooks.BugFixes.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ DEFINE_HOOK(0x5F53AA, ObjectClass_ReceiveDamage_DyingFix, 0x6)
9797
DEFINE_HOOK(0x4D7431, FootClass_ReceiveDamage_DyingFix, 0x5)
9898
{
9999
GET(FootClass*, pThis, ESI);
100-
GET(const DamageState, result, EAX);
100+
GET(DamageState, result, EAX);
101101

102102
if (result != DamageState::PostMortem && (pThis->IsSinking || (!pThis->IsAttackedByLocomotor && pThis->IsCrashing)))
103103
R->EAX(DamageState::PostMortem);
@@ -108,7 +108,7 @@ DEFINE_HOOK(0x4D7431, FootClass_ReceiveDamage_DyingFix, 0x5)
108108
DEFINE_HOOK(0x737D57, UnitClass_ReceiveDamage_DyingFix, 0x7)
109109
{
110110
GET(UnitClass*, pThis, ESI);
111-
GET(const DamageState, result, EAX);
111+
GET(DamageState, result, EAX);
112112

113113
// Immediately release locomotor warhead's hold on a crashable unit if it dies while attacked by one.
114114
if (result == DamageState::NowDead && pThis->IsAttackedByLocomotor && pThis->Type->Crashable)
@@ -252,7 +252,7 @@ DEFINE_HOOK(0x4438B4, BuildingClass_SetRallyPoint_Naval, 0x6)
252252
REF_STACK(SpeedType, spdtp, STACK_OFFSET(0xA4, -0x84));
253253
if (!playEVA)// assuming the hook above is the only place where it's set to false when UndeploysInto
254254
{
255-
if (const auto pInto = pBuildingType->UndeploysInto)// r u sure this is not too OP?
255+
if (auto pInto = pBuildingType->UndeploysInto)// r u sure this is not too OP?
256256
{
257257
R->ESI(pInto->MovementZone);
258258
spdtp = pInto->SpeedType;
@@ -428,7 +428,7 @@ DEFINE_HOOK(0x73B2A2, UnitClass_DrawObject_DrawerBlitterFix, 0x6)
428428
enum { SkipGameCode = 0x73B2C3 };
429429

430430
GET(UnitClass* const, pThis, ESI);
431-
GET(const BlitterFlags, blitterFlags, EDI);
431+
GET(BlitterFlags, blitterFlags, EDI);
432432

433433
R->EAX(pThis->GetDrawer()->SelectPlainBlitter(blitterFlags));
434434

@@ -625,7 +625,7 @@ DEFINE_HOOK(0x51A996, InfantryClass_PerCellProcess_KillOnImpassable, 0x5)
625625
enum { ContinueChecks = 0x51A9A0, SkipKilling = 0x51A9EB };
626626

627627
GET(InfantryClass*, pThis, ESI);
628-
GET(const LandType, landType, EBX);
628+
GET(LandType, landType, EBX);
629629

630630
if (landType == LandType::Rock)
631631
return ContinueChecks;
@@ -1110,7 +1110,7 @@ DEFINE_HOOK(0x743664, UnitClass_ReadFromINI_Follower3, 0x6)
11101110
{
11111111
enum { SkipGameCode = 0x7436AC };
11121112

1113-
REF_STACK(const TypeList<int>, followers, STACK_OFFSET(0xCC, -0xC0));
1113+
REF_STACK(TypeList<int>, followers, STACK_OFFSET(0xCC, -0xC0));
11141114
auto& units = UnitParseTemp::ParsedUnits;
11151115

11161116
for (size_t i = 0; i < units.size(); i++)

src/New/Entity/AttachEffectClass.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -977,8 +977,6 @@ bool AttachEffectClass::Serialize(T& Stm)
977977
.Process(this->IsCloaked)
978978
.Process(this->HasInitialized)
979979
.Process(this->NeedsDurationRefresh)
980-
.Process(this->LastDiscardCheckFrame)
981-
.Process(this->LastDiscardCheckValue)
982980
.Process(this->HasCumulativeAnim)
983981
.Process(this->ShouldBeDiscarded)
984982
.Process(this->LastActiveStat)

src/New/Entity/ShieldClass.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ bool ShieldClass::Serialize(T& Stm)
8888
.Process(this->Techno)
8989
.Process(this->TechnoID)
9090
.Process(this->IdleAnim)
91-
.Process(this->Timers.SelfHealing_CombatRestart)
9291
.Process(this->Timers.SelfHealing)
9392
.Process(this->Timers.SelfHealing_WHModifier)
9493
.Process(this->Timers.Respawn)

0 commit comments

Comments
 (0)