petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r19494) -Codechange: Remove _error_message.

Browse Source
This commit is contained in:
alberth
2010-03-20 17:58:24 +00:00
parent a901ab5392
commit 05d705e077
21 changed files with 8 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/train_cmd.cpp
View File

@@ -1172,7 +1172,6 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
if (src == NULL) return CMD_ERROR;
CommandCost ret = CheckOwnership(src->owner);
ret.SetGlobalErrorMessage();
if (ret.Failed()) return ret;
/* Do not allow moving crashed vehicles inside the depot, it is likely to cause asserts later */
@@ -1187,7 +1186,6 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
if (dst == NULL) return CMD_ERROR;
CommandCost ret = CheckOwnership(dst->owner);
ret.SetGlobalErrorMessage();
if (ret.Failed()) return ret;
/* Do not allow appending to crashed vehicles, too */
@@ -1353,7 +1351,6 @@ CommandCost CmdSellRailWagon(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
if (v == NULL) return CMD_ERROR;
CommandCost ret = CheckOwnership(v->owner);
ret.SetGlobalErrorMessage();
if (ret.Failed()) return ret;
/* Sell a chain of vehicles or not? */
@@ -1830,7 +1827,6 @@ CommandCost CmdReverseTrainDirection(TileIndex tile, DoCommandFlag flags, uint32
if (v == NULL) return CMD_ERROR;
CommandCost ret = CheckOwnership(v->owner);
ret.SetGlobalErrorMessage();
if (ret.Failed()) return ret;
if (p2 != 0) {
@@ -1901,7 +1897,6 @@ CommandCost CmdForceTrainProceed(TileIndex tile, DoCommandFlag flags, uint32 p1,
if (t == NULL) return CMD_ERROR;
CommandCost ret = CheckOwnership(t->owner);
ret.SetGlobalErrorMessage();
if (ret.Failed()) return ret;
@@ -1939,7 +1934,6 @@ CommandCost CmdRefitRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1,
if (v == NULL) return CMD_ERROR;
CommandCost ret = CheckOwnership(v->owner);
ret.SetGlobalErrorMessage();
if (ret.Failed()) return ret;
if (!v->IsStoppedInDepot()) return_cmd_error(STR_TRAIN_MUST_BE_STOPPED);