dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/3rdparty/squirrel/include/squirrel.h
#	src/blitter/32bpp_sse_func.hpp
#	src/bridge_map.h
#	src/clear_map.h
#	src/company_manager_face.h
#	src/console_func.h
#	src/core/bitmath_func.hpp
#	src/core/endian_func.hpp
#	src/core/random_func.hpp
#	src/depot_map.h
#	src/elrail_func.h
#	src/fontcache.h
#	src/industry_map.h
#	src/map_func.h
#	src/newgrf_spritegroup.h
#	src/object_map.h
#	src/rail.h
#	src/rail_map.h
#	src/road_func.h
#	src/road_map.h
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/sl/oldloader.h
#	src/sprite.h
#	src/spritecache.h
#	src/station_func.h
#	src/station_map.h
#	src/story_base.h
#	src/strings_func.h
#	src/tile_cmd.h
#	src/tile_map.h
#	src/tile_type.h
#	src/town.h
#	src/town_map.h
#	src/tree_map.h
#	src/tunnel_map.h
#	src/tunnelbridge_map.h
#	src/vehicle_func.h
#	src/viewport_func.h
#	src/void_map.h
#	src/water.h
#	src/water_map.h
#	src/widget_type.h
This commit is contained in:
Jonathan G Rennison
2024-01-07 15:00:16 +00:00
parent 8271813a47 1e56bd1e5a
commit 55d78a23be
106 changed files with 1080 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/strings_func.h
View File

@@ -28,7 +28,7 @@ extern ArrayStringParameters<20> _global_string_params;
* @param str String identifier
* @return StringTab from \a str
*/
static inline StringTab GetStringTab(StringID str)
inline StringTab GetStringTab(StringID str)
{
StringTab result = (StringTab)(str >> TAB_SIZE_BITS);
if (result >= TEXT_TAB_NEWGRF_START) return TEXT_TAB_NEWGRF_START;
@@ -41,7 +41,7 @@ static inline StringTab GetStringTab(StringID str)
* @param str String identifier
* @return StringIndex from \a str
*/
static inline uint GetStringIndex(StringID str)
inline uint GetStringIndex(StringID str)
{
return str - (GetStringTab(str) << TAB_SIZE_BITS);
}
@@ -52,7 +52,7 @@ static inline uint GetStringIndex(StringID str)
* @param index StringIndex
* @return StringID composed from \a tab and \a index
*/
static inline StringID MakeStringID(StringTab tab, uint index)
inline StringID MakeStringID(StringTab tab, uint index)
{
if (tab == TEXT_TAB_NEWGRF_START) {
assert(index < TAB_SIZE_NEWGRF);
@@ -78,7 +78,7 @@ uint ConvertDisplaySpeedToKmhishSpeed(uint speed, VehicleType type);
* @param type Type of vehicle for parameter.
* @return Bit-packed velocity and vehicle type, for use with SetDParam().
*/
static inline int64 PackVelocity(uint speed, VehicleType type)
inline int64_t PackVelocity(uint speed, VehicleType type)
{
/* Vehicle type is a byte, so packed into the top 8 bits of the 64-bit
* parameter, although only values from 0-3 are relevant. */
@@ -93,7 +93,7 @@ WChar GetDecimalSeparatorChar();
* @param v Value of the string parameter.
*/
template <typename T>
static inline void SetDParam(size_t n, T &&v) {
inline void SetDParam(size_t n, T &&v) {
_global_string_params.SetParam(n, std::forward<T>(v));
}
@@ -112,7 +112,7 @@ bool HaveDParamChanged(const std::vector<StringParameterBackup> &backup);
* @param n Index of the string parameter.
* @return Value of the requested string parameter.
*/
static inline uint64 GetDParam(size_t n)
inline uint64 GetDParam(size_t n)
{
return _global_string_params.GetParam(n);
}