From 3b367ab708fa6115887752869d66b902c529b9fc Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 14 Mar 2010 12:58:51 +0000 Subject: (svn r19415) -Codechange: Forward CommandCost with an error back to the caller. --- src/command.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/command.cpp') diff --git a/src/command.cpp b/src/command.cpp index ccea6821d..c716d7970 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -416,7 +416,7 @@ CommandCost DoCommand(TileIndex tile, uint32 p1, uint32 p2, DoCommandFlag flags, if (_docommand_recursive == 1 && !(flags & DC_QUERY_COST) && !(flags & DC_BANKRUPT) && - !CheckCompanyHasMoney(res)) { + !CheckCompanyHasMoney(res)) { // CheckCompanyHasMoney() modifies 'res' to an error if it fails. goto error; } @@ -433,7 +433,7 @@ CommandCost DoCommand(TileIndex tile, uint32 p1, uint32 p2, DoCommandFlag flags, error: res.SetGlobalErrorMessage(); _docommand_recursive--; - return CMD_ERROR; + return res; } /* if toplevel, subtract the money. */ -- cgit v1.2.3-54-g00ecf