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

Merge branch 'master' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/lang/chuvash.txt
#	src/lang/czech.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/german.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/russian.txt
#	src/tree_gui.cpp
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2021-11-02 21:11:11 +00:00
parent 324e90e5ac ff6c934916
commit 3ef1a0943b
84 changed files with 28242 additions and 8014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/viewport_func.h
View File

@@ -49,7 +49,7 @@ void CheckMarkDirtyFocusedRoutePaths(const Vehicle *veh);
bool DoZoomInOutWindow(ZoomStateChange how, Window *w);
void ZoomInOrOutToCursorWindow(bool in, Window * w);
Point GetTileZoomCenterWindow(bool in, Window * w);
void FixTitleGameZoom();
void FixTitleGameZoom(int zoom_adjust = 0);
void HandleZoomMessage(Window *w, const Viewport *vp, byte widget_zoom_in, byte widget_zoom_out);
/**