cpp/openttd-patchpack/source Changeset - r10701:bcbdad2bd171

Changeset - r10701:bcbdad2bd171

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truebrain - 15 years ago 2009-01-12 17:40:13
truebrain@openttd.org

(svn r15033) -Fix (r15027): silent a warning when compiling without network

1 file changed with 1 insertions and 2 deletions:

src/ai/api/ai_object.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_object.cpp

➞

Show inline comments

@@ @@ -199,13 +199,12 @@ bool AIObject::DoCommand(TileIndex tile, @@
+{
 	if (AIObject::GetAllowDoCommand() == false) {
 		AILog::Error("You are not allowed to execute any DoCommand (even indirect) in your constructor, Save(), and Load().\n");
 		return false;
+	}
 	CompanyID old_company;
 	CommandCost res;
 	/* Set the default callback to return a true/false result of the DoCommand */
 	if (callback == NULL) callback = &AIInstance::DoCommandReturn;
 	/* Make sure the last error is reset, so we don't give faulty warnings */
@@ @@ -227,13 +226,13 @@ bool AIObject::DoCommand(TileIndex tile, @@
 #ifdef ENABLE_NETWORK
 	/* Send the command */
 	if (_networking) {
 		/* NetworkSend_Command needs _local_company to be set correctly, so
 		 * adjust it, and put it back right after the function */
 		old_company = _local_company;
+		CompanyID old_company = _local_company;
 		_local_company = _current_company;
 		::NetworkSend_Command(tile, p1, p2, cmd, CcAI, text);
 		_local_company = old_company;
 		SetLastCost(res.GetCost());
 		/* Suspend the AI till the command is really executed */

0 comments (0 inline, 0 general)