amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 03:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make VehicleType a scoped enum

Browse Source
This commit is contained in:
Peter Nelson
2026-04-19 20:51:18 +01:00
committed by Peter Nelson
parent b90aefbf49
commit 77403627a8
100 changed files with 1093 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ship_cmd.cpp
+4 -4
View File
@@ -68,7 +68,7 @@ static const uint16_t _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
/** @copydoc IsValidImageIndex */
template <>
bool IsValidImageIndex<VEH_SHIP>(uint8_t image_index)
bool IsValidImageIndex<VehicleType::Ship>(uint8_t image_index)
{
return image_index < lengthof(_ship_sprites);
}
@@ -90,7 +90,7 @@ static void GetShipIcon(EngineID engine, EngineImageType image_type, VehicleSpri
spritenum = e->original_image_index;
}
assert(IsValidImageIndex<VEH_SHIP>(spritenum));
assert(IsValidImageIndex<VehicleType::Ship>(spritenum));
result->Set(DIR_W + _ship_sprites[spritenum]);
}
@@ -144,7 +144,7 @@ void Ship::GetImage(Direction direction, EngineImageType image_type, VehicleSpri
spritenum = this->GetEngine()->original_image_index;
}
assert(IsValidImageIndex<VEH_SHIP>(spritenum));
assert(IsValidImageIndex<VehicleType::Ship>(spritenum));
result->Set(_ship_sprites[spritenum] + direction);
}
@@ -384,7 +384,7 @@ static bool CheckShipStayInDepot(Ship *v)
/* Don't leave depot if another vehicle is already entering/leaving */
/* This helps avoid CPU load if many ships are set to start at the same time */
if (HasVehicleOnTile(v->tile, [](const Vehicle *u) {
return u->type == VEH_SHIP && u->cur_speed != 0;
return u->type == VehicleType::Ship && u->cur_speed != 0;
})) return true;
assert(v->GetVehicleTrackdir() == TRACKDIR_X_NE || v->GetVehicleTrackdir() == TRACKDIR_Y_NW);