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

10
src/screenshot.cpp
View File

@@ -630,7 +630,7 @@ static void CurrentScreenCallback(void *userdata, void *buf, uint y, uint pitch,
*/
static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, uint n)
{
ViewPort *vp = (ViewPort *)userdata;
Viewport *vp = (Viewport *)userdata;
DrawPixelInfo dpi, *old_dpi;
int wx, left;
@@ -727,11 +727,11 @@ static bool MakeSmallScreenshot(bool crashlog)
}
/**
* Configure a ViewPort for rendering (a part of) the map into a screenshot.
* Configure a Viewport for rendering (a part of) the map into a screenshot.
* @param t Screenshot type
* @param[out] vp Result viewport
*/
void SetupScreenshotViewport(ScreenshotType t, ViewPort *vp)
void SetupScreenshotViewport(ScreenshotType t, Viewport *vp)
{
switch(t) {
case SC_VIEWPORT:
@@ -803,7 +803,7 @@ void SetupScreenshotViewport(ScreenshotType t, ViewPort *vp)
*/
static bool MakeLargeWorldScreenshot(ScreenshotType t)
{
ViewPort vp;
Viewport vp;
SetupScreenshotViewport(t, &vp);
const ScreenshotFormat *sf = _screenshot_formats + _cur_screenshot_format;
@@ -873,7 +873,7 @@ static void ScreenshotConfirmationCallback(Window *w, bool confirmed)
*/
void MakeScreenshotWithConfirm(ScreenshotType t)
{
ViewPort vp;
Viewport vp;
SetupScreenshotViewport(t, &vp);
bool heightmap_or_minimap = t == SC_HEIGHTMAP || t == SC_MINIMAP;