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/screenshot.h
This commit is contained in:
Jonathan G Rennison
2021-03-06 01:36:41 +00:00
parent dc7ffb5dc6 f536fd55d8
commit d6e2b32132
19 changed files with 422 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/screenshot.h
View File

@@ -27,11 +27,11 @@ enum ScreenshotType {
class SmallMapWindow;
void SetupScreenshotViewport(ScreenshotType t, struct Viewport *vp);
void SetupScreenshotViewport(ScreenshotType t, struct Viewport *vp, uint32 width = 0, uint32 height = 0);
bool MakeHeightmapScreenshot(const char *filename);
bool MakeSmallMapScreenshot(unsigned int width, unsigned int height, SmallMapWindow *window);
void MakeScreenshotWithConfirm(ScreenshotType t);
bool MakeScreenshot(ScreenshotType t, const char *name);
bool MakeScreenshot(ScreenshotType t, const char *name, uint32 width = 0, uint32 height = 0);
bool MakeMinimapWorldScreenshot(const char *name);
void SetScreenshotAuxiliaryText(const char *key, const char *value);
inline void ClearScreenshotAuxiliaryText() { SetScreenshotAuxiliaryText(nullptr, nullptr); }