cpp/openttd-patchpack/source File Diff

File diff r18506:b0c2bbd32450 → r18507:a734d5918322

src/script/api/script_object.cpp

➞

Show inline comments

@@ @@ -234,25 +234,25 @@ ScriptObject::ActiveInstance::~ActiveIns @@
 	/* Set the default callback to return a true/false result of the DoCommand */
 	if (callback == NULL) callback = &ScriptInstance::DoCommandReturn;
 	/* Are we only interested in the estimate costs? */
 	bool estimate_only = GetDoCommandMode() != NULL && !GetDoCommandMode()();
 #ifdef ENABLE_NETWORK
 	/* Only set p2 when the command does not come from the network. */
 	if (GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = UINT32_MAX;
 #endif
 	/* Try to perform the command. */
-	CommandCost res = ::DoCommandPInternal(tile, p1, p2, cmd, _networking ? CcAI : NULL, text, false, estimate_only);
+	CommandCost res = ::DoCommandPInternal(tile, p1, p2, cmd, _networking ? ScriptObject::GetActiveInstance()->GetDoCommandCallback() : NULL, text, false, estimate_only);
 	/* We failed; set the error and bail out */
 	if (res.Failed()) {
 		SetLastError(ScriptError::StringToError(res.GetErrorMessage()));
 		return false;
+	}
 	/* No error, then clear it. */
 	SetLastError(ScriptError::ERR_NONE);
 	/* Estimates, update the cost for the estimate and be done */
 	if (estimate_only) {