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

(svn r3378) - NewGRF Fix: Use order status to determine whether a vehicle is loading instead

Browse Source 
of speed, and get that state from first vehicle in a train consist.
This commit is contained in:
peter1138
2006-01-06 22:49:00 +00:00
parent 336a58e797
commit 5e68953907
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine.c
View File

@@ -608,7 +608,12 @@ int GetCustomEngineSprite(EngineID engine, const Vehicle *v, byte direction)
if (capacity == 0) capacity = 1; if (capacity == 0) capacity = 1;
loaded = (v->cargo_count * 100) / capacity; loaded = (v->cargo_count * 100) / capacity;
in_motion = (v->cur_speed != 0);
if (v->type == VEH_Train) {
in_motion = GetFirstVehicleInChain(v)->current_order.type != OT_LOADING;
} else {
in_motion = v->current_order.type != OT_LOADING;
}
} }
group = GetVehicleSpriteGroup(engine, v); group = GetVehicleSpriteGroup(engine, v);

2
train_cmd.c
View File

@@ -2563,10 +2563,10 @@ static void TrainEnterStation(Vehicle *v, StationID station)
SET_EXPENSES_TYPE(EXPENSES_TRAIN_INC); SET_EXPENSES_TYPE(EXPENSES_TRAIN_INC);
if (LoadUnloadVehicle(v) != 0) { if (LoadUnloadVehicle(v) != 0) {
InvalidateWindow(WC_TRAINS_LIST, v->owner); InvalidateWindow(WC_TRAINS_LIST, v->owner);
MarkTrainDirty(v);
TrainCargoChanged(v); TrainCargoChanged(v);
UpdateTrainAcceleration(v); UpdateTrainAcceleration(v);
} }
MarkTrainDirty(v);
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
} }