From 9bfcc11a3955cbaef5da765699bb2aa3e86c9324 Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <timfelgentreff@gmail.com>
Date: Sat, 19 Feb 2022 22:13:42 +0100
Subject: [PATCH] sort the CUnit::Init variables as in the header
---
src/unit/unit.cpp | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/unit/unit.cpp b/src/unit/unit.cpp
index cf7125c78..af8accb32 100644
--- a/src/unit/unit.cpp
+++ b/src/unit/unit.cpp
@@ -430,43 +430,45 @@ void CUnit::Init()
pathFinderData = new PathFinderData;
pathFinderData->input.SetUnit(*this);
+ Frame = 0;
Colors = -1;
+ memset(IndividualUpgrades, 0, sizeof(IndividualUpgrades));
IX = 0;
IY = 0;
- Frame = 0;
Direction = 0;
+ CurrentResource = 0;
+ ResourcesHeld = 0;
DamagedType = ANIMATIONS_DEATHTYPES;
Attacked = 0;
+ Summoned = 0;
+ Blink = 0;
+ Moving = 0;
+ ReCast = 0;
+ AutoRepair = 0;
Burning = 0;
Destroyed = 0;
Removed = 0;
Selected = 0;
- TeamSelected = 0;
Constructed = 0;
Active = 0;
Boarded = 0;
+ CacheLock = 0;
+ Waiting = 0;
+ MineLow = 0;
+ TeamSelected = 0;
RescuedFrom = NULL;
memset(VisCount, 0, sizeof(VisCount));
memset(&Seen, 0, sizeof(Seen));
delete Variable;
Variable = NULL;
TTL = 0;
- Threshold = 0;
- UnderAttack = 0;
GroupId = 0;
LastGroup = 0;
- ResourcesHeld = 0;
Wait = 0;
- Blink = 0;
- Moving = 0;
- ReCast = 0;
- CacheLock = 0;
- Summoned = 0;
- Waiting = 0;
- MineLow = 0;
+ Threshold = 0;
+ UnderAttack = 0;
memset(&Anim, 0, sizeof(Anim));
memset(&WaitBackup, 0, sizeof(WaitBackup));
- CurrentResource = 0;
Orders.clear();
delete SavedOrder;
SavedOrder = NULL;
@@ -478,9 +480,7 @@ void CUnit::Init()
AutoCastSpell = NULL;
delete SpellCoolDownTimers;
SpellCoolDownTimers = NULL;
- AutoRepair = 0;
Goal = NULL;
- memset(IndividualUpgrades, 0, sizeof(IndividualUpgrades));
}
CUnit::~CUnit() {