dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3239) - Codechange: Introduce and use helper functions for engine replacement code.

Browse Source
This commit is contained in:
peter1138
2005-11-26 16:41:14 +00:00
parent 9a381f4d5d
commit 87f54ebf92
6 changed files with 85 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vehicle.c
View File

@@ -1618,7 +1618,8 @@ static int32 ReplaceVehicle(Vehicle **w, byte flags)
bool new_front = false;
Vehicle *new_v = NULL;
new_engine_type = p->engine_replacement[old_v->engine_type] == INVALID_ENGINE ? old_v->engine_type : p->engine_replacement[old_v->engine_type];
new_engine_type = EngineReplacement(p, old_v->engine_type);
if (new_engine_type == INVALID_ENGINE) new_engine_type = old_v->engine_type;
cost = DoCommand(old_v->x_pos, old_v->y_pos, new_engine_type, 1, flags, CMD_BUILD_VEH(old_v->type));
if (CmdFailed(cost)) return cost;
@@ -1722,7 +1723,7 @@ static void MaybeReplaceVehicle(Vehicle *v)
if (!p->engine_renew ||
w->age - w->max_age < (p->engine_renew_months * 30) || // replace if engine is too old
w->max_age == 0) { // rail cars got a max age of 0
if (p->engine_replacement[w->engine_type] == INVALID_ENGINE) // updates to a new model
if (!EngineHasReplacement(p, w->engine_type)) // updates to a new model
continue;
}