diff options
Diffstat (limited to 'src/ai')
-rw-r--r-- | src/ai/ai.hpp | 2 | ||||
-rw-r--r-- | src/ai/ai_core.cpp | 11 | ||||
-rw-r--r-- | src/ai/api/ai_object.hpp | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp index a23c411af..04eb7b16d 100644 --- a/src/ai/ai.hpp +++ b/src/ai/ai.hpp @@ -20,8 +20,6 @@ typedef std::map<const char *, class AIInfo *, StringCompare> AIInfoList; -void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2); - class AI { public: /** diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp index baf738920..eb93ecff3 100644 --- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -218,14 +218,15 @@ event->Release(); } -void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2) +void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2) { - AIObject::SetLastCommandRes(success); + AIObject::SetLastCommandRes(result.Succeeded()); - if (!success) { - AIObject::SetLastError(AIError::StringToError(_error_message)); + if (result.Failed()) { + AIObject::SetLastError(AIError::StringToError(result.GetErrorMessage())); } else { - AIObject::IncreaseDoCommandCosts(AIObject::GetLastCost()); + AIObject::IncreaseDoCommandCosts(result.GetCost()); + AIObject::SetLastCost(result.GetCost()); } Company::Get(_current_company)->ai_instance->Continue(); diff --git a/src/ai/api/ai_object.hpp b/src/ai/api/ai_object.hpp index 98343e870..77e9fe885 100644 --- a/src/ai/api/ai_object.hpp +++ b/src/ai/api/ai_object.hpp @@ -36,7 +36,7 @@ typedef bool (AIModeProc)(); * command processing, and command-validation checks. */ class AIObject : public SimpleCountedObject { -friend void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2); +friend void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2); friend class AIInstance; protected: /** |