dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r17500) -Fix (r16502): The wrong value was restored to SetAllowDoCommand possible resulting in an AI that wasn't allowed to do any actions

Browse Source
This commit is contained in:
yexo
2009-09-11 17:18:06 +00:00
parent c9a25c88fa
commit 8ef7b80719
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ai/api/ai_object.cpp
View File

@@ -169,6 +169,11 @@ void AIObject::SetAllowDoCommand(bool allow)
}
bool AIObject::GetAllowDoCommand()
{
return GetStorage()->allow_do_command;
}
bool AIObject::CanSuspend()
{
Squirrel *squirrel = Company::Get(_current_company)->ai_instance->engine;
return GetStorage()->allow_do_command && squirrel->CanSuspend();
@@ -197,7 +202,7 @@ int AIObject::GetCallbackVariable(int index)
bool AIObject::DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint cmd, const char *text, AISuspendCallbackProc *callback)
{
if (AIObject::GetAllowDoCommand() == false) {
if (!AIObject::CanSuspend()) {
throw AI_FatalError("You are not allowed to execute any DoCommand (even indirect) in your constructor, Save(), Load(), and any valuator.");
}