From dcb78b18d9c714a00699a9d06b8c22edfd4e348c Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 31 Aug 2017 12:17:28 +0100
Subject: [PATCH] Add HeaderSize to FileIndexHeader to increase rebuild chance
 when alignment changes

---
 src/openrct2/core/FileIndex.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/core/FileIndex.hpp b/src/openrct2/core/FileIndex.hpp
index dbc4b19659..36594b5ba1 100644
--- a/src/openrct2/core/FileIndex.hpp
+++ b/src/openrct2/core/FileIndex.hpp
@@ -52,6 +52,7 @@ private:
 
     struct FileIndexHeader
     {
+        uint32          HeaderSize = sizeof(FileIndexHeader);
         uint32          MagicNumber = 0;
         uint8           VersionA = 0;
         uint8           VersionB = 0;
@@ -211,7 +212,8 @@ private:
 
             // Read header, check if we need to re-scan
             auto header = fs.ReadValue<FileIndexHeader>();
-            if (header.MagicNumber == _magicNumber &&
+            if (header.HeaderSize == sizeof(FileIndexHeader) &&
+                header.MagicNumber == _magicNumber &&
                 header.VersionA == FILE_INDEX_VERSION &&
                 header.VersionB == _version &&
                 header.LanguageId == gCurrentLanguage &&
@@ -248,7 +250,7 @@ private:
             auto fs = FileStream(_indexPath, FILE_MODE_WRITE);
     
             // Write header
-            FileIndexHeader header = { 0 };
+            FileIndexHeader header;
             header.MagicNumber = _magicNumber;
             header.VersionA = FILE_INDEX_VERSION;
             header.VersionB = _version;