mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-18 18:02:37 +01:00
Code Issues Releases Wiki Activity

Codechange: replace 'new (index) PoolItem(...' with 'PoolItem::CreateAtIndex(index, ...'

Browse Source
This commit is contained in:
Rubidium
2026-01-03 12:10:20 +01:00
committed by rubidium42
parent 2fcd4e189a
commit ee9e8ab9b2
25 changed files with 95 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/base_station_base.h
View File

@@ -280,6 +280,18 @@ struct SpecializedStation : public BaseStation {
return BaseStation::Create<T>(std::forward<Targs&&>(args)...);
}
/**
* Creates a new T-object in the station pool.
* @param index The index allocate the object at.
* @param args... The arguments to the constructor.
* @return The created object.
*/
template <typename... Targs>
static inline T *CreateAtIndex(StationID index, Targs &&... args)
{
return BaseStation::CreateAtIndex<T>(index, std::forward<Targs&&>(args)...);
}
/**
* Converts a BaseStation to SpecializedStation with type checking.
* @param st BaseStation pointer

2
src/company_cmd.cpp
View File

@@ -608,7 +608,7 @@ Company *DoStartupNewCompany(bool is_ai, CompanyID company = CompanyID::Invalid(
c = Company::Create(STR_SV_UNNAMED, is_ai);
} else {
if (Company::IsValidID(company)) return nullptr;
c = new (company) Company(STR_SV_UNNAMED, is_ai);
c = Company::CreateAtIndex(company, STR_SV_UNNAMED, is_ai);
}
c->colour = colour;

28
src/core/pool_type.hpp
View File

@@ -304,18 +304,8 @@ public:
Tpool->FreeItem(size, Pool::GetRawIndex(pn->index));
}
/**
* Allocates space for new Titem with given index
* @param size size of Titem
* @param index index of item
* @return pointer to allocated memory
* @note can never fail (return nullptr), use CanAllocate() to check first!
* @pre index has to be unused! Else it will crash
*/
inline void *operator new(size_t size, Tindex index)
{
return Tpool->GetNew(size, index.base());
}
/** Do not use new (index) PoolItem(...), but rather PoolItem::CreateAtIndex(index, ...). */
inline void *operator new(size_t size, Tindex index) = delete;
/**
* Allocates space for new Titem at given memory address
@@ -352,6 +342,20 @@ public:
return ::new (data) T(std::forward<Targs&&>(args)...);
}
/**
* Creates a new T-object in the associated pool.
* @param index The to allocate the object at.
* @param args... The arguments to the constructor.
* @return The created object.
*/
template <typename T = Titem, typename... Targs>
requires std::is_base_of_v<Titem, T>
static inline T *CreateAtIndex(Tindex index, Targs &&... args)
{
void *data = Tpool->GetNew(sizeof(T), index.base());
return ::new (data) T(std::forward<Targs&&>(args)...);
}
/** Helper functions so we can use PoolItem::Function() instead of _poolitem_pool.Function() */
/**

2
src/engine.cpp
View File

@@ -609,7 +609,7 @@ void SetupEngines()
assert(std::size(mapping) >= _engine_counts[type]);
for (const EngineIDMapping &eid : mapping) {
new (eid.engine) Engine(type, eid.internal_id);
Engine::CreateAtIndex(eid.engine, type, eid.internal_id);
}
}
}

2
src/saveload/autoreplace_sl.cpp
View File

@@ -45,7 +45,7 @@ struct ERNWChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
EngineRenew *er = new (EngineRenewID(index)) EngineRenew();
EngineRenew *er = EngineRenew::CreateAtIndex(EngineRenewID(index));
SlObject(er, slt);
/* Advanced vehicle lists, ungrouped vehicles got added */

2
src/saveload/cargopacket_sl.cpp
View File

@@ -162,7 +162,7 @@ struct CAPAChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
CargoPacket *cp = new (CargoPacketID(index)) CargoPacket();
CargoPacket *cp = CargoPacket::CreateAtIndex(CargoPacketID(index));
SlObject(cp, slt);
}
}

2
src/saveload/company_sl.cpp
View File

@@ -567,7 +567,7 @@ struct PLYRChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Company *c = new (CompanyID(index)) Company();
Company *c = Company::CreateAtIndex(CompanyID(index));
SlObject(c, slt);
_company_colours[index] = c->colour;
}

2
src/saveload/depot_sl.cpp
View File

@@ -49,7 +49,7 @@ struct DEPTChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Depot *depot = new (DepotID(index)) Depot();
Depot *depot = Depot::CreateAtIndex(DepotID(index));
SlObject(depot, slt);
/* Set the town 'pointer' so we can restore it later. */

2
src/saveload/economy_sl.cpp
View File

@@ -108,7 +108,7 @@ struct CAPYChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
CargoPayment *cp = new (CargoPaymentID(index)) CargoPayment();
CargoPayment *cp = CargoPayment::CreateAtIndex(CargoPaymentID(index));
SlObject(cp, slt);
}
}

2
src/saveload/goal_sl.cpp
View File

@@ -44,7 +44,7 @@ struct GOALChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Goal *s = new (GoalID(index)) Goal();
Goal *s = Goal::CreateAtIndex(GoalID(index));
SlObject(s, slt);
}
}

2
src/saveload/group_sl.cpp
View File

@@ -50,7 +50,7 @@ struct GRPSChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Group *g = new (GroupID(index)) Group();
Group *g = Group::CreateAtIndex(GroupID(index));
SlObject(g, slt);
if (IsSavegameVersionBefore(SLV_189)) g->parent = GroupID::Invalid();

2
src/saveload/industry_sl.cpp
View File

@@ -253,7 +253,7 @@ struct INDYChunkHandler : ChunkHandler {
SlIndustryProduced::ResetOldStructure();
while ((index = SlIterateArray()) != -1) {
Industry *i = new (IndustryID(index)) Industry();
Industry *i = Industry::CreateAtIndex(IndustryID(index));
SlObject(i, slt);
/* Before savegame version 161, persistent storages were not stored in a pool. */

4
src/saveload/league_sl.cpp
View File

@@ -45,7 +45,7 @@ struct LEAEChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
LeagueTableElement *lte = new (LeagueTableElementID(index)) LeagueTableElement();
LeagueTableElement *lte = LeagueTableElement::CreateAtIndex(LeagueTableElementID(index));
SlObject(lte, slt);
}
}
@@ -76,7 +76,7 @@ struct LEATChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
LeagueTable *lt = new (LeagueTableID(index)) LeagueTable();
LeagueTable *lt = LeagueTable::CreateAtIndex(LeagueTableID(index));
SlObject(lt, slt);
}
}

4
src/saveload/linkgraph_sl.cpp
View File

@@ -277,7 +277,7 @@ struct LGRPChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
LinkGraph *lg = new (LinkGraphID(index)) LinkGraph();
LinkGraph *lg = LinkGraph::CreateAtIndex(LinkGraphID(index));
SlObject(lg, slt);
}
}
@@ -305,7 +305,7 @@ struct LGRJChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
LinkGraphJob *lgj = new (LinkGraphJobID(index)) LinkGraphJob();
LinkGraphJob *lgj = LinkGraphJob::CreateAtIndex(LinkGraphJobID(index));
SlObject(lgj, slt);
}
}

2
src/saveload/object_sl.cpp
View File

@@ -49,7 +49,7 @@ struct OBJSChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Object *o = new (ObjectID(index)) Object();
Object *o = Object::CreateAtIndex(ObjectID(index));
SlObject(o, slt);
}
}

44
src/saveload/oldloader_sl.cpp
View File

@@ -621,7 +621,7 @@ static const OldChunks town_chunk[] = {
static bool LoadOldTown(LoadgameState &ls, int num)
{
Town *t = new (TownID(num)) Town();
Town *t = Town::CreateAtIndex(TownID(num));
if (!LoadChunk(ls, t, town_chunk)) return false;
if (t->xy != 0) {
@@ -693,7 +693,7 @@ static const OldChunks depot_chunk[] = {
static bool LoadOldDepot(LoadgameState &ls, int num)
{
Depot *d = new (DepotID(num)) Depot();
Depot *d = Depot::CreateAtIndex(DepotID(num));
if (!LoadChunk(ls, d, depot_chunk)) return false;
if (d->xy != 0) {
@@ -781,7 +781,7 @@ static const OldChunks station_chunk[] = {
static bool LoadOldStation(LoadgameState &ls, int num)
{
Station *st = new (StationID(num)) Station();
Station *st = Station::CreateAtIndex(StationID(num));
_current_station_id = st->index;
if (!LoadChunk(ls, st, station_chunk)) return false;
@@ -863,7 +863,7 @@ static const OldChunks industry_chunk[] = {
static bool LoadOldIndustry(LoadgameState &ls, int num)
{
Industry *i = new (IndustryID(num)) Industry();
Industry *i = Industry::CreateAtIndex(IndustryID(num));
if (!LoadChunk(ls, i, industry_chunk)) return false;
if (i->location.tile != 0) {
@@ -989,7 +989,7 @@ static const OldChunks _company_chunk[] = {
static bool LoadOldCompany(LoadgameState &ls, int num)
{
Company *c = new (CompanyID(num)) Company();
Company *c = Company::CreateAtIndex(CompanyID(num));
_current_company_id = (CompanyID)num;
@@ -1269,14 +1269,14 @@ bool LoadOldVehicle(LoadgameState &ls, int num)
uint type = ReadByte(ls);
switch (type) {
default: return false;
case 0x00 /* VEH_INVALID */: v = nullptr; break;
case 0x25 /* MONORAIL */:
case 0x20 /* VEH_TRAIN */: v = new (VehicleID(_current_vehicle_id)) Train(); break;
case 0x21 /* VEH_ROAD */: v = new (VehicleID(_current_vehicle_id)) RoadVehicle(); break;
case 0x22 /* VEH_SHIP */: v = new (VehicleID(_current_vehicle_id)) Ship(); break;
case 0x23 /* VEH_AIRCRAFT */: v = new (VehicleID(_current_vehicle_id)) Aircraft(); break;
case 0x24 /* VEH_EFFECT */: v = new (VehicleID(_current_vehicle_id)) EffectVehicle(); break;
case 0x26 /* VEH_DISASTER */: v = new (VehicleID(_current_vehicle_id)) DisasterVehicle(); break;
case 0x00 /* VEH_INVALID */: v = nullptr; break;
case 0x25 /* MONORAIL */:
case 0x20 /* VEH_TRAIN */: v = Train::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x21 /* VEH_ROAD */: v = RoadVehicle::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x22 /* VEH_SHIP */: v = Ship::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x23 /* VEH_AIRCRAFT */: v = Aircraft::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x24 /* VEH_EFFECT */: v = EffectVehicle::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x26 /* VEH_DISASTER */: v = DisasterVehicle::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
}
if (!LoadChunk(ls, v, vehicle_chunk)) return false;
@@ -1346,13 +1346,13 @@ bool LoadOldVehicle(LoadgameState &ls, int num)
/* Read the vehicle type and allocate the right vehicle */
switch (ReadByte(ls)) {
default: SlErrorCorrupt("Invalid vehicle type");
case 0x00 /* VEH_INVALID */: v = nullptr; break;
case 0x10 /* VEH_TRAIN */: v = new (VehicleID(_current_vehicle_id)) Train(); break;
case 0x11 /* VEH_ROAD */: v = new (VehicleID(_current_vehicle_id)) RoadVehicle(); break;
case 0x12 /* VEH_SHIP */: v = new (VehicleID(_current_vehicle_id)) Ship(); break;
case 0x13 /* VEH_AIRCRAFT*/: v = new (VehicleID(_current_vehicle_id)) Aircraft(); break;
case 0x14 /* VEH_EFFECT */: v = new (VehicleID(_current_vehicle_id)) EffectVehicle(); break;
case 0x15 /* VEH_DISASTER*/: v = new (VehicleID(_current_vehicle_id)) DisasterVehicle(); break;
case 0x00 /* VEH_INVALID */: v = nullptr; break;
case 0x10 /* VEH_TRAIN */: v = Train::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x11 /* VEH_ROAD */: v = RoadVehicle::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x12 /* VEH_SHIP */: v = Ship::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x13 /* VEH_AIRCRAFT */: v = Aircraft::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x14 /* VEH_EFFECT */: v = EffectVehicle::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
case 0x15 /* VEH_DISASTER */: v = DisasterVehicle::CreateAtIndex(VehicleID(_current_vehicle_id)); break;
}
if (!LoadChunk(ls, v, vehicle_chunk)) return false;
@@ -1422,7 +1422,7 @@ static const OldChunks sign_chunk[] = {
static bool LoadOldSign(LoadgameState &ls, int num)
{
Sign *si = new (SignID(num)) Sign();
Sign *si = Sign::CreateAtIndex(SignID(num));
if (!LoadChunk(ls, si, sign_chunk)) return false;
if (_old_string_id != 0) {
@@ -1486,7 +1486,7 @@ static const OldChunks subsidy_chunk[] = {
static bool LoadOldSubsidy(LoadgameState &ls, int num)
{
Subsidy *s = new (SubsidyID(num)) Subsidy();
Subsidy *s = Subsidy::CreateAtIndex(SubsidyID(num));
bool ret = LoadChunk(ls, s, subsidy_chunk);
if (!IsValidCargoType(s->cargo_type)) delete s;
return ret;

4
src/saveload/order_sl.cpp
View File

@@ -269,7 +269,7 @@ struct ORDLChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
OrderList *list = new (OrderListID(index)) OrderList();
OrderList *list = OrderList::CreateAtIndex(OrderListID(index));
SlObject(list, slt);
}
@@ -346,7 +346,7 @@ struct BKORChunkHandler : ChunkHandler {
while ((index = SlIterateArray()) != -1) {
/* set num_orders to 0 so it's a valid OrderList */
OrderBackup *ob = new (OrderBackupID(index)) OrderBackup();
OrderBackup *ob = OrderBackup::CreateAtIndex(OrderBackupID(index));
SlObject(ob, slt);
}
}

2
src/saveload/signs_sl.cpp
View File

@@ -50,7 +50,7 @@ struct SIGNChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Sign *si = new (SignID(index)) Sign();
Sign *si = Sign::CreateAtIndex(SignID(index));
SlObject(si, slt);
/* Before version 6.1, signs didn't have owner.
* Before version 83, invalid signs were determined by si->str == 0.

8
src/saveload/station_sl.cpp
View File

@@ -79,7 +79,7 @@ void MoveBuoysToWaypoints()
/* Stations and waypoints are in the same pool, so if a station
* is deleted there must be place for a Waypoint. */
assert(Waypoint::CanAllocateItem());
Waypoint *wp = new (index) Waypoint(xy);
Waypoint *wp = Waypoint::CreateAtIndex(index, xy);
wp->town = town;
wp->string_id = train ? STR_SV_STNAME_WAYPOINT : STR_SV_STNAME_BUOY;
wp->name = std::move(name);
@@ -512,7 +512,7 @@ struct STNSChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Station *st = new (StationID(index)) Station();
Station *st = Station::CreateAtIndex(StationID(index));
_waiting_acceptance = 0;
SlObject(st, slt);
@@ -714,7 +714,7 @@ struct STNNChunkHandler : ChunkHandler {
while ((index = SlIterateArray()) != -1) {
bool waypoint = static_cast<StationFacilities>(SlReadByte()).Test(StationFacility::Waypoint);
BaseStation *bst = waypoint ? (BaseStation *)new (StationID(index)) Waypoint() : new (StationID(index)) Station();
BaseStation *bst = waypoint ? (BaseStation *)Waypoint::CreateAtIndex(StationID(index)) : Station::CreateAtIndex(StationID(index));
SlObject(bst, slt);
}
}
@@ -752,7 +752,7 @@ struct ROADChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
RoadStop *rs = new (RoadStopID(index)) RoadStop(INVALID_TILE);
RoadStop *rs = RoadStop::CreateAtIndex(RoadStopID(index), INVALID_TILE);
SlObject(rs, slt);
}

2
src/saveload/storage_sl.cpp
View File

@@ -35,7 +35,7 @@ struct PSACChunkHandler : ChunkHandler {
while ((index = SlIterateArray()) != -1) {
assert(PersistentStorage::CanAllocateItem());
PersistentStorage *ps = new (PersistentStorageID(index)) PersistentStorage(0, GSF_INVALID, TileIndex{});
PersistentStorage *ps = PersistentStorage::CreateAtIndex(PersistentStorageID(index), 0, GSF_INVALID, TileIndex{});
SlObject(ps, slt);
}
}

4
src/saveload/story_sl.cpp
View File

@@ -58,7 +58,7 @@ struct STPEChunkHandler : ChunkHandler {
int index;
uint32_t max_sort_value = 0;
while ((index = SlIterateArray()) != -1) {
StoryPageElement *s = new (StoryPageElementID(index)) StoryPageElement();
StoryPageElement *s = StoryPageElement::CreateAtIndex(StoryPageElementID(index));
SlObject(s, slt);
if (s->sort_value > max_sort_value) {
max_sort_value = s->sort_value;
@@ -100,7 +100,7 @@ struct STPAChunkHandler : ChunkHandler {
int index;
uint32_t max_sort_value = 0;
while ((index = SlIterateArray()) != -1) {
StoryPage *s = new (StoryPageID(index)) StoryPage();
StoryPage *s = StoryPage::CreateAtIndex(StoryPageID(index));
SlObject(s, slt);
if (s->sort_value > max_sort_value) {
max_sort_value = s->sort_value;

2
src/saveload/subsidy_sl.cpp
View File

@@ -48,7 +48,7 @@ struct SUBSChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Subsidy *s = new (SubsidyID(index)) Subsidy();
Subsidy *s = Subsidy::CreateAtIndex(SubsidyID(index));
SlObject(s, slt);
}
}

2
src/saveload/town_sl.cpp
View File

@@ -348,7 +348,7 @@ struct CITYChunkHandler : ChunkHandler {
int index;
while ((index = SlIterateArray()) != -1) {
Town *t = new (TownID(index)) Town();
Town *t = Town::CreateAtIndex(TownID(index));
SlObject(t, slt);
if (IsSavegameVersionBefore(SLV_165)) {

12
src/saveload/vehicle_sl.cpp
View File

@@ -1129,12 +1129,12 @@ struct VEHSChunkHandler : ChunkHandler {
VehicleType vtype = (VehicleType)SlReadByte();
switch (vtype) {
case VEH_TRAIN: v = new (VehicleID(index)) Train(); break;
case VEH_ROAD: v = new (VehicleID(index)) RoadVehicle(); break;
case VEH_SHIP: v = new (VehicleID(index)) Ship(); break;
case VEH_AIRCRAFT: v = new (VehicleID(index)) Aircraft(); break;
case VEH_EFFECT: v = new (VehicleID(index)) EffectVehicle(); break;
case VEH_DISASTER: v = new (VehicleID(index)) DisasterVehicle(); break;
case VEH_TRAIN: v = Train::CreateAtIndex(VehicleID(index)); break;
case VEH_ROAD: v = RoadVehicle::CreateAtIndex(VehicleID(index)); break;
case VEH_SHIP: v = Ship::CreateAtIndex(VehicleID(index)); break;
case VEH_AIRCRAFT: v = Aircraft::CreateAtIndex(VehicleID(index)); break;
case VEH_EFFECT: v = EffectVehicle::CreateAtIndex(VehicleID(index)); break;
case VEH_DISASTER: v = DisasterVehicle::CreateAtIndex(VehicleID(index)); break;
case VEH_INVALID: // Savegame shouldn't contain invalid vehicles
default: SlErrorCorrupt("Invalid vehicle type");
}

12
src/vehicle_base.h
View File

@@ -1137,6 +1137,18 @@ struct SpecializedVehicle : public Vehicle {
return Vehicle::Create<T>(std::forward<Targs&&>(args)...);
}
/**
* Creates a new T-object in the vehicle pool.
* @param index The index allocate the object at.
* @param args... The arguments to the constructor.
* @return The created object.
*/
template <typename... Targs>
static inline T *CreateAtIndex(VehicleID index, Targs &&... args)
{
return Vehicle::CreateAtIndex<T>(index, std::forward<Targs&&>(args)...);
}
/**
* Converts a Vehicle to SpecializedVehicle with type checking.
* @param v Vehicle pointer