mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build errors

This commit is contained in:
Ted John 2020-02-01 16:43:00 +00:00
parent 098348d3c3
commit 4109b2c55a
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/scripting/CustomWindow.cpp
View File

@ -237,7 +237,7 @@ namespace OpenRCT2::Ui::Windows
if (desc.X && desc.Y)
{
window = window_create(
desc.X.value(), desc.Y.value(), desc.Width, desc.Height, &window_custom_events, WC_CUSTOM, windowFlags);
{ desc.X.value(), desc.Y.value() }, desc.Width, desc.Height, &window_custom_events, WC_CUSTOM, windowFlags);
}
else
{
@ -298,12 +298,12 @@ namespace OpenRCT2::Ui::Windows
{
if (w->width < w->min_width)
{
window_invalidate(w);
w->Invalidate();
w->width = w->min_width;
}
if (w->height < w->min_height)
{
window_invalidate(w);
w->Invalidate();
w->height = w->min_height;
}
}

4
src/openrct2-ui/scripting/ScWindow.hpp
View File

@ -41,7 +41,7 @@ namespace OpenRCT2::Scripting
void x_set(int32_t value)
{
auto w = GetWindow();
window_set_position(w, value, w->y);
window_set_position(w, { value, w->y });
}
int32_t y_get()
{
@ -50,7 +50,7 @@ namespace OpenRCT2::Scripting
void y_set(int32_t value)
{
auto w = GetWindow();
window_set_position(w, w->x, value);
window_set_position(w, { w->x, value });
}
int32_t width_get()
{

4
src/openrct2/core/FileWatcher.cpp
View File

@ -8,7 +8,6 @@
*****************************************************************************/
#include <array>
#include <experimental/filesystem>
#include <stdexcept>
#ifdef _WIN32
@ -22,10 +21,9 @@
#endif
#include "../core/String.hpp"
#include "FileSystem.hpp"
#include "FileWatcher.h"
namespace fs = std::experimental::filesystem;
#ifndef _WIN32
FileWatcher::FileDescriptor::~FileDescriptor()
{

2
src/openrct2/scripting/ScMap.hpp
View File

@ -52,7 +52,7 @@ namespace OpenRCT2::Scripting
std::shared_ptr<ScTile> getTile(int32_t x, int32_t y)
{
auto firstElement = map_get_first_element_at(x, y);
auto firstElement = map_get_first_element_at({ x, y });
return std::make_shared<ScTile>(firstElement);
}