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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	src/saveload/town_sl.cpp
#	src/screenshot.h
#	src/script/api/ai/ai_date.hpp.sq
#	src/script/api/ai/ai_marine.hpp.sq
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_date.hpp.sq
#	src/script/api/game/game_marine.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/game/game_window.hpp.sq
#	src/script/api/script_window.hpp
#	src/script/api/template/template_window.hpp.sq
#	src/signal.cpp
#	src/statusbar_gui.cpp
#	src/toolbar_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
This commit is contained in:
Jonathan G Rennison
2020-08-27 18:31:09 +01:00
parent e4581b4cd8 9340fe9c7c
commit 5b78090a61
295 changed files with 1567 additions and 15574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicle.cpp
View File

@@ -1595,7 +1595,7 @@ void ViewportAddVehicles(DrawPixelInfo *dpi)
}
}
void ViewportMapDrawVehicles(DrawPixelInfo *dpi, ViewPort *vp)
void ViewportMapDrawVehicles(DrawPixelInfo *dpi, Viewport *vp)
{
/* The save rectangle */
const int l = vp->virtual_left;
@@ -1655,7 +1655,7 @@ void ViewportMapDrawVehicles(DrawPixelInfo *dpi, ViewPort *vp)
* @param y Y coordinate in the viewport.
* @return Closest vehicle, or \c nullptr if none found.
*/
Vehicle *CheckClickOnVehicle(const ViewPort *vp, int x, int y)
Vehicle *CheckClickOnVehicle(const Viewport *vp, int x, int y)
{
Vehicle *found = nullptr;
uint dist, best_dist = UINT_MAX;