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

20
src/zoom_func.h
View File

@@ -19,7 +19,7 @@
* @param zoom zoom level to shift to
* @return shifted value
*/
static inline int ScaleByZoom(int value, ZoomLevel zoom)
inline int ScaleByZoom(int value, ZoomLevel zoom)
{
return ((uint) value) << zoom;
}
@@ -31,7 +31,7 @@ static inline int ScaleByZoom(int value, ZoomLevel zoom)
* @param zoom zoom level to shift to
* @return shifted value
*/
static inline int UnScaleByZoom(int value, ZoomLevel zoom)
inline int UnScaleByZoom(int value, ZoomLevel zoom)
{
return (value + (1 << zoom) - 1) >> zoom;
}
@@ -42,7 +42,7 @@ static inline int UnScaleByZoom(int value, ZoomLevel zoom)
* @param zoom zoom level to shift to
* @return shifted value
*/
static inline int AdjustByZoom(int value, int zoom)
inline int AdjustByZoom(int value, int zoom)
{
return zoom < 0 ? UnScaleByZoom(value, ZoomLevel(-zoom)) : ScaleByZoom(value, ZoomLevel(zoom));
}
@@ -53,7 +53,7 @@ static inline int AdjustByZoom(int value, int zoom)
* @param zoom zoom level to shift to
* @return shifted value
*/
static inline int ScaleByZoomLower(int value, ZoomLevel zoom)
inline int ScaleByZoomLower(int value, ZoomLevel zoom)
{
return ((uint) value) << zoom;
}
@@ -64,7 +64,7 @@ static inline int ScaleByZoomLower(int value, ZoomLevel zoom)
* @param zoom zoom level to shift to
* @return shifted value
*/
static inline int UnScaleByZoomLower(int value, ZoomLevel zoom)
inline int UnScaleByZoomLower(int value, ZoomLevel zoom)
{
return value >> zoom;
}
@@ -74,7 +74,7 @@ static inline int UnScaleByZoomLower(int value, ZoomLevel zoom)
* @param value Pixel amount at #ZOOM_LVL_BEGIN (full zoom in).
* @return Pixel amount at #ZOOM_LVL_GUI (current interface size).
*/
static inline int UnScaleGUI(int value)
inline int UnScaleGUI(int value)
{
return UnScaleByZoom(value, ZOOM_LVL_GUI);
}
@@ -84,7 +84,7 @@ static inline int UnScaleGUI(int value)
* @param value zoom level to scale
* @return scaled zoom level
*/
static inline ZoomLevel ScaleZoomGUI(ZoomLevel value)
inline ZoomLevel ScaleZoomGUI(ZoomLevel value)
{
return std::clamp(ZoomLevel(value + (ZOOM_LVL_GUI - ZOOM_LVL_OUT_4X)), ZOOM_LVL_MIN, ZOOM_LVL_MAX);
}
@@ -94,7 +94,7 @@ static inline ZoomLevel ScaleZoomGUI(ZoomLevel value)
* @param value zoom level to scale
* @return un-scaled zoom level
*/
static inline ZoomLevel UnScaleZoomGUI(ZoomLevel value)
inline ZoomLevel UnScaleZoomGUI(ZoomLevel value)
{
return std::clamp(ZoomLevel(value - (ZOOM_LVL_GUI - ZOOM_LVL_OUT_4X)), ZOOM_LVL_MIN, ZOOM_LVL_MAX);
}
@@ -104,7 +104,7 @@ static inline ZoomLevel UnScaleZoomGUI(ZoomLevel value)
* @param value Pixel amount at #ZOOM_LVL_BASE (traditional "normal" interface size).
* @return Pixel amount at #ZOOM_LVL_GUI (current interface size).
*/
static inline int ScaleSpriteTrad(int value)
inline int ScaleSpriteTrad(int value)
{
return UnScaleGUI(value * ZOOM_LVL_BASE);
}
@@ -114,7 +114,7 @@ static inline int ScaleSpriteTrad(int value)
* @param value Pixel amount at #ZOOM_LVL_BASE (traditional "normal" interface size).
* @return Pixel amount at #ZOOM_LVL_GUI (current interface size).
*/
static inline int ScaleGUITrad(int value)
inline int ScaleGUITrad(int value)
{
return value * _gui_scale / 100;
}