From fb3a9d40b2a0502bb44d8d812b32fbef34abc754 Mon Sep 17 00:00:00 2001 From: rftr Date: Mon, 21 Mar 2022 05:30:53 +0000 Subject: [PATCH] remove initialisers from rebel command structs git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9335 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Rebel Command.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Strategic/Rebel Command.h b/Strategic/Rebel Command.h index df4a2810..8b4e24f6 100644 --- a/Strategic/Rebel Command.h +++ b/Strategic/Rebel Command.h @@ -80,8 +80,8 @@ typedef struct Info { extern Info info; typedef struct DirectiveSaveInfo { - INT8 iLevel = 0; - RebelCommandDirectives id = RCD_NONE; + INT8 iLevel; + RebelCommandDirectives id; BOOLEAN CanImprove() { return id != RCD_NONE && (size_t)iLevel < info.directives[id].iCostToImprove.size() && info.directives[id].GetCostToImprove(iLevel); } void Improve() { iLevel++; } @@ -92,10 +92,10 @@ typedef struct DirectiveSaveInfo { typedef struct RegionSaveInfo { - RegionAdminStatus adminStatus = RAS_NONE; + RegionAdminStatus adminStatus; RebelCommandAdminActions actions[REBEL_COMMAND_MAX_ACTIONS_PER_REGION]; UINT8 actionLevels[REBEL_COMMAND_MAX_ACTIONS_PER_REGION]; - UINT8 ubMaxLoyalty = 50; + UINT8 ubMaxLoyalty; INT32 GetAdminDeployCost(INT16 numAdminTeams) { return 10 * numAdminTeams * numAdminTeams; }; INT32 GetAdminReactivateCost(INT16 numAdminTeams) { return GetAdminDeployCost(numAdminTeams) / 4; }; @@ -106,11 +106,11 @@ typedef struct SaveInfo RegionSaveInfo regions[MAX_TOWNS]; DirectiveSaveInfo directives[20]; - INT32 iSupplies = 0; - INT32 iActiveDirective = RCD_GATHER_SUPPLIES; - INT32 iSelectedDirective = RCD_GATHER_SUPPLIES; - INT8 iMilitiaStatsLevel = 0; - UINT8 uSupplyDropCount = 0; + INT32 iSupplies; + INT32 iActiveDirective; + INT32 iSelectedDirective; + INT8 iMilitiaStatsLevel; + UINT8 uSupplyDropCount; INT8 filler[19]; } SaveInfo;