petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r24277) -Codechange: Store cargo and railtype translation tables in a SmallVector.

Browse Source
This commit is contained in:
frosch
2012-05-25 20:57:36 +00:00
parent b8f6b300d6
commit 522e5ec86b
4 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/newgrf_railtype.cpp
View File

@@ -130,13 +130,12 @@ SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSp
uint8 GetReverseRailTypeTranslation(RailType railtype, const GRFFile *grffile)
{
/* No rail type table present, return rail type as-is */
if (grffile == NULL || grffile->railtype_max == 0) return railtype;
if (grffile == NULL || grffile->railtype_list.Length() == 0) return railtype;
/* Look for a matching rail type label in the table */
RailTypeLabel label = GetRailTypeInfo(railtype)->label;
for (uint i = 0; i < grffile->railtype_max; i++) {
if (label == grffile->railtype_list[i]) return i;
}
int index = grffile->railtype_list.FindIndex(label);
if (index >= 0) return index;
/* If not found, return as invalid */
return 0xFF;