openttd-mini: comparison src/newgrf

equal deleted inserted replaced

-:2d4126d81ebb
+:167d9a91ef02
 #include "newgrf.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_station.h"
 #include "newgrf_spritegroup.h"
 #include "date.h"
+#include "helpers.hpp"
 static StationClass station_classes[STAT_CLASS_MAX];
 enum {
 	MAX_SPECLIST = 255,
 * This includes initialising the Default and Waypoint classes with an empty
 * entry, for standard stations and waypoints.
 */
 void ResetStationClasses(void)
 {
-	StationClassID i;
+	for (StationClassID i = STAT_CLASS_BEGIN; i < STAT_CLASS_MAX; i++) {
-	for (i = 0; i < STAT_CLASS_MAX; i++) {
 		station_classes[i].id = 0;
 		station_classes[i].name = STR_EMPTY;
 		station_classes[i].stations = 0;
 		free(station_classes[i].spec);
 	// Set up initial data
 	station_classes[0].id = 'DFLT';
 	station_classes[0].name = STR_STAT_CLASS_DFLT;
 	station_classes[0].stations = 1;
-	station_classes[0].spec = malloc(sizeof(*station_classes[0].spec));
+	MallocT(&station_classes[0].spec, 1);
 	station_classes[0].spec[0] = NULL;
 	station_classes[1].id = 'WAYP';
 	station_classes[1].name = STR_STAT_CLASS_WAYP;
 	station_classes[1].stations = 1;
-	station_classes[1].spec = malloc(sizeof(*station_classes[1].spec));
+	MallocT(&station_classes[1].spec, 1);
 	station_classes[1].spec[0] = NULL;
 }
 /**
 * Allocate a station class for the given class id.
 * @param classid A 32 bit value identifying the class.
 * @return Index into station_classes of allocated class.
 */
-StationClassID AllocateStationClass(uint32 class)
+StationClassID AllocateStationClass(uint32 cls)
 {
-	StationClassID i;
+	for (StationClassID i = STAT_CLASS_BEGIN; i < STAT_CLASS_MAX; i++) {
+		if (station_classes[i].id == cls) {
-	for (i = 0; i < STAT_CLASS_MAX; i++) {
-		if (station_classes[i].id == class) {
 			// ClassID is already allocated, so reuse it.
 			return i;
 		} else if (station_classes[i].id == 0) {
 			// This class is empty, so allocate it to the ClassID.
-			station_classes[i].id = class;
+			station_classes[i].id = cls;
 			return i;
 		}
 	}
 	grfmsg(2, "StationClassAllocate: already allocated %d classes, using default", STAT_CLASS_MAX);
 	assert(statspec->sclass < STAT_CLASS_MAX);
 	station_class = &station_classes[statspec->sclass];
 	i = station_class->stations++;
-	station_class->spec = realloc(station_class->spec, station_class->stations * sizeof(*station_class->spec));
+	ReallocT(&station_class->spec, station_class->stations);
 	station_class->spec[i] = statspec;
 	statspec->allocated = true;
 }
 }
 const StationSpec *GetCustomStationSpecByGrf(uint32 grfid, byte localidx)
 {
-	StationClassID i;
 	uint j;
-	for (i = STAT_CLASS_DFLT; i < STAT_CLASS_MAX; i++) {
+	for (StationClassID i = STAT_CLASS_BEGIN; i < STAT_CLASS_MAX; i++) {
 		for (j = 0; j < station_classes[i].stations; j++) {
 			const StationSpec *statspec = station_classes[i].spec[j];
 			if (statspec == NULL) continue;
 			if (statspec->grfid == grfid && statspec->localidx == localidx) return statspec;
 		}
 			case 0x44: return 2;               /* PBS status */
 			case 0xFA: return max(_date - DAYS_TILL_ORIGINAL_BASE_YEAR, 0); /* Build date */
 		}
 		*available = false;
-		return -1;
+		return UINT_MAX;
 	}
 	switch (variable) {
 		/* Calculated station variables */
 		case 0x40: return GetPlatformInfoHelper(tile, false, false, false);
 	}
 	DEBUG(grf, 1, "Unhandled station property 0x%X", variable);
 	*available = false;
-	return -1;
+	return UINT_MAX;
 }
 static const SpriteGroup *StationResolveReal(const ResolverObject *object, const SpriteGroup *group)
 {
 	if (i == MAX_SPECLIST) 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));
+			ReallocT(&st->speclist, st->num_specs);
 			if (st->num_specs == 2) {
 				/* Initial allocation */
 				st->speclist[0].spec     = NULL;
 				st->speclist[0].grfid    = 0;
 	/* If this was the highest spec index, reallocate */
 	if (specindex == st->num_specs - 1) {
 		for (; st->speclist[st->num_specs - 1].grfid == 0 && st->num_specs > 1; st->num_specs--);
 		if (st->num_specs > 1) {
-			st->speclist = realloc(st->speclist, st->num_specs * sizeof(*st->speclist));
+			ReallocT(&st->speclist, st->num_specs);
 		} else {
 			free(st->speclist);
 			st->num_specs = 0;
 			st->speclist  = NULL;
 		}
 	}
 	if (statspec->renderdata == NULL) {
 		sprites = GetStationTileLayout(tile + axis);
 	} else {
-		sprites = &statspec->renderdata[(tile < statspec->tiles) ? tile + axis : axis];
+		sprites = &statspec->renderdata[(tile < statspec->tiles) ? tile + axis : (uint)axis];
 	}
 	image = sprites->ground_sprite;
 	if (HASBIT(image, 31)) {
 		CLRBIT(image, 31);

changeset 5587	167d9a91ef02
parent 5584	1111b4d36e35
child 5609	dc6a58930ba4