From 102ca98c1c53eb4888a01ba355ba5d08d798eb49 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 3 May 2006 11:19:17 +0000 Subject: [PATCH] (svn r4707) - NewGRF: minor code duffage; return early and less indentation. --- newgrf_station.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/newgrf_station.c b/newgrf_station.c index 657b310e14..4bc410dd85 100644 --- a/newgrf_station.c +++ b/newgrf_station.c @@ -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 (i < 256) { - if (exec) { - if (i >= st->num_specs) { - st->num_specs = i + 1; - st->speclist = realloc(st->speclist, st->num_specs * sizeof(*st->speclist)); + if (i == 256) return -1; - if (st->num_specs == 2) { - /* Initial allocation */ - st->speclist[0].spec = NULL; - st->speclist[0].grfid = 0; - st->speclist[0].localidx = 0; - } + 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) { + /* 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; }