(svn r2978) Make a global variable local
authortron
Fri, 23 Sep 2005 20:13:48 +0000
changeset 2452 0960df1a61b4
parent 2451 9b4d7f92e4ea
child 2453 f2f861c22557
(svn r2978) Make a global variable local
oldloader.c
--- a/oldloader.c	Fri Sep 23 17:37:21 2005 +0000
+++ b/oldloader.c	Fri Sep 23 20:13:48 2005 +0000
@@ -84,7 +84,6 @@
 /* If it fails, check lines above.. */
 assert_compile(sizeof(TileIndex) == 4);
 
-static LoadgameState _ls;
 static uint32 _bump_assert_value;
 static bool   _read_ttdpatch_flags;
 
@@ -1559,7 +1558,7 @@
 
 	DEBUG(oldloader, 4)("[OldLoader] Going to read main chunk..");
 	/* Load the biggest chunk */
-	if (!LoadChunk(&_ls, NULL, main_chunk)) {
+	if (!LoadChunk(ls, NULL, main_chunk)) {
 		DEBUG(oldloader, 0)("[OldLoader] Loading failed!");
 		return false;
 	}
@@ -1609,23 +1608,24 @@
 
 bool LoadOldSaveGame(const char *file)
 {
+	LoadgameState ls;
+
 	DEBUG(oldloader, 4)("[OldLoader] Trying to load an TTD(Patch) savegame");
 
-	InitLoading(&_ls);
+	InitLoading(&ls);
 
 	/* Open file */
-	_ls.file = fopen(file, "rb");
+	ls.file = fopen(file, "rb");
 
-	if (_ls.file == NULL) {
+	if (ls.file == NULL) {
 		DEBUG(oldloader, 0)("[OldLoader] Could not open file %s", file);
 		return false;
 	}
 
 	/* Load the main chunk */
-	if (!LoadOldMain(&_ls))
-		return false;
+	if (!LoadOldMain(&ls)) return false;
 
-	fclose(_ls.file);
+	fclose(ls.file);
 
 	_pause = 2;