Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 10:22:52 +01:00
Code Issues Projects Releases Activity

Merge pull request #464 from husho/patch-1

Browse Source 
Debug menu off by 1 error fix
This commit is contained in:
Daniel Evans 2018-05-16 17:36:47 +01:00 committed by GitHub
commit 03784a2a41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rwgame/states/DebugState.cpp
View File

@ -212,9 +212,9 @@ std::shared_ptr<Menu> DebugState::createWeatherMenu() {
Menu::create({{"Back", [=] { this->enterMenu(createDebugMenu()); }}}, Menu::create({{"Back", [=] { this->enterMenu(createDebugMenu()); }}},
kDebugFont, kDebugEntryHeight); kDebugFont, kDebugEntryHeight);
std::string w[4]{"Sunny", "Cloudy", "Rainy", "Foggy"}; const std::array<std::string, 4> w {"Sunny", "Cloudy", "Rainy", "Foggy"};
for (int i = 0; i < 4; ++i) { for (int i = 0; i < w.size(); ++i) {
menu->lambda(w[i], menu->lambda(w[i],
[=] { game->getWorld()->state->basic.nextWeather = i; }); [=] { game->getWorld()->state->basic.nextWeather = i; });
} }
@ -228,7 +228,7 @@ std::shared_ptr<Menu> DebugState::createMissionsMenu() {
Menu::create({{"Back", [=] { this->enterMenu(createDebugMenu()); }}}, Menu::create({{"Back", [=] { this->enterMenu(createDebugMenu()); }}},
kDebugFont, kDebugEntryHeightMissions); kDebugFont, kDebugEntryHeightMissions);
std::string w[80]{ const std::array<std::string, 80> w {
"Intro Movie", "Intro Movie",
"Hospital Info Scene", "Hospital Info Scene",
"Police Station Info Scene", "Police Station Info Scene",
@ -311,7 +311,7 @@ std::shared_ptr<Menu> DebugState::createMissionsMenu() {
"The Exchange", "The Exchange",
}; };
for (int i = 0; i < 79; ++i) { for (int i = 0; i < w.size(); ++i) {
menu->lambda(w[i], [=] { menu->lambda(w[i], [=] {
ScriptMachine* vm = game->getScriptVM(); ScriptMachine* vm = game->getScriptVM();