Skip to content

Commit 28eb163

Browse files
author
sourcehold
committed
improve code style
1 parent 6d3a2c2 commit 28eb163

1 file changed

Lines changed: 16 additions & 21 deletions

File tree

src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,63 @@
11
#include "OpenSHC/AI/AICState.hpp"
2+
#include "OpenSHC/AI/AITypeA.hpp"
23
#include "OpenSHC/Game/Resources/ResourceType.hpp"
34
#include "OpenSHC/Globals/DAT_AICState.hpp"
45
#include "OpenSHC/Globals/DAT_GameState.hpp"
56

67
namespace OpenSHC {
78
namespace AI {
89

10+
using OpenSHC::AI::AITypeA;
911
using OpenSHC::Game::Resources::ResourceType;
1012

1113
// FUNCTION: STRONGHOLDCRUSADER 0x004CB060
1214
void AICState::setFoodBuyPlan(int playerID)
1315
{
14-
int aiType;
15-
int aiConfigIndex;
16-
int minimumStock;
1716

18-
aiType = DAT_GameState::ptr->playerDataArray[playerID].aiType;
17+
int aiType = DAT_GameState::ptr->playerDataArray[playerID].aiType;
1918

2019
// Early return if not an AI player (human player has aiType == 0)
21-
if (aiType == 0) {
20+
if (aiType == AITypeA::AITA_NULL) {
2221
return;
2322
}
2423

2524
// Get AI configuration index (convert 1-based to 0-based index)
26-
aiConfigIndex = aiType - 1;
25+
int aiConfigIndex = aiType - 1;
2726

2827
// Check each food type and queue purchase if current stock is below minimum
2928

3029
// Apples: special handling with >= 0 check (allows -1 to disable)
31-
minimumStock = this->DAT_AICArray[aiConfigIndex].minimumApples;
32-
if (minimumStock >= 0
33-
&& DAT_GameState::ptr->playerDataArray[playerID].currentResources[ResourceType::RT_APPLE] < minimumStock) {
30+
int minimumApples = this->DAT_AICArray[aiConfigIndex].minimumApples;
31+
int* currentResources = DAT_GameState::ptr->playerDataArray[playerID].currentResources;
32+
if (minimumApples >= 0 && currentResources[ResourceType::RT_APPLE] < minimumApples) {
3433
DAT_GameState::ptr->playerDataArray[playerID].resourcesToAcquireArray[ResourceType::RT_APPLE]
3534
= this->DAT_AICArray[aiConfigIndex].tradeAmountFood;
3635
}
3736

3837
// Cheese: standard check with > 0
39-
minimumStock = this->DAT_AICArray[aiConfigIndex].minimumCheese;
40-
if (minimumStock > 0
41-
&& DAT_GameState::ptr->playerDataArray[playerID].currentResources[ResourceType::RT_CHEESE] < minimumStock) {
38+
int minimumCheese = this->DAT_AICArray[aiConfigIndex].minimumCheese;
39+
if (minimumCheese > 0 && currentResources[ResourceType::RT_CHEESE] < minimumCheese) {
4240
DAT_GameState::ptr->playerDataArray[playerID].resourcesToAcquireArray[ResourceType::RT_CHEESE]
4341
= this->DAT_AICArray[aiConfigIndex].tradeAmountFood;
4442
}
4543

4644
// Bread: standard check with > 0
47-
minimumStock = this->DAT_AICArray[aiConfigIndex].minimumBread;
48-
if (minimumStock > 0
49-
&& DAT_GameState::ptr->playerDataArray[playerID].currentResources[ResourceType::RT_BREAD] < minimumStock) {
45+
int minimumBread = this->DAT_AICArray[aiConfigIndex].minimumBread;
46+
if (minimumBread > 0 && currentResources[ResourceType::RT_BREAD] < minimumBread) {
5047
DAT_GameState::ptr->playerDataArray[playerID].resourcesToAcquireArray[ResourceType::RT_BREAD]
5148
= this->DAT_AICArray[aiConfigIndex].tradeAmountFood;
5249
}
5350

5451
// Wheat: standard check with > 0
55-
minimumStock = this->DAT_AICArray[aiConfigIndex].minimumWheat;
56-
if (minimumStock > 0
57-
&& DAT_GameState::ptr->playerDataArray[playerID].currentResources[ResourceType::RT_WHEAT] < minimumStock) {
52+
int minimumWheat = this->DAT_AICArray[aiConfigIndex].minimumWheat;
53+
if (minimumWheat > 0 && currentResources[ResourceType::RT_WHEAT] < minimumWheat) {
5854
DAT_GameState::ptr->playerDataArray[playerID].resourcesToAcquireArray[ResourceType::RT_WHEAT]
5955
= this->DAT_AICArray[aiConfigIndex].tradeAmountFood;
6056
}
6157

6258
// Hops: standard check with > 0
63-
minimumStock = this->DAT_AICArray[aiConfigIndex].minimumHop;
64-
if (minimumStock > 0
65-
&& DAT_GameState::ptr->playerDataArray[playerID].currentResources[ResourceType::RT_HOPS] < minimumStock) {
59+
int minimumHop = this->DAT_AICArray[aiConfigIndex].minimumHop;
60+
if (minimumHop > 0 && currentResources[ResourceType::RT_HOPS] < minimumHop) {
6661
DAT_GameState::ptr->playerDataArray[playerID].resourcesToAcquireArray[ResourceType::RT_HOPS]
6762
= this->DAT_AICArray[aiConfigIndex].tradeAmountFood;
6863
}

0 commit comments

Comments
 (0)