From 0ec2b001cbb96433351f59c99514af3e8c033ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Fri, 17 Jun 2016 09:30:07 +0200
Subject: [PATCH] Properly save objects, fixes #3886 (#3892)

---
 src/rct2/S6Exporter.cpp | 6 ++----
 src/rct2/S6Exporter.h   | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/rct2/S6Exporter.cpp b/src/rct2/S6Exporter.cpp
index 47c7c21544..3bbc8cfd92 100644
--- a/src/rct2/S6Exporter.cpp
+++ b/src/rct2/S6Exporter.cpp
@@ -231,14 +231,12 @@ void S6Exporter::Export()
     for (int i = 0; i < 721; i++)
     {
         rct_object_entry_extended *entry = &(RCT2_ADDRESS(0x00F3F03C, rct_object_entry_extended)[i]);
-// FIXME: not sure what's going on in here
-/*
-        if (gObjectList[i] == (void *)0xFFFFFFFF)
+        void *entryData = get_loaded_object_entry(i);
+        if (entryData == (void *)0xFFFFFFFF)
         {
             memset(&_s6.objects[i], 0xFF, sizeof(rct_object_entry));
         }
         else
-*/
         {
             _s6.objects[i] = *((rct_object_entry*)entry);
         }
diff --git a/src/rct2/S6Exporter.h b/src/rct2/S6Exporter.h
index b715c71b22..92a9496c4f 100644
--- a/src/rct2/S6Exporter.h
+++ b/src/rct2/S6Exporter.h
@@ -21,6 +21,7 @@
 extern "C"
 {
     #include "../scenario.h"
+    #include "../object_list.h"
 }
 
 /**