1
0
Fork 0

(svn r4707) - NewGRF: minor code duffage; return early and less indentation.

release/0.5
peter1138 2006-05-03 11:19:17 +00:00
parent 36d1e4a1a1
commit 102ca98c1c
1 changed files with 16 additions and 17 deletions

View File

@ -264,28 +264,27 @@ int AllocateSpecToStation(const StationSpec *statspec, Station *st, bool exec)
if (st->speclist[i].spec == NULL && st->speclist[i].grfid == 0) break; if (st->speclist[i].spec == NULL && st->speclist[i].grfid == 0) break;
} }
if (i < 256) { if (i == 256) return -1;
if (exec) {
if (i >= st->num_specs) {
st->num_specs = i + 1;
st->speclist = realloc(st->speclist, st->num_specs * sizeof(*st->speclist));
if (st->num_specs == 2) { if (exec) {
/* Initial allocation */ if (i >= st->num_specs) {
st->speclist[0].spec = NULL; st->num_specs = i + 1;
st->speclist[0].grfid = 0; st->speclist = realloc(st->speclist, st->num_specs * sizeof(*st->speclist));
st->speclist[0].localidx = 0;
} if (st->num_specs == 2) {
/* Initial allocation */
st->speclist[0].spec = NULL;
st->speclist[0].grfid = 0;
st->speclist[0].localidx = 0;
} }
st->speclist[i].spec = statspec;
st->speclist[i].grfid = statspec->grfid;
st->speclist[i].localidx = statspec->localidx;
} }
return i;
st->speclist[i].spec = statspec;
st->speclist[i].grfid = statspec->grfid;
st->speclist[i].localidx = statspec->localidx;
} }
return -1; return i;
} }