miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: make EngineID an enum

Browse Source
This commit is contained in:
Rubidium
2025-01-19 14:58:40 +01:00
committed by rubidium42
parent ab8177ea77
commit 9015c3651f
9 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/engine_sl.cpp
View File

@@ -76,7 +76,7 @@ struct ENGNChunkHandler : ChunkHandler {
* engine pool after processing NewGRFs by CopyTempEngineData(). */
int index;
while ((index = SlIterateArray()) != -1) {
Engine *e = GetTempDataEngine(index);
Engine *e = GetTempDataEngine(static_cast<EngineID>(index));
SlObject(e, slt);
if (IsSavegameVersionBefore(SLV_179)) {
@@ -139,7 +139,7 @@ struct ENGSChunkHandler : ChunkHandler {
SlCopy(names, lengthof(names), SLE_STRINGID);
/* Copy each string into the temporary engine array. */
for (EngineID engine = 0; engine < lengthof(names); engine++) {
for (EngineID engine = ENGINE_BEGIN; engine < lengthof(names); engine++) {
Engine *e = GetTempDataEngine(engine);
e->name = CopyFromOldName(names[engine]);
}
@@ -193,7 +193,7 @@ struct EIDSChunkHandler : ChunkHandler {
while ((index = SlIterateArray()) != -1) {
EngineIDMapping eid;
SlObject(&eid, slt);
_engine_mngr.SetID(eid.type, eid.internal_id, eid.grfid, eid.substitute_id, index);
_engine_mngr.SetID(eid.type, eid.internal_id, eid.grfid, eid.substitute_id, static_cast<EngineID>(index));
}
}
};

8
src/saveload/oldloader_sl.cpp
View File

@@ -378,7 +378,7 @@ static bool FixTTOEngines()
/* Load the default engine set. Many of them will be overridden later */
{
uint j = 0;
EngineID j = ENGINE_BEGIN;
for (uint16_t i = 0; i < lengthof(_orig_rail_vehicle_info); i++, j++) new (GetTempDataEngine(j)) Engine(VEH_TRAIN, i);
for (uint16_t i = 0; i < lengthof(_orig_road_vehicle_info); i++, j++) new (GetTempDataEngine(j)) Engine(VEH_ROAD, i);
for (uint16_t i = 0; i < lengthof(_orig_ship_vehicle_info); i++, j++) new (GetTempDataEngine(j)) Engine(VEH_SHIP, i);
@@ -388,7 +388,7 @@ static bool FixTTOEngines()
TimerGameCalendar::Date aging_date = std::min(TimerGameCalendar::date + CalendarTime::DAYS_TILL_ORIGINAL_BASE_YEAR, TimerGameCalendar::ConvertYMDToDate(TimerGameCalendar::Year{2050}, 0, 1));
TimerGameCalendar::YearMonthDay aging_ymd = TimerGameCalendar::ConvertDateToYMD(aging_date);
for (EngineID i = 0; i < 256; i++) {
for (EngineID i = ENGINE_BEGIN; i < 256; i++) {
OldEngineID oi = ttd_to_tto[i];
Engine *e = GetTempDataEngine(i);
@@ -1455,13 +1455,13 @@ static const OldChunks engine_chunk[] = {
static bool LoadOldEngine(LoadgameState &ls, int num)
{
Engine *e = _savegame_type == SGT_TTO ? &_old_engines[num] : GetTempDataEngine(num);
Engine *e = _savegame_type == SGT_TTO ? &_old_engines[num] : GetTempDataEngine(static_cast<EngineID>(num));
return LoadChunk(ls, e, engine_chunk);
}
static bool LoadOldEngineName(LoadgameState &ls, int num)
{
Engine *e = GetTempDataEngine(num);
Engine *e = GetTempDataEngine(static_cast<EngineID>(num));
e->name = CopyFromOldName(RemapOldStringID(ReadUint16(ls)));
return true;
}