diff options
author | bjarni <bjarni@openttd.org> | 2006-09-16 22:09:26 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2006-09-16 22:09:26 +0000 |
commit | 7d1baa32bf8d8fdedd013d3937122208032542e1 (patch) | |
tree | ae15e325e94d98f85b6f6a9023cf5c42a2a216e2 /vehicle.c | |
parent | d095ff81d68f7516079a2c87e1213d927a2e500d (diff) | |
download | openttd-7d1baa32bf8d8fdedd013d3937122208032542e1.tar.xz |
(svn r6468) -Codechange r6464: now use error() when failing refit in autoreplace to ensure that such a failure will not break a game
We should only reach this error() if there is a bug, that would otherwise make the vehicles carry a different type of cargo without telling the user
This also kills the warning added in r6464 (oops)
Diffstat (limited to 'vehicle.c')
-rw-r--r-- | vehicle.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1779,14 +1779,8 @@ static int32 ReplaceVehicle(Vehicle **w, byte flags, int32 total_cost) /* refit if needed */ if (replacement_cargo_type != CT_NO_REFIT) { if (CmdFailed(DoCommand(0, new_v->index, replacement_cargo_type, DC_EXEC, CMD_REFIT_VEH(new_v->type)))) { - /* We should not be here - * being here shows a failure indicates a bug in GetNewCargoTypeForReplace() or incorrect estimation costs */ - SetDParam(0, GetCustomEngineName(old_v->engine_type)); - SetDParam(1, GetCustomEngineName(new_v->engine_type)); - SetDParam(2, _cargoc.names_s[replacement_cargo_type]); - ShowInfo("Error: Autoreplace failed to refit (bug)"); - ShowErrorMessage(STR_AUTOREPLACE_REFIT_FAILURE, STR_AUTOREPLACE_FAILED, 0 ,0); - NOT_REACHED(); // stop debug builds at this error for easier debugging + /* Being here shows a failure, which most likely is in GetNewCargoTypeForReplace() or incorrect estimation costs */ + error("Autoreplace failed to refit. Replace engine %d to %d and refit to cargo %d", old_v->engine_type, new_v->engine_type, replacement_cargo_type); } } |