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/base_media_func.h
#	src/cargopacket.h
#	src/gfxinit.cpp
#	src/industry_cmd.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2023-05-26 20:08:05 +01:00
parent 42b3c5fe25 1697dff744
commit b381a30d2d
90 changed files with 382 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/window_gui.h
View File

@@ -521,7 +521,7 @@ public:
void SetDirty();
void SetDirtyAsBlocks();
void ReInit(int rx = 0, int ry = 0);
void ReInit(int rx = 0, int ry = 0, bool reposition = false);
/** Is window shaded currently? */
inline bool IsShaded() const