Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/screenshot.cpp
#	src/settings_gui.cp
This commit is contained in:
Jonathan G Rennison
2022-11-10 19:46:02 +00:00
66 changed files with 170 additions and 132 deletions

View File

@@ -1622,17 +1622,18 @@ DEF_CONSOLE_CMD(ConScreenShot)
{
if (argc == 0) {
IConsoleHelp("Create a screenshot of the game. Usage: 'screenshot [viewport | normal | big | giant | world | heightmap | minimap] [no_con] [size <width> <height>] [<filename>]'");
IConsoleHelp("'viewport' (default) makes a screenshot of the current viewport (including menus, windows, ..), "
"'normal' makes a screenshot of the visible area, "
"'big' makes a zoomed-in screenshot of the visible area, "
"'giant' makes a screenshot of the whole map using the default zoom level, "
"'world' makes a screenshot of the whole map using the current zoom level, "
"'heightmap' makes a heightmap screenshot of the map that can be loaded in as heightmap, "
"'minimap' makes a top-viewed minimap screenshot of the whole world which represents one tile by one pixel. "
"'topography' makes a top-viewed topography screenshot of the whole world which represents one tile by one pixel. "
"'industry' makes a top-viewed industries screenshot of the whole world which represents one tile by one pixel. "
"'no_con' hides the console to create the screenshot (only useful in combination with 'viewport'). "
"'size' sets the width and height of the viewport to make a screenshot of (only useful in combination with 'normal' or 'big').");
IConsoleHelp(" 'viewport' (default) makes a screenshot of the current viewport (including menus, windows, ..).");
IConsoleHelp(" 'normal' makes a screenshot of the visible area.");
IConsoleHelp(" 'big' makes a zoomed-in screenshot of the visible area.");
IConsoleHelp(" 'giant' makes a screenshot of the whole map using the default zoom level.");
IConsoleHelp(" 'world' makes a screenshot of the whole map using the current zoom level.");
IConsoleHelp(" 'heightmap' makes a heightmap screenshot of the map that can be loaded in as heightmap.");
IConsoleHelp(" 'minimap' makes a top-viewed minimap screenshot of the whole world which represents one tile by one pixel.");
IConsoleHelp(" 'topography' makes a top-viewed topography screenshot of the whole world which represents one tile by one pixel.");
IConsoleHelp(" 'industry' makes a top-viewed industries screenshot of the whole world which represents one tile by one pixel.");
IConsoleHelp(" 'no_con' hides the console to create the screenshot (only useful in combination with 'viewport').");
IConsoleHelp(" 'size' sets the width and height of the viewport to make a screenshot of (only useful in combination with 'normal' or 'big').");
IConsoleHelp(" A filename ending in # will prevent overwriting existing files and will number files counting upwards.");
return true;
}