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

(svn r1971) -Codechange: Got rid of two ugly gotos and replaced them by one elegant and one ugly non-goto. Credits for 1959 go to Darkvater. Sorry

Browse Source
This commit is contained in:
celestar
2005-03-09 15:37:36 +00:00
parent 34f14e657d
commit 6e1e4f1dc2
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
roadveh_cmd.c
View File

@@ -1695,13 +1695,8 @@ void OnNewDay_RoadVeh(Vehicle *v)
} }
//We do not have a slot, so make one //We do not have a slot, so make one
if (v->u.road.slot == NULL) { if (v->u.road.slot == NULL && rs != NULL) {
//first we need to find out how far our stations are away. //first we need to find out how far our stations are away.
if ( rs == NULL ) {
free(firststop);
firststop = stop = NULL;
goto no_stop;
}
DEBUG(ms, 2) ("Multistop: Attempting to obtain a slot for vehicle %d at station %d (0x%x)", v->unitnumber, st->index, st->xy); DEBUG(ms, 2) ("Multistop: Attempting to obtain a slot for vehicle %d at station %d (0x%x)", v->unitnumber, st->index, st->xy);
do { do {
@@ -1729,6 +1724,7 @@ void OnNewDay_RoadVeh(Vehicle *v)
stop = firststop; stop = firststop;
for (k = 0; k < num; k++) { for (k = 0; k < num; k++) {
int i; int i;
bool br = false;
for (i = 0; i < NUM_SLOTS; i++) { for (i = 0; i < NUM_SLOTS; i++) {
if ((stop->rs->slot[i] == INVALID_SLOT) && (stop->dist < 120)) { if ((stop->rs->slot[i] == INVALID_SLOT) && (stop->dist < 120)) {
@@ -1741,15 +1737,16 @@ void OnNewDay_RoadVeh(Vehicle *v)
v->u.road.slot_age = -30; v->u.road.slot_age = -30;
v->u.road.slotindex = i; v->u.road.slotindex = i;
goto have_slot; //jump out of BOTH loops br = true;
break;
} }
} }
stop++; stop++;
if (br) break;
} }
} }
have_slot:
//now we couldn't assign a slot for one reason or another. //now we couldn't assign a slot for one reason or another.
//so we just go to the nearest station //so we just go to the nearest station
if (v->u.road.slot == NULL) { if (v->u.road.slot == NULL) {
@@ -1762,7 +1759,6 @@ have_slot:
firststop = stop = NULL; firststop = stop = NULL;
} }
no_stop:
if (v->vehstatus & VS_STOPPED) if (v->vehstatus & VS_STOPPED)
return; return;