openttd-ottdgrfs: comparison src/engine.cpp

equal deleted inserted replaced

-:31fcaa5375a1
+:e72987579514
 #include "date.h"
 #include "table/engines.h"
 #include "group.h"
 #include "string.h"
 #include "strings.h"
+#include "misc/autoptr.hpp"
 EngineInfo _engine_info[TOTAL_NUM_ENGINES];
 RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
 ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES];
 AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
 /************************************************************************
 * Engine Replacement stuff
 ************************************************************************/
-static void EngineRenewPoolNewBlock(uint start_item);
+DEFINE_OLD_POOL_GENERIC(EngineRenew, EngineRenew)
-DEFINE_OLD_POOL(EngineRenew, EngineRenew, EngineRenewPoolNewBlock, NULL)
-static void EngineRenewPoolNewBlock(uint start_item)
-{
-	EngineRenew *er;
-	/* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
-	 *  TODO - This is just a temporary stage, this will be removed. */
-	for (er = GetEngineRenew(start_item); er != NULL; er = (er->index + 1U < GetEngineRenewPoolSize()) ? GetEngineRenew(er->index + 1U) : NULL) {
-		er->index = start_item++;
-		er->from = INVALID_ENGINE;
-	}
-}
-static EngineRenew *AllocateEngineRenew()
-{
-	EngineRenew *er;
-	/* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
-	 *  TODO - This is just a temporary stage, this will be removed. */
-	for (er = GetEngineRenew(0); er != NULL; er = (er->index + 1U < GetEngineRenewPoolSize()) ? GetEngineRenew(er->index + 1U) : NULL) {
-		if (IsValidEngineRenew(er)) continue;
-		er->to = INVALID_ENGINE;
-		er->next = NULL;
-		er->group_id = ALL_GROUP;
-		return er;
-	}
-	/* Check if we can add a block to the pool */
-	if (AddBlockToPool(&_EngineRenew_pool)) return AllocateEngineRenew();
-	return NULL;
-}
 /**
 * Retrieves the EngineRenew that specifies the replacement of the given
 * engine type from the given renewlist */
 static EngineRenew *GetEngineReplacement(EngineRenewList erl, EngineID engine, GroupID group)
 void RemoveAllEngineReplacement(EngineRenewList *erl)
 {
 	EngineRenew *er = (EngineRenew *)(*erl);
 	EngineRenew *next;
-	while (er) {
+	while (er != NULL) {
 		next = er->next;
-		DeleteEngineRenew(er);
+		delete er;
 		er = next;
 	}
 	*erl = NULL; // Empty list
 }
 	if (er != NULL) {
 		if (flags & DC_EXEC) er->to = new_engine;
 		return CommandCost();
 	}
-	er = AllocateEngineRenew();
+	er = new EngineRenew(old_engine, new_engine);
 	if (er == NULL) return CMD_ERROR;
+	AutoPtrT<EngineRenew> er_auto_delete = er;
 	if (flags & DC_EXEC) {
-		er->from = old_engine;
-		er->to = new_engine;
 		er->group_id = group;
 		/* Insert before the first element */
 		er->next = (EngineRenew *)(*erl);
 		*erl = (EngineRenewList)er;
+		er_auto_delete.Detach();
 	}
 	return CommandCost();
 }
 					*erl = (EngineRenewList)er->next;
 				} else {
 					/* Cut this element out */
 					prev->next = er->next;
 				}
-				DeleteEngineRenew(er);
+				delete er;
 			}
 			return CommandCost();
 		}
 		prev = er;
 		er = er->next;
 static void Load_ERNW()
 {
 	int index;
 	while ((index = SlIterateArray()) != -1) {
-		EngineRenew *er;
+		EngineRenew *er = new (index) EngineRenew();
-		if (!AddBlockIfNeeded(&_EngineRenew_pool, index))
-			error("EngineRenews: failed loading savegame: too many EngineRenews");
-		er = GetEngineRenew(index);
 		SlObject(er, _engine_renew_desc);
 		/* Advanced vehicle lists, ungrouped vehicles got added */
 		if (CheckSavegameVersion(60)) {
 			er->group_id = ALL_GROUP;
 };
 void InitializeEngines()
 {
 	/* Clean the engine renew pool and create 1 block in it */
-	CleanPool(&_EngineRenew_pool);
+	_EngineRenew_pool.CleanPool();
-	AddBlockToPool(&_EngineRenew_pool);
+	_EngineRenew_pool.AddBlockToPool();
 }

branch	noai
changeset 9694	e72987579514
parent 9686	d3c195c226f9
child 9722	ebf0ece7d8f6