mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Add and use game action for setting the climate

Browse Source 
Also reordered the registered game actions the same as headers, so they are easier to find.
This commit is contained in:
Hielke Morsink
2018-11-07 23:12:05 +01:00
parent 2170c26e93
commit 107faaf821
9 changed files with 107 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -14,6 +14,7 @@
#include "../Game.h"
#include "../OpenRCT2.h"
#include "../Version.h"
#include "../actions/ClimateSetAction.hpp"
#include "../config/Config.h"
#include "../core/Guard.hpp"
#include "../core/String.hpp"
@@ -49,9 +50,15 @@
#ifndef NO_TTF
# include "../drawing/TTF.h"
#endif
static constexpr const utf8* ClimateNames[] = {
"cool_and_wet",
"warm",
"hot_and_dry",
"cold",
};
static void console_write_all_commands(InteractiveConsole& console);
static int32_t console_parse_int(const utf8* src, bool* valid);
static double console_parse_double(const utf8* src, bool* valid);
@@ -558,8 +565,7 @@ static int32_t cc_get(InteractiveConsole& console, const utf8** argv, int32_t ar
}
else if (strcmp(argv[0], "climate") == 0)
{
const utf8* climate_names[] = { "cool_and_wet", "warm", "hot_and_dry", "cold" };
console.WriteFormatLine("climate %s (%d)", climate_names[gClimate], gClimate);
console.WriteFormatLine("climate %s (%d)", ClimateNames[gClimate], gClimate);
}
else if (strcmp(argv[0], "game_speed") == 0)
{
@@ -804,21 +810,30 @@ static int32_t cc_set(InteractiveConsole& console, const utf8** argv, int32_t ar
{
if (int_valid[0])
{
gClimate = std::clamp(int_val[0], 0, 3);
const auto newClimate = int_val[0];
if (newClimate < 0 || newClimate >= CLIMATE_COUNT)
{
console.WriteLine(language_get_string(STR_INVALID_CLIMATE_ID));
}
else
{
auto gameAction = ClimateSetAction(newClimate);
GameActions::Execute(&gameAction);
}
}
else
{
const utf8* climate_names[] = { "cool_and_wet", "warm", "hot_and_dry", "cold" };
for (i = 0; i < 4; i++)
for (i = 0; i < CLIMATE_COUNT; i++)
{
if (strcmp(argv[1], climate_names[i]) == 0)
if (strcmp(argv[1], ClimateNames[i]) == 0)
{
gClimate = i;
break;
}
}
}
if (i == 4)
if (i == CLIMATE_COUNT)
invalidArgs = true;
else
console.Execute("get climate");