From 4109b2c55a1b3f122b74516e15add1dad3837782 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 1 Feb 2020 16:43:00 +0000
Subject: [PATCH] Fix build errors

---
 src/openrct2-ui/scripting/CustomWindow.cpp | 6 +++---
 src/openrct2-ui/scripting/ScWindow.hpp     | 4 ++--
 src/openrct2/core/FileWatcher.cpp          | 4 +---
 src/openrct2/scripting/ScMap.hpp           | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp
index 72d0ad25f3..2788c3f2a8 100644
--- a/src/openrct2-ui/scripting/CustomWindow.cpp
+++ b/src/openrct2-ui/scripting/CustomWindow.cpp
@@ -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;
             }
         }
diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp
index 413b260894..44ac133ed7 100644
--- a/src/openrct2-ui/scripting/ScWindow.hpp
+++ b/src/openrct2-ui/scripting/ScWindow.hpp
@@ -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()
         {
diff --git a/src/openrct2/core/FileWatcher.cpp b/src/openrct2/core/FileWatcher.cpp
index 6725870cf8..f48db28b27 100644
--- a/src/openrct2/core/FileWatcher.cpp
+++ b/src/openrct2/core/FileWatcher.cpp
@@ -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()
 {
diff --git a/src/openrct2/scripting/ScMap.hpp b/src/openrct2/scripting/ScMap.hpp
index 410b894610..5ffea1e1e4 100644
--- a/src/openrct2/scripting/ScMap.hpp
+++ b/src/openrct2/scripting/ScMap.hpp
@@ -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);
         }