gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12346) -Fix [FS#1748, FS#1825](r9874, r11872): Remove duplicated and inconsistent code wrt. autoreplace with rules in both vehicles' group and ALL_GROUP.

Browse Source
This commit is contained in:
frosch 2008-03-06 10:39:26 +00:00
parent 1976d2d37c
commit 8f556828f0
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/autoreplace_cmd.cpp
View File

@ -140,18 +140,9 @@ static CommandCost ReplaceVehicle(Vehicle **w, byte flags, Money total_cost)
char *vehicle_name = NULL; char *vehicle_name = NULL;
CargoID replacement_cargo_type; CargoID replacement_cargo_type;
/* If the vehicle belongs to a group, check if the group is protected from the global autoreplace. /* Check if there is a autoreplacement set for the vehicle */
* If not, chek if an global auto replacement is defined */ new_engine_type = EngineReplacementForPlayer(p, old_v->engine_type, old_v->group_id);
new_engine_type = (IsValidGroupID(old_v->group_id) && GetGroup(old_v->group_id)->replace_protection) ? /* if not, just renew to the same type */
INVALID_ENGINE :
EngineReplacementForPlayer(p, old_v->engine_type, ALL_GROUP);
/* If we don't set new_egnine_type previously, we try to check if an autoreplacement was defined
* for the group and the engine_type of the vehicle */
if (new_engine_type == INVALID_ENGINE && !IsAllGroupID(old_v->group_id)) {
new_engine_type = EngineReplacementForPlayer(p, old_v->engine_type, old_v->group_id);
}
if (new_engine_type == INVALID_ENGINE) new_engine_type = old_v->engine_type; if (new_engine_type == INVALID_ENGINE) new_engine_type = old_v->engine_type;
replacement_cargo_type = GetNewCargoTypeForReplace(old_v, new_engine_type); replacement_cargo_type = GetNewCargoTypeForReplace(old_v, new_engine_type);
@ -345,22 +336,7 @@ CommandCost MaybeReplaceVehicle(Vehicle *v, bool check, bool display_costs)
// check if the vehicle should be replaced // check if the vehicle should be replaced
if (!w->NeedsAutorenewing(p) || // replace if engine is too old if (!w->NeedsAutorenewing(p) || // replace if engine is too old
w->max_age == 0) { // rail cars got a max age of 0 w->max_age == 0) { // rail cars got a max age of 0
/* If the vehicle belongs to a group, check if the group is protected from the global autoreplace. if (!EngineHasReplacementForPlayer(p, w->engine_type, w->group_id)) continue;
If not, chek if an global auto remplacement is defined */
if (IsValidGroupID(w->group_id)) {
if (!EngineHasReplacementForPlayer(p, w->engine_type, w->group_id) && (
GetGroup(w->group_id)->replace_protection ||
!EngineHasReplacementForPlayer(p, w->engine_type, ALL_GROUP))) {
continue;
}
} else if (IsDefaultGroupID(w->group_id)) {
if (!EngineHasReplacementForPlayer(p, w->engine_type, DEFAULT_GROUP) &&
!EngineHasReplacementForPlayer(p, w->engine_type, ALL_GROUP)) {
continue;
}
} else if (!EngineHasReplacementForPlayer(p, w->engine_type, ALL_GROUP)) {
continue;
}
} }
/* Now replace the vehicle */ /* Now replace the vehicle */

2
src/group.h
View File

@ -12,7 +12,7 @@
enum { enum {
ALL_GROUP = 0xFFFD, ALL_GROUP = 0xFFFD,
DEFAULT_GROUP = 0xFFFE, DEFAULT_GROUP = 0xFFFE, ///< ungrouped vehicles are in this group.
INVALID_GROUP = 0xFFFF, INVALID_GROUP = 0xFFFF,
}; };