mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8430) -Fix 

Replace the rather obscure control flow for handling aircraft/ship/train orders by something remotly comprehensible (see r3584)
release/0.6
tron 2007-01-27 16:45:16 +00:00
parent 08c21c0c61
commit 430e64c848
3 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/aircraft_cmd.cpp
View File

@ -1257,15 +1257,15 @@ static void MarkAircraftDirty(Vehicle *v)
static void HandleAircraftLoading(Vehicle *v, int mode)
{
if (v->current_order.type == OT_NOTHING) return;
if (v->current_order.type != OT_DUMMY) {
if (v->current_order.type != OT_LOADING) return;
switch (v->current_order.type) {
case OT_LOADING:
if (mode != 0) return;
if (--v->load_unload_time_rem != 0) return;
if (CanFillVehicle(v) && (v->current_order.flags & OF_FULL_LOAD ||
(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED)))) {
if (CanFillVehicle(v) && (
v->current_order.flags & OF_FULL_LOAD ||
(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED))
)) {
SET_EXPENSES_TYPE(EXPENSES_AIRCRAFT_INC);
if (LoadUnloadVehicle(v, false)) {
InvalidateWindow(WC_AIRCRAFT_LIST, v->owner);
@ -1274,14 +1274,18 @@ static void HandleAircraftLoading(Vehicle *v, int mode)
return;
}
{
Order b = v->current_order;
v->current_order.type = OT_NOTHING;
v->current_order.flags = 0;
MarkAircraftDirty(v);
if (!(b.flags & OF_NON_STOP)) return;
break;
case OT_DUMMY: break;
default: return;
}
}
v->cur_order_index++;
InvalidateVehicleOrder(v);
}

19
src/ship_cmd.cpp
View File

@ -273,14 +273,14 @@ static void ProcessShipOrder(Vehicle *v)
static void HandleShipLoading(Vehicle *v)
{
if (v->current_order.type == OT_NOTHING) return;
if (v->current_order.type != OT_DUMMY) {
if (v->current_order.type != OT_LOADING) return;
switch (v->current_order.type) {
case OT_LOADING:
if (--v->load_unload_time_rem) return;
if (CanFillVehicle(v) && (v->current_order.flags & OF_FULL_LOAD ||
(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED)))) {
if (CanFillVehicle(v) && (
v->current_order.flags & OF_FULL_LOAD ||
(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED))
)) {
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC);
if (LoadUnloadVehicle(v, false)) {
InvalidateWindow(WC_SHIPS_LIST, v->owner);
@ -290,11 +290,14 @@ static void HandleShipLoading(Vehicle *v)
}
PlayShipSound(v);
{
Order b = v->current_order;
v->LeaveStation();
if (!(b.flags & OF_NON_STOP)) return;
}
break;
case OT_DUMMY: break;
default: return;
}
v->cur_order_index++;

22
src/train_cmd.cpp
View File

@ -2605,20 +2605,21 @@ static void MarkTrainDirty(Vehicle *v)
static void HandleTrainLoading(Vehicle *v, bool mode)
{
if (v->current_order.type == OT_NOTHING) return;
if (v->current_order.type != OT_DUMMY) {
if (v->current_order.type != OT_LOADING) return;
switch (v->current_order.type) {
case OT_LOADING:
if (mode) return;
// don't mark the train as lost if we're loading on the final station.
if (v->current_order.flags & OF_NON_STOP)
if (v->current_order.flags & OF_NON_STOP) {
v->u.rail.days_since_order_progr = 0;
}
if (--v->load_unload_time_rem) return;
if (CanFillVehicle(v) && (v->current_order.flags & OF_FULL_LOAD ||
(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED)))) {
if (CanFillVehicle(v) && (
v->current_order.flags & OF_FULL_LOAD ||
(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED))
)) {
v->u.rail.days_since_order_progr = 0; /* Prevent a train lost message for full loading trains */
SET_EXPENSES_TYPE(EXPENSES_TRAIN_INC);
if (LoadUnloadVehicle(v, false)) {
@ -2634,13 +2635,16 @@ static void HandleTrainLoading(Vehicle *v, bool mode)
TrainPlayLeaveStationSound(v);
{
Order b = v->current_order;
v->LeaveStation();
// If this was not the final order, don't remove it from the list.
if (!(b.flags & OF_NON_STOP)) return;
}
break;
case OT_DUMMY: break;
default: return;
}
v->u.rail.days_since_order_progr = 0;