Skip to content

Commit c2e2e93

Browse files
author
sourcehold
committed
refactor: remove enums from parameters and return types; improve global labels
1 parent 7e1149e commit c2e2e93

129 files changed

Lines changed: 1067 additions & 1031 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/OpenSHC/AI/AICState.func.hpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
*/
44

55
#include "OpenSHC/AI/AICState.hpp"
6-
#include "OpenSHC/AI/AINervousDestroyBuildingCategoryInt.hpp"
7-
#include "OpenSHC/AI/AIUnitBehaviourTypeInt.hpp"
8-
#include "OpenSHC/AI/AIVUnitTypeInt.hpp"
9-
#include "OpenSHC/Commands/CommandBuildingTypeInt.hpp"
6+
#include "OpenSHC/AI/AINervousDestroyBuildingCategory.hpp"
7+
#include "OpenSHC/AI/AIUnitBehaviourType.hpp"
8+
#include "OpenSHC/AI/AIVUnitType.hpp"
9+
#include "OpenSHC/Commands/CommandBuildingType.hpp"
1010
#include "OpenSHC/Game/Player/PlayerID.hpp"
11-
#include "OpenSHC/Game/Resources/ResourceTypeInt.hpp"
12-
#include "OpenSHC/Map/Units/UnitTypeInt.hpp"
11+
#include "OpenSHC/Game/Resources/ResourceType.hpp"
12+
#include "OpenSHC/Map/Units/UnitType.hpp"
1313
#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"
1414
namespace OpenSHC {
1515
namespace AI {
1616
namespace AICState_Func {
1717

18-
using OpenSHC::AI::AINervousDestroyBuildingCategoryInt;
19-
using OpenSHC::AI::AIUnitBehaviourTypeInt;
20-
using OpenSHC::AI::AIVUnitTypeInt;
21-
using OpenSHC::Commands::CommandBuildingTypeInt;
18+
using OpenSHC::AI::AINervousDestroyBuildingCategory;
19+
using OpenSHC::AI::AIUnitBehaviourType;
20+
using OpenSHC::AI::AIVUnitType;
21+
using OpenSHC::Commands::CommandBuildingType;
2222
using OpenSHC::Game::Player::PlayerID;
23-
using OpenSHC::Game::Resources::ResourceTypeInt;
24-
using OpenSHC::Map::Units::UnitTypeInt;
23+
using OpenSHC::Game::Resources::ResourceType;
24+
using OpenSHC::Map::Units::UnitType;
2525
using OpenSHC::WindowsHelper::Enums::BOOLEnum;
2626

2727
MACRO_FUNCTION_RESOLVER(void (AICState::*)(), false, Address::SHC_3BB0A8C1_0x004C6D30, &AICState::wipeAICMemory)
@@ -147,15 +147,15 @@ namespace AI {
147147
uint (AICState::*)(PlayerID), false, Address::SHC_3BB0A8C1_0x004CB540, &AICState::aiShouldBuildPitchrig)
148148
aiShouldBuildPitchrig;
149149

150-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(PlayerID, CommandBuildingTypeInt), false,
150+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(PlayerID, CommandBuildingType), false,
151151
Address::SHC_3BB0A8C1_0x004CB5B0, &AICState::shouldNotBeBuildingHovel)
152152
shouldNotBeBuildingHovel;
153153

154-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingTypeInt), false,
154+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingType), false,
155155
Address::SHC_3BB0A8C1_0x004CB610, &AICState::shouldWaitWithBuildingNegativeFearFactor)
156156
shouldWaitWithBuildingNegativeFearFactor;
157157

158-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingTypeInt), false,
158+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingType), false,
159159
Address::SHC_3BB0A8C1_0x004CB700, &AICState::shouldWaitWithBuildingAPositiveFearFactor)
160160
shouldWaitWithBuildingAPositiveFearFactor;
161161

@@ -171,7 +171,7 @@ namespace AI {
171171
&AICState::destroyBuildingIfNoWorker)
172172
destroyBuildingIfNoWorker;
173173

174-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingTypeInt), false,
174+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingType), false,
175175
Address::SHC_3BB0A8C1_0x004CB9F0, &AICState::shouldNotBuildMarketArmoryGranaryBarracksMercenarypost)
176176
shouldNotBuildMarketArmoryGranaryBarracksMercenarypost;
177177

@@ -183,19 +183,19 @@ namespace AI {
183183
&AICState::setupWorkshopProductionType)
184184
setupWorkshopProductionType;
185185

186-
MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, ResourceTypeInt, int), false, Address::SHC_3BB0A8C1_0x004CBFA0,
187-
&AICState::sellGoods)
186+
MACRO_FUNCTION_RESOLVER(
187+
void (AICState::*)(int, ResourceType, int), false, Address::SHC_3BB0A8C1_0x004CBFA0, &AICState::sellGoods)
188188
sellGoods;
189189

190-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, ResourceTypeInt, int), false,
191-
Address::SHC_3BB0A8C1_0x004CC000, &AICState::buyGoods)
190+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, ResourceType, int), false, Address::SHC_3BB0A8C1_0x004CC000,
191+
&AICState::buyGoods)
192192
buyGoods;
193193

194-
MACRO_FUNCTION_RESOLVER(AIUnitBehaviourTypeInt (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004CC070,
194+
MACRO_FUNCTION_RESOLVER(AIUnitBehaviourType (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004CC070,
195195
&AICState::randomlySelectAttackUnitTypeToRecruit)
196196
randomlySelectAttackUnitTypeToRecruit;
197197

198-
MACRO_FUNCTION_RESOLVER(UnitTypeInt (AICState::*)(int, AIUnitBehaviourTypeInt), false,
198+
MACRO_FUNCTION_RESOLVER(UnitType (AICState::*)(int, AIUnitBehaviourType), false,
199199
Address::SHC_3BB0A8C1_0x004CC250, &AICState::getUnitTypeForUnitBehaviourType)
200200
getUnitTypeForUnitBehaviourType;
201201

@@ -383,7 +383,7 @@ namespace AI {
383383
&AICState::processAttForceRallyPercentage)
384384
processAttForceRallyPercentage;
385385

386-
MACRO_FUNCTION_RESOLVER(void (AICState::*)(CommandBuildingTypeInt), false, Address::SHC_3BB0A8C1_0x004CEFD0,
386+
MACRO_FUNCTION_RESOLVER(void (AICState::*)(CommandBuildingType), false, Address::SHC_3BB0A8C1_0x004CEFD0,
387387
&AICState::useAITribe_0x12_toPlaceSiegeTentsAndAssignEngineers)
388388
useAITribe_0x12_toPlaceSiegeTentsAndAssignEngineers;
389389

@@ -479,12 +479,12 @@ namespace AI {
479479
&AICState::teamIsWeakRelativeToEnemy)
480480
teamIsWeakRelativeToEnemy;
481481

482-
MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, AINervousDestroyBuildingCategoryInt), false,
482+
MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, AINervousDestroyBuildingCategory), false,
483483
Address::SHC_3BB0A8C1_0x004D0280, &AICState::destroyAnyBuildingInCategory)
484484
destroyAnyBuildingInCategory;
485485

486-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, ResourceTypeInt, int), false,
487-
Address::SHC_3BB0A8C1_0x004D0520, &AICState::isResourceLargerOrEqualThanMinimumGoodsRequiredAfterTrade)
486+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, ResourceType, int), false, Address::SHC_3BB0A8C1_0x004D0520,
487+
&AICState::isResourceLargerOrEqualThanMinimumGoodsRequiredAfterTrade)
488488
isResourceLargerOrEqualThanMinimumGoodsRequiredAfterTrade;
489489

490490
MACRO_FUNCTION_RESOLVER(
@@ -586,7 +586,7 @@ namespace AI {
586586
void (AICState::*)(uint), false, Address::SHC_3BB0A8C1_0x004D1A00, &AICState::decideOnTribeAttackLocation)
587587
decideOnTribeAttackLocation;
588588

589-
MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, ResourceTypeInt, undefined4), false,
589+
MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, ResourceType, undefined4), false,
590590
Address::SHC_3BB0A8C1_0x004D1F00, &AICState::requestGoods)
591591
requestGoods;
592592

@@ -630,7 +630,7 @@ namespace AI {
630630
void (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D2A70, &AICState::aiGiveRaidInstructions)
631631
aiGiveRaidInstructions;
632632

633-
MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, AIVUnitTypeInt, int), false, Address::SHC_3BB0A8C1_0x004D2E00,
633+
MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, AIVUnitType, int), false, Address::SHC_3BB0A8C1_0x004D2E00,
634634
&AICState::sendTribeToAIVLocationSlot)
635635
sendTribeToAIVLocationSlot;
636636

@@ -726,19 +726,19 @@ namespace AI {
726726
void (AICState::*)(), false, Address::SHC_3BB0A8C1_0x004D53E0, &AICState::updateAIBehaviour)
727727
updateAIBehaviour;
728728

729-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingTypeInt), false,
729+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingType), false,
730730
Address::SHC_3BB0A8C1_0x004ECA30, &AICState::shouldNotBeBuildingGranary)
731731
shouldNotBeBuildingGranary;
732732

733-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(PlayerID, CommandBuildingTypeInt), false,
733+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(PlayerID, CommandBuildingType), false,
734734
Address::SHC_3BB0A8C1_0x004ECA60, &AICState::shouldNotBeBuildingArmoury)
735735
shouldNotBeBuildingArmoury;
736736

737-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingTypeInt), false,
737+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, CommandBuildingType), false,
738738
Address::SHC_3BB0A8C1_0x004ECA90, &AICState::shouldNotBuildKillingPits)
739739
shouldNotBuildKillingPits;
740740

741-
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(undefined4, CommandBuildingTypeInt), false,
741+
MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(undefined4, CommandBuildingType), false,
742742
Address::SHC_3BB0A8C1_0x004ECAB0, &AICState::woodCuttersHutWhileNoWoodAvailable)
743743
woodCuttersHutWhileNoWoodAvailable;
744744

‎src/OpenSHC/AI/AICState.hpp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99
#pragma once
1010

1111
#include "OpenSHC/AI/AIC/AICSpecification.hpp"
12-
#include "OpenSHC/AI/AINervousDestroyBuildingCategoryInt.hpp"
13-
#include "OpenSHC/AI/AIUnitBehaviourTypeInt.hpp"
14-
#include "OpenSHC/AI/AIVUnitTypeInt.hpp"
12+
#include "OpenSHC/AI/AINervousDestroyBuildingCategory.hpp"
13+
#include "OpenSHC/AI/AIUnitBehaviourType.hpp"
14+
#include "OpenSHC/AI/AIVUnitType.hpp"
1515
#include "OpenSHC/AI/TileDistancePair.hpp"
16-
#include "OpenSHC/Commands/CommandBuildingTypeInt.hpp"
16+
#include "OpenSHC/Commands/CommandBuildingType.hpp"
1717
#include "OpenSHC/Game/Player/PlayerID.hpp"
18-
#include "OpenSHC/Game/Resources/ResourceTypeInt.hpp"
19-
#include "OpenSHC/Map/Units/UnitTypeInt.hpp"
18+
#include "OpenSHC/Game/Resources/ResourceType.hpp"
19+
#include "OpenSHC/Map/Units/UnitType.hpp"
2020
#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"
2121

2222
namespace OpenSHC {
2323
namespace AI {
2424

25-
using OpenSHC::AI::AINervousDestroyBuildingCategoryInt;
26-
using OpenSHC::AI::AIUnitBehaviourTypeInt;
27-
using OpenSHC::AI::AIVUnitTypeInt;
25+
using OpenSHC::AI::AINervousDestroyBuildingCategory;
26+
using OpenSHC::AI::AIUnitBehaviourType;
27+
using OpenSHC::AI::AIVUnitType;
2828
using OpenSHC::AI::TileDistancePair;
2929
using OpenSHC::AI::AIC::AICSpecification;
30-
using OpenSHC::Commands::CommandBuildingTypeInt;
30+
using OpenSHC::Commands::CommandBuildingType;
3131
using OpenSHC::Game::Player::PlayerID;
32-
using OpenSHC::Game::Resources::ResourceTypeInt;
33-
using OpenSHC::Map::Units::UnitTypeInt;
32+
using OpenSHC::Game::Resources::ResourceType;
33+
using OpenSHC::Map::Units::UnitType;
3434
using OpenSHC::WindowsHelper::Enums::BOOLEnum;
3535

3636
#pragma pack(push, 1)
@@ -120,31 +120,31 @@ namespace AI {
120120

121121
uint aiShouldBuildPitchrig(PlayerID param_1);
122122

123-
BOOLEnum shouldNotBeBuildingHovel(PlayerID playerID, CommandBuildingTypeInt param_2);
123+
BOOLEnum shouldNotBeBuildingHovel(PlayerID playerID, CommandBuildingType param_2);
124124

125-
BOOLEnum shouldWaitWithBuildingNegativeFearFactor(int param_1, CommandBuildingTypeInt param_2);
125+
BOOLEnum shouldWaitWithBuildingNegativeFearFactor(int param_1, CommandBuildingType param_2);
126126

127-
BOOLEnum shouldWaitWithBuildingAPositiveFearFactor(int playerID, CommandBuildingTypeInt param_2);
127+
BOOLEnum shouldWaitWithBuildingAPositiveFearFactor(int playerID, CommandBuildingType param_2);
128128

129129
BOOLEnum destroyHouse(int playerID);
130130

131131
undefined4 shouldDestroyWoodCutterUnk(int playerID);
132132

133133
undefined4 destroyBuildingIfNoWorker(int buildingID);
134134

135-
BOOLEnum shouldNotBuildMarketArmoryGranaryBarracksMercenarypost(int playerID, CommandBuildingTypeInt param_2);
135+
BOOLEnum shouldNotBuildMarketArmoryGranaryBarracksMercenarypost(int playerID, CommandBuildingType param_2);
136136

137137
void planToBuyWhenLowOnResourceAndSnoozeBuildings(int playerID);
138138

139139
void setupWorkshopProductionType(int playerID, int buildingID);
140140

141-
void sellGoods(int playerID, ResourceTypeInt resourceType, int amount);
141+
void sellGoods(int playerID, ResourceType resourceType, int amount);
142142

143-
BOOLEnum buyGoods(int playerID, ResourceTypeInt resourceType, int amount);
143+
BOOLEnum buyGoods(int playerID, ResourceType resourceType, int amount);
144144

145-
AIUnitBehaviourTypeInt randomlySelectAttackUnitTypeToRecruit(int playerID);
145+
AIUnitBehaviourType randomlySelectAttackUnitTypeToRecruit(int playerID);
146146

147-
UnitTypeInt getUnitTypeForUnitBehaviourType(int playerID, AIUnitBehaviourTypeInt unitBehaviourType);
147+
UnitType getUnitTypeForUnitBehaviourType(int playerID, AIUnitBehaviourType unitBehaviourType);
148148

149149
void generateSiegeCreationInformation(int playerID, int buildingID, int unitID);
150150

@@ -239,7 +239,7 @@ namespace AI {
239239

240240
BOOLEnum processAttForceRallyPercentage(int playerID);
241241

242-
void useAITribe_0x12_toPlaceSiegeTentsAndAssignEngineers(CommandBuildingTypeInt playerID);
242+
void useAITribe_0x12_toPlaceSiegeTentsAndAssignEngineers(CommandBuildingType playerID);
243243

244244
void useAITribe_0xe_toPlaceTunnels(int playerID);
245245

@@ -287,10 +287,10 @@ namespace AI {
287287

288288
BOOLEnum teamIsWeakRelativeToEnemy(int playerID, BOOLEnum param_2);
289289

290-
void destroyAnyBuildingInCategory(int playerID, AINervousDestroyBuildingCategoryInt buildingCategory);
290+
void destroyAnyBuildingInCategory(int playerID, AINervousDestroyBuildingCategory buildingCategory);
291291

292292
BOOLEnum isResourceLargerOrEqualThanMinimumGoodsRequiredAfterTrade(
293-
int playerID, ResourceTypeInt resourceType, int buffer);
293+
int playerID, ResourceType resourceType, int buffer);
294294

295295
BOOLEnum aiOfTypeInCurrentGame(int param_1);
296296

@@ -342,7 +342,7 @@ namespace AI {
342342

343343
void decideOnTribeAttackLocation(uint tribeID__moatWasHit);
344344

345-
void requestGoods(int playerID, ResourceTypeInt resourceType, undefined4 amount);
345+
void requestGoods(int playerID, ResourceType resourceType, undefined4 amount);
346346

347347
void aiCreateSiegeUnits(int playerID);
348348

@@ -364,7 +364,7 @@ namespace AI {
364364

365365
void aiGiveRaidInstructions(int playerID);
366366

367-
void sendTribeToAIVLocationSlot(int tribeID, AIVUnitTypeInt aivUnitType, int slotIndex);
367+
void sendTribeToAIVLocationSlot(int tribeID, AIVUnitType aivUnitType, int slotIndex);
368368

369369
void computeAttackPossibilities(int playerID);
370370

@@ -412,13 +412,13 @@ namespace AI {
412412

413413
void updateAIBehaviour();
414414

415-
BOOLEnum shouldNotBeBuildingGranary(int playerID, CommandBuildingTypeInt param_2);
415+
BOOLEnum shouldNotBeBuildingGranary(int playerID, CommandBuildingType param_2);
416416

417-
BOOLEnum shouldNotBeBuildingArmoury(PlayerID playerID, CommandBuildingTypeInt param_2);
417+
BOOLEnum shouldNotBeBuildingArmoury(PlayerID playerID, CommandBuildingType param_2);
418418

419-
BOOLEnum shouldNotBuildKillingPits(int playerID, CommandBuildingTypeInt commandBuildingType);
419+
BOOLEnum shouldNotBuildKillingPits(int playerID, CommandBuildingType commandBuildingType);
420420

421-
BOOLEnum woodCuttersHutWhileNoWoodAvailable(undefined4 playerID, CommandBuildingTypeInt param_2);
421+
BOOLEnum woodCuttersHutWhileNoWoodAvailable(undefined4 playerID, CommandBuildingType param_2);
422422
};
423423

424424
static_assert_cpp98_obj(sizeof(AICState) == 28048, AICState);

‎src/OpenSHC/AI/AIVState.func.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
path: 'OpenSHC/AI/AIVState.func.hpp'
33
*/
44

5-
#include "OpenSHC/AI/AIGridComputationResourceTypeInt.hpp"
6-
#include "OpenSHC/AI/AIV/AIVBuildingType2Int.hpp"
5+
#include "OpenSHC/AI/AIGridComputationResourceType.hpp"
6+
#include "OpenSHC/AI/AIV/AIVBuildingType2.hpp"
77
#include "OpenSHC/AI/AIVState.hpp"
8-
#include "OpenSHC/Commands/CommandBuildingTypeInt.hpp"
8+
#include "OpenSHC/Commands/CommandBuildingType.hpp"
99
#include "OpenSHC/Game/Player/PlayerID.hpp"
1010
#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"
1111
namespace OpenSHC {
1212
namespace AI {
1313
namespace AIVState_Func {
1414

15-
using OpenSHC::AI::AIGridComputationResourceTypeInt;
16-
using OpenSHC::AI::AIV::AIVBuildingType2Int;
17-
using OpenSHC::Commands::CommandBuildingTypeInt;
15+
using OpenSHC::AI::AIGridComputationResourceType;
16+
using OpenSHC::AI::AIV::AIVBuildingType2;
17+
using OpenSHC::Commands::CommandBuildingType;
1818
using OpenSHC::Game::Player::PlayerID;
1919
using OpenSHC::WindowsHelper::Enums::BOOLEnum;
2020

@@ -42,7 +42,7 @@ namespace AI {
4242
&AIVState::setKeepOffsetAndOrientation)
4343
setKeepOffsetAndOrientation;
4444

45-
MACRO_FUNCTION_RESOLVER(CommandBuildingTypeInt (AIVState::*)(AIVBuildingType2Int), false,
45+
MACRO_FUNCTION_RESOLVER(CommandBuildingType (AIVState::*)(AIVBuildingType2), false,
4646
Address::SHC_3BB0A8C1_0x004ECFE0, &AIVState::convertAIVBuildingTypeToCommandBuildingType)
4747
convertAIVBuildingTypeToCommandBuildingType;
4848

@@ -73,15 +73,15 @@ namespace AI {
7373
void (AIVState::*)(int, int), false, Address::SHC_3BB0A8C1_0x004EDCB0, &AIVState::set0x13ValueTo10InHeatMap)
7474
set0x13ValueTo10InHeatMap;
7575

76-
MACRO_FUNCTION_RESOLVER(int (AIVState::*)(PlayerID, CommandBuildingTypeInt), false,
76+
MACRO_FUNCTION_RESOLVER(int (AIVState::*)(PlayerID, CommandBuildingType), false,
7777
Address::SHC_3BB0A8C1_0x004EDDF0, &AIVState::findSuitableLocationCloseToKeepAndPlaceBuilding)
7878
findSuitableLocationCloseToKeepAndPlaceBuilding;
7979

8080
MACRO_FUNCTION_RESOLVER(void (AIVState::*)(int), false, Address::SHC_3BB0A8C1_0x004EE140,
8181
&AIVState::findAppropriateWoodCutterLocation)
8282
findAppropriateWoodCutterLocation;
8383

84-
MACRO_FUNCTION_RESOLVER(void (AIVState::*)(int, AIGridComputationResourceTypeInt), false,
84+
MACRO_FUNCTION_RESOLVER(void (AIVState::*)(int, AIGridComputationResourceType), false,
8585
Address::SHC_3BB0A8C1_0x004EE430, &AIVState::findAppropriateBuildingLocationForResourceType)
8686
findAppropriateBuildingLocationForResourceType;
8787

@@ -109,7 +109,7 @@ namespace AI {
109109
int (AIVState::*)(int), false, Address::SHC_3BB0A8C1_0x004EF8C0, &AIVState::computeAIVPlacementFit)
110110
computeAIVPlacementFit;
111111

112-
MACRO_FUNCTION_RESOLVER(int (AIVState::*)(int, CommandBuildingTypeInt), false, Address::SHC_3BB0A8C1_0x004EFA60,
112+
MACRO_FUNCTION_RESOLVER(int (AIVState::*)(int, CommandBuildingType), false, Address::SHC_3BB0A8C1_0x004EFA60,
113113
&AIVState::aiPlaceFarm)
114114
aiPlaceFarm;
115115

0 commit comments

Comments
 (0)