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

(svn r19992) -Fix [FS#3878]: Clear force_proceed when entering depots and when loading.

Browse Source 
-Fix (r18515): Resetting of force_proceed on manual stopping did not work.
This commit is contained in:
frosch
2010-06-16 20:27:59 +00:00
parent 03c87faea1
commit 94efc4c3b9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/train_cmd.cpp
View File

@@ -2905,6 +2905,9 @@ static void TrainEnterStation(Train *v, StationID station)
AI::NewEvent(v->owner, new AIEventStationFirstVehicle(st->index, v->index));
}
v->force_proceed = 0;
SetWindowDirty(WC_VEHICLE_VIEW, v->index);
v->BeginLoading();
StationAnimationTrigger(st, v->tile, STAT_ANIM_TRAIN_ARRIVES);
@@ -3876,10 +3879,10 @@ static bool TrainLocoHandler(Train *v, bool mode)
int j = v->UpdateSpeed();
/* we need to invalidate the widget if we are stopping from 'Stopping 0 km/h' to 'Stopped' */
if (v->cur_speed == 0 && v->tcache.last_speed == 0 && (v->vehstatus & VS_STOPPED)) {
if (v->cur_speed == 0 && (v->vehstatus & VS_STOPPED)) {
/* If we manually stopped, we're not force-proceeding anymore. */
v->force_proceed = 0;
SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
SetWindowDirty(WC_VEHICLE_VIEW, v->index);
}
int adv_spd = (v->direction & 1) ? 192 : 256;