Change gamelog to use std::vector

Move LoadCheckData to its own header

src/saveload/afterload.cpp

@@ -389,12 +389,11 @@ static void ResetSignalHandlers()
  */
 static const GRFIdentifier *GetOverriddenIdentifier(const GRFConfig *c)
 {
-	const LoggedAction *la = &_gamelog_action[_gamelog_actions - 1];
-	if (la->at != GLAT_LOAD) return &c->ident;
+	const LoggedAction &la = _gamelog_actions.back();
+	if (la.at != GLAT_LOAD) return &c->ident;
 
-	const LoggedChange *lcend = &la->change[la->changes];
-	for (const LoggedChange *lc = la->change; lc != lcend; lc++) {
-		if (lc->ct == GLCT_GRFCOMPAT && lc->grfcompat.grfid == c->ident.grfid) return &lc->grfcompat;
+	for (const LoggedChange &lc : la.changes) {
+		if (lc.ct == GLCT_GRFCOMPAT && lc.grfcompat.grfid == c->ident.grfid) return &lc.grfcompat;
 	}
 
 	return &c->ident;

src/saveload/company_sl.cpp

@@ -15,6 +15,7 @@
 #include "../company_func.h"
 #include "../company_manager_face.h"
 #include "../fios.h"
+#include "../load_check.h"
 #include "../tunnelbridge_map.h"
 #include "../tunnelbridge.h"
 #include "../station_base.h"

src/saveload/gamelog_sl.cpp

@@ -14,6 +14,7 @@
 
 #include "../gamelog_internal.h"
 #include "../fios.h"
+#include "../load_check.h"
 #include "../string_func.h"
 
 #include "../safeguards.h"
@@ -309,27 +310,26 @@ public:
 
 	void Save(LoggedAction *la) const override
 	{
-		SlSetStructListLength(la->changes);
+		SlSetStructListLength(la->changes.size());
 
-		const LoggedChange *lcend = &la->change[la->changes];
-		for (LoggedChange *lc = la->change; lc != lcend; lc++) {
-			assert((uint)lc->ct < GLCT_END);
-			SlObject(lc, this->GetDescription());
+		for (LoggedChange &lc : la->changes) {
+			assert((uint)lc.ct < GLCT_END);
+			SlObject(&lc, this->GetDescription());
 		}
 	}
 
 	void Load(LoggedAction *la) const override
 	{
+		la->changes.clear();
+
 		if (IsSavegameVersionBefore(SLV_RIFF_TO_ARRAY)) {
 			byte type;
 			while ((type = SlReadByte()) != GLCT_NONE) {
 				if (type >= GLCT_END) SlErrorCorrupt("Invalid gamelog change type");
 				GamelogChangeType ct = (GamelogChangeType)type;
 
-				la->change = ReallocT(la->change, la->changes + 1);
-
-				LoggedChange *lc = &la->change[la->changes++];
-				*lc = LoggedChange{};
+				la->changes.push_back({});
+				LoggedChange *lc = &la->changes.back();
 				lc->ct = ct;
 
 				SlObject(lc, this->GetLoadDescription());
@@ -338,12 +338,11 @@ public:
 		}
 
 		size_t length = SlGetStructListLength(UINT32_MAX);
-		la->change = ReallocT(la->change, length);
-		la->changes = (uint32)length;
+		la->changes.reserve(length);
 
 		for (size_t i = 0; i < length; i++) {
-			LoggedChange *lc = &la->change[i];
-			*lc = LoggedChange{};
+			la->changes.push_back({});
+			LoggedChange *lc = &la->changes.back();
 
 			lc->ct = (GamelogChangeType)SlReadByte();
 			SlObject(lc, this->GetLoadDescription());
@@ -363,10 +362,9 @@ static const SaveLoad _gamelog_desc[] = {
 struct GLOGChunkHandler : ChunkHandler {
 	GLOGChunkHandler() : ChunkHandler('GLOG', CH_TABLE) {}
 
-	void LoadCommon(LoggedAction *&gamelog_action, uint &gamelog_actions) const
+	void LoadCommon(std::vector<LoggedAction> &gamelog_actions) const
 	{
-		assert(gamelog_action == nullptr);
-		assert(gamelog_actions == 0);
+		assert(gamelog_actions.empty());
 
 		const std::vector<SaveLoad> slt = SlCompatTableHeader(_gamelog_desc, _gamelog_sl_compat);
 
@@ -375,22 +373,18 @@ struct GLOGChunkHandler : ChunkHandler {
 			while ((type = SlReadByte()) != GLAT_NONE) {
 				if (type >= GLAT_END) SlErrorCorrupt("Invalid gamelog action type");
 
-				gamelog_action = ReallocT(gamelog_action, gamelog_actions + 1);
-				LoggedAction *la = &gamelog_action[gamelog_actions++];
-				*la = LoggedAction{};
+				LoggedAction &la = gamelog_actions.emplace_back();
 
-				la->at = (GamelogActionType)type;
-				SlObject(la, slt);
+				la.at = (GamelogActionType)type;
+				SlObject(&la, slt);
 			}
 			return;
 		}
 
 		while (SlIterateArray() != -1) {
-			gamelog_action = ReallocT(gamelog_action, gamelog_actions + 1);
-			LoggedAction *la = &gamelog_action[gamelog_actions++];
-			*la = LoggedAction{};
+			LoggedAction &la = gamelog_actions.emplace_back();
 
-			SlObject(la, slt);
+			SlObject(&la, slt);
 		}
 	}
 
@@ -398,23 +392,22 @@ struct GLOGChunkHandler : ChunkHandler {
 	{
 		SlTableHeader(_gamelog_desc);
 
-		const LoggedAction *laend = &_gamelog_action[_gamelog_actions];
-
 		uint i = 0;
-		for (LoggedAction *la = _gamelog_action; la != laend; la++, i++) {
+		for (LoggedAction &la : _gamelog_actions) {
 			SlSetArrayIndex(i);
-			SlObject(la, _gamelog_desc);
+			SlObject(&la, _gamelog_desc);
+			i++;
 		}
 	}
 
 	void Load() const override
 	{
-		this->LoadCommon(_gamelog_action, _gamelog_actions);
+		this->LoadCommon(_gamelog_actions);
 	}
 
 	void LoadCheck(size_t) const override
 	{
-		this->LoadCommon(_load_check_data.gamelog_action, _load_check_data.gamelog_actions);
+		this->LoadCommon(_load_check_data.gamelog_actions);
 	}
 };
 

src/saveload/map_sl.cpp

@@ -15,6 +15,7 @@
 #include "../map_func.h"
 #include "../core/bitmath_func.hpp"
 #include "../fios.h"
+#include "../load_check.h"
 #include <array>
 
 #include "../safeguards.h"

src/saveload/misc_sl.cpp

@@ -20,6 +20,7 @@
 #include "../gfx_func.h"
 #include "../core/random_func.hpp"
 #include "../fios.h"
+#include "../load_check.h"
 #include "../timer/timer.h"
 #include "../timer/timer_game_tick.h"
 

src/saveload/newgrf_sl.cpp

@@ -14,6 +14,7 @@
 
 #include "newgrf_sl.h"
 #include "../fios.h"
+#include "../load_check.h"
 
 #include "../safeguards.h"
 

src/saveload/settings_sl.cpp

@@ -17,6 +17,7 @@
 #include "../settings_internal.h"
 #include "../network/network.h"
 #include "../fios.h"
+#include "../load_check.h"
 
 #include "../safeguards.h"