Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3945) cleaned the layout in CmdReverseTrainDirection a bit (made a bit messy in last commit)

Browse Source
This commit is contained in:
bjarni 2006-03-18 13:15:34 +00:00
parent a36f8a46fa
commit b610872f35
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
train_cmd.c
View File

@ -1595,6 +1595,7 @@ static void ReverseTrainDirection(Vehicle *v)
if (v->type != VEH_Train || !CheckOwnership(v->owner)) return CMD_ERROR; if (v->type != VEH_Train || !CheckOwnership(v->owner)) return CMD_ERROR;
if (p2) { if (p2) {
// turn a single unit around
Vehicle *front; Vehicle *front;
if (IsMultiheaded(v) || HASBIT(RailVehInfo(v->engine_type)->callbackmask, CBM_ARTIC_ENGINE)) { if (IsMultiheaded(v) || HASBIT(RailVehInfo(v->engine_type)->callbackmask, CBM_ARTIC_ENGINE)) {
@ -1606,16 +1607,15 @@ static void ReverseTrainDirection(Vehicle *v)
if (CheckTrainStoppedInDepot(front) < 0) { if (CheckTrainStoppedInDepot(front) < 0) {
return_cmd_error(STR_881A_TRAINS_CAN_ONLY_BE_ALTERED); return_cmd_error(STR_881A_TRAINS_CAN_ONLY_BE_ALTERED);
} }
}
// if (v->u.rail.track & 0x80 || IsTileDepotType(v->tile, TRANSPORT_RAIL))
// return CMD_ERROR;
if (flags & DC_EXEC) {
v->u.rail.flags ^= 1 << VRF_REVERSE_DIRECTION;
}
} else {
//turn the whole train around
if (v->u.rail.crash_anim_pos != 0 || v->breakdown_ctr != 0) return CMD_ERROR; if (v->u.rail.crash_anim_pos != 0 || v->breakdown_ctr != 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (p2) {
v->u.rail.flags ^= 1 << VRF_REVERSE_DIRECTION;
} else {
if (_patches.realistic_acceleration && v->cur_speed != 0) { if (_patches.realistic_acceleration && v->cur_speed != 0) {
TOGGLEBIT(v->u.rail.flags, VRF_REVERSING); TOGGLEBIT(v->u.rail.flags, VRF_REVERSING);
} else { } else {