(svn r17124) -Codechange: store subsidies in a pool (instead of an array)

2009-08-08 20:53:36 +00:00
parent e8c34c300d
commit d59b687f65
7 changed files with 45 additions and 114 deletions
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -1477,7 +1477,10 @@ static const OldChunks subsidy_chunk[] = {

 static bool LoadOldSubsidy(LoadgameState *ls, int num)
 {
-	return LoadChunk(ls, &Subsidy::array[num], subsidy_chunk);
+	Subsidy *s = new (num) Subsidy();
+	bool ret = LoadChunk(ls, s, subsidy_chunk);
+	if (s->cargo_type == CT_INVALID) delete s;
+	return ret;
 }

 static const OldChunks game_difficulty_chunk[] = {