mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-17 20:13:07 +01:00
committed by
GitHub
parent
104a5d5222
commit
3c35558f3f
@@ -22,6 +22,7 @@
|
||||
# include "TransparencyDepth.h"
|
||||
|
||||
# include <SDL.h>
|
||||
# include <algorithm>
|
||||
# include <cmath>
|
||||
# include <openrct2-ui/interface/Window.h>
|
||||
# include <openrct2/config/Config.h>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "../input/ShortcutManager.h"
|
||||
#include "Window.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <openrct2-ui/interface/Widget.h>
|
||||
#include <openrct2/drawing/Drawing.h>
|
||||
#include <openrct2/localisation/Formatter.h>
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
|
||||
template<class ForwardIt, class T, class Compare = std::less<>>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "Memory.hpp"
|
||||
#include "String.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
#include <png.h>
|
||||
#include <stdexcept>
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "LightFX.h"
|
||||
#include "Weather.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstring>
|
||||
|
||||
using namespace OpenRCT2;
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "EntityList.h"
|
||||
#include "EntityRegistry.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
|
||||
void EntityTweener::AddEntity(EntityBase* entity)
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "ObjectLimits.h"
|
||||
#include "ObjectRepository.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstring>
|
||||
#include <stdexcept>
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
#include "../util/Util.h"
|
||||
#include "Object.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
constexpr std::array kAllObjectTypes = {
|
||||
ObjectType::Ride,
|
||||
ObjectType::SmallScenery,
|
||||
|
||||
@@ -73,7 +73,10 @@ struct PaintStringStruct
|
||||
struct PaintEntry
|
||||
{
|
||||
private:
|
||||
std::array<uint8_t, std::max({ sizeof(PaintStruct), sizeof(AttachedPaintStruct), sizeof(PaintStringStruct) })> data;
|
||||
// Avoid including expensive <algorithm> for std::max. Manually ensure we use the largest type.
|
||||
static_assert(sizeof(PaintStruct) >= sizeof(AttachedPaintStruct));
|
||||
static_assert(sizeof(PaintStruct) >= sizeof(PaintStringStruct));
|
||||
std::array<uint8_t, sizeof(PaintStruct)> data;
|
||||
|
||||
public:
|
||||
PaintStruct* AsBasic()
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "../scenes/title/TitleScene.h"
|
||||
#include "zlib.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <cmath>
|
||||
#include <ctime>
|
||||
|
||||
Reference in New Issue
Block a user