mirror of https://github.com/OpenTTD/OpenTTD
(svn r8434) -Fix (r8430): Missing braces caused compilation failure for some (most?) compilers...
parent
f5412c1a41
commit
60ddc05925
|
@ -1258,7 +1258,7 @@ static void MarkAircraftDirty(Vehicle *v)
|
||||||
static void HandleAircraftLoading(Vehicle *v, int mode)
|
static void HandleAircraftLoading(Vehicle *v, int mode)
|
||||||
{
|
{
|
||||||
switch (v->current_order.type) {
|
switch (v->current_order.type) {
|
||||||
case OT_LOADING:
|
case OT_LOADING: {
|
||||||
if (mode != 0) return;
|
if (mode != 0) return;
|
||||||
if (--v->load_unload_time_rem != 0) return;
|
if (--v->load_unload_time_rem != 0) return;
|
||||||
|
|
||||||
|
@ -1280,6 +1280,7 @@ static void HandleAircraftLoading(Vehicle *v, int mode)
|
||||||
MarkAircraftDirty(v);
|
MarkAircraftDirty(v);
|
||||||
if (!(b.flags & OF_NON_STOP)) return;
|
if (!(b.flags & OF_NON_STOP)) return;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case OT_DUMMY: break;
|
case OT_DUMMY: break;
|
||||||
|
|
||||||
|
|
|
@ -274,7 +274,7 @@ static void ProcessShipOrder(Vehicle *v)
|
||||||
static void HandleShipLoading(Vehicle *v)
|
static void HandleShipLoading(Vehicle *v)
|
||||||
{
|
{
|
||||||
switch (v->current_order.type) {
|
switch (v->current_order.type) {
|
||||||
case OT_LOADING:
|
case OT_LOADING: {
|
||||||
if (--v->load_unload_time_rem) return;
|
if (--v->load_unload_time_rem) return;
|
||||||
|
|
||||||
if (CanFillVehicle(v) && (
|
if (CanFillVehicle(v) && (
|
||||||
|
@ -294,6 +294,7 @@ static void HandleShipLoading(Vehicle *v)
|
||||||
v->LeaveStation();
|
v->LeaveStation();
|
||||||
if (!(b.flags & OF_NON_STOP)) return;
|
if (!(b.flags & OF_NON_STOP)) return;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case OT_DUMMY: break;
|
case OT_DUMMY: break;
|
||||||
|
|
||||||
|
|
|
@ -2606,7 +2606,7 @@ static void MarkTrainDirty(Vehicle *v)
|
||||||
static void HandleTrainLoading(Vehicle *v, bool mode)
|
static void HandleTrainLoading(Vehicle *v, bool mode)
|
||||||
{
|
{
|
||||||
switch (v->current_order.type) {
|
switch (v->current_order.type) {
|
||||||
case OT_LOADING:
|
case OT_LOADING: {
|
||||||
if (mode) return;
|
if (mode) return;
|
||||||
|
|
||||||
// don't mark the train as lost if we're loading on the final station.
|
// don't mark the train as lost if we're loading on the final station.
|
||||||
|
@ -2641,6 +2641,7 @@ static void HandleTrainLoading(Vehicle *v, bool mode)
|
||||||
// If this was not the final order, don't remove it from the list.
|
// If this was not the final order, don't remove it from the list.
|
||||||
if (!(b.flags & OF_NON_STOP)) return;
|
if (!(b.flags & OF_NON_STOP)) return;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case OT_DUMMY: break;
|
case OT_DUMMY: break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue