mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 09:44:52 +01:00
Code Issues Releases Wiki Activity

Small fixes

Browse Source 
- Including C++ stdlib version and using std:: for its functions
- Added new line after printing the IOexception
- Properly clean up after quiting when weather has an invalid value
This commit is contained in:
Hielke Morsink
2017-11-21 18:32:30 +01:00
parent 34bce9892d
commit a5111d9feb
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/openrct2/interface/Screenshot.cpp
View File

@@ -15,6 +15,7 @@
#pragma endregion
#include <chrono>
#include <cstdlib>
#include "../audio/audio.h"
#include "../Context.h"
#include "../core/Console.hpp"
@@ -380,28 +381,28 @@ sint32 cmdline_for_screenshot(const char **argv, sint32 argc)
customLocation = true;
centreMapX = true;
centreMapY = true;
customZoom = atoi(argv[3]);
customRotation = atoi(argv[4]) & 3;
customZoom = std::atoi(argv[3]);
customRotation = std::atoi(argv[4]) & 3;
}
else
{
resolutionWidth = atoi(argv[2]);
resolutionHeight = atoi(argv[3]);
resolutionWidth = std::atoi(argv[2]);
resolutionHeight = std::atoi(argv[3]);
if (argc == 8)
{
customLocation = true;
if (argv[4][0] == 'c')
centreMapX = true;
else
customX = atoi(argv[4]);
customX = std::atoi(argv[4]);
if (argv[5][0] == 'c')
centreMapY = true;
else
customY = atoi(argv[5]);
customY = std::atoi(argv[5]);
customZoom = atoi(argv[6]);
customRotation = atoi(argv[7]) & 3;
customZoom = std::atoi(argv[6]);
customRotation = std::atoi(argv[7]) & 3;
}
else
{
@@ -421,7 +422,7 @@ sint32 cmdline_for_screenshot(const char **argv, sint32 argc)
}
catch (const std::exception &e)
{
std::printf("%s", e.what());
std::printf("%s\n", e.what());
drawing_engine_dispose();
delete context;
return -1;
@@ -491,7 +492,9 @@ sint32 cmdline_for_screenshot(const char **argv, sint32 argc)
{
if (gScreenshotWeather < 1 || gScreenshotWeather > 6)
{
printf("Weather can only be set to an integer value from 1 till 6.");
std::printf("Weather can only be set to an integer value from 1 till 6.");
drawing_engine_dispose();
delete context;
return -1;
}