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

merge 1.5.3-RC1

Browse Source
This commit is contained in:
Pavel Stupnikov
2015-11-01 21:17:36 +03:00
parent ee92c125c8 c06a5008b2
commit 43340b1676
62 changed files with 767 additions and 1268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/rail_cmd.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: rail_cmd.cpp 27350 2015-07-30 18:50:39Z frosch $ */
/* $Id: rail_cmd.cpp 27432 2015-11-01 12:03:13Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -44,6 +44,8 @@
typedef SmallVector<Train *, 16> TrainList;
RailtypeInfo _railtypes[RAILTYPE_END];
RailType _sorted_railtypes[RAILTYPE_END];
uint8 _sorted_railtypes_size;
TileIndex _rail_track_endtile; ///< The end of a rail track; as hidden return from the rail build/remove command for GUI purposes.
assert_compile(sizeof(_original_railtypes) <= sizeof(_railtypes));
@@ -110,6 +112,17 @@ void ResolveRailTypeGUISprites(RailtypeInfo *rti)
}
}
/**
* Compare railtypes based on their sorting order.
* @param first The railtype to compare to.
* @param second The railtype to compare.
* @return True iff the first should be sorted before the second.
*/
static int CDECL CompareRailTypes(const RailType *first, const RailType *second)
{
return GetRailTypeInfo(*first)->sorting_order - GetRailTypeInfo(*second)->sorting_order;
}
/**
* Resolve sprites of custom rail types
*/
@@ -119,6 +132,14 @@ void InitRailTypes()
RailtypeInfo *rti = &_railtypes[rt];
ResolveRailTypeGUISprites(rti);
}
_sorted_railtypes_size = 0;
for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
if (_railtypes[rt].label != 0) {
_sorted_railtypes[_sorted_railtypes_size++] = rt;
}
}
QSortT(_sorted_railtypes, _sorted_railtypes_size, CompareRailTypes);
}
/**