mirrors
/
OpenLoco
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add polyfill for std::variant and std::visit (#944)

This commit is contained in:
Aaron van Geffen 2021-04-23 16:45:09 +02:00 committed by GitHub
parent 61b14fc78a
commit 74b0669d2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2880 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/OpenLoco/Core/Variant.hpp Normal file
View File

@ -0,0 +1,23 @@
// This file enables access to stdx::variant stdx::visit
#pragma once
// TODO: use a more fine-grained approach to detecting whether <variant>
// contains support for std::visit.
#if !defined(__APPLE__)
#include <variant>
namespace stdx
{
using std::variant;
using std::visit;
}
#else
#include "../../Thirdparty/variant.hpp"
namespace stdx
{
using mpark::variant;
using mpark::visit;
}
#endif

88
src/OpenLoco/Title.cpp
View File

@ -1,6 +1,7 @@
#include "Title.h"
#include "Audio/Audio.h"
#include "CompanyManager.h"
#include "Core/Variant.hpp"
#include "GameCommands/GameCommands.h"
#include "Gui.h"
#include "Interop/Interop.hpp"
@ -9,7 +10,6 @@
#include "Scenario.h"
#include "Ui/WindowManager.h"
#include <variant>
#include <vector>
using namespace OpenLoco::Interop;
@ -36,10 +36,10 @@ namespace OpenLoco::Title
{
};
using TitleStep = std::variant<WaitStep, ReloadStep, MoveStep, RotateStep, ResetStep>;
using TitleStep = stdx::variant<WaitStep, ReloadStep, MoveStep, RotateStep, ResetStep>;
using TitleSequence = std::vector<TitleStep>;
// Helper type for using std::visit on TitleStep
// Helper type for using stdx::visit on TitleStep
template<class... Ts>
struct overloaded : Ts...
{
@ -189,47 +189,47 @@ namespace OpenLoco::Title
return;
auto& command = *_sequenceIterator++;
std::visit(overloaded{
[](WaitStep step) {
// This loop slightly deviates from the original, subtract 1 tick to make up for it.
_waitCounter = step.duration - 1;
},
[](ReloadStep step) {
loadTitle();
Gfx::invalidateScreen();
resetScreenAge();
addr<0x50C19A, uint16_t>() = 55000;
},
[](MoveStep step) {
if (addr<0x00525E28, uint32_t>() & 1)
{
auto pos = Map::Pos2(step) + Map::Pos2(16, 16);
auto height = Map::TileManager::getHeight(pos);
auto main = Ui::WindowManager::getMainWindow();
if (main != nullptr)
{
auto pos3d = Map::Pos3(pos.x, pos.y, height.landHeight);
main->viewportCentreOnTile(pos3d);
main->flags &= ~Ui::WindowFlags::scrolling_to_location;
main->viewportsUpdatePosition();
}
}
},
[](RotateStep step) {
if (addr<0x00525E28, uint32_t>() & 1)
{
auto main = Ui::WindowManager::getMainWindow();
if (main != nullptr)
{
main->viewportRotateRight();
}
}
},
[](ResetStep step) {
_sequenceIterator = _titleSequence.begin();
},
},
command);
stdx::visit(overloaded{
[](WaitStep step) {
// This loop slightly deviates from the original, subtract 1 tick to make up for it.
_waitCounter = step.duration - 1;
},
[](ReloadStep step) {
loadTitle();
Gfx::invalidateScreen();
resetScreenAge();
addr<0x50C19A, uint16_t>() = 55000;
},
[](MoveStep step) {
if (addr<0x00525E28, uint32_t>() & 1)
{
auto pos = Map::Pos2(step) + Map::Pos2(16, 16);
auto height = Map::TileManager::getHeight(pos);
auto main = Ui::WindowManager::getMainWindow();
if (main != nullptr)
{
auto pos3d = Map::Pos3(pos.x, pos.y, height.landHeight);
main->viewportCentreOnTile(pos3d);
main->flags &= ~Ui::WindowFlags::scrolling_to_location;
main->viewportsUpdatePosition();
}
}
},
[](RotateStep step) {
if (addr<0x00525E28, uint32_t>() & 1)
{
auto main = Ui::WindowManager::getMainWindow();
if (main != nullptr)
{
main->viewportRotateRight();
}
}
},
[](ResetStep step) {
_sequenceIterator = _titleSequence.begin();
},
},
command);
} while (_waitCounter == 0);
}

2813
src/Thirdparty/variant.hpp vendored Normal file
View File

File diff suppressed because it is too large Load Diff