When doing a map preview, no need to process stuff that is only useful in-game.

This speeds up the preview screen back to 2.x speeds.

Author: buginator

src/game.c

@@ -2784,7 +2784,7 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
 		aFileName[fileExten] = '\0';
 		strcat(aFileName, "mission.map");
 		/* Load in the chosen file data */
-		if (!mapLoad(aFileName))
+		if (!mapLoad(aFileName, false))
 		{
 			debug(LOG_ERROR, "Failed to load map");
 			return false;
@@ -2932,7 +2932,7 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
 		//load in the map file
 		aFileName[fileExten] = '\0';
 		strcat(aFileName, "game.map");
-		if (!mapLoad(aFileName))
+		if (!mapLoad(aFileName, false))
 
 		{
 			debug( LOG_NEVER, "loadgame: Fail7\n" );

src/map.c

@@ -749,7 +749,7 @@ static BOOL mapSetGroundTypes(void)
 }
 
 /* Initialise the map structure */
-BOOL mapLoad(char *filename)
+BOOL mapLoad(char *filename, BOOL preview)
 {
 	UDWORD		numGw, width, height;
 	char		aFileType[4];
@@ -835,6 +835,12 @@ BOOL mapLoad(char *filename)
 		}
 	}
 
+	if (preview)
+	{
+		// no need to do anything else for the map preview
+		goto ok;
+	}
+
 	if (!PHYSFS_readULE32(fp, &version) || !PHYSFS_readULE32(fp, &numGw) || version != 1)
 	{
 		debug(LOG_ERROR, "Bad gateway in %s", filename);
@@ -887,6 +893,7 @@ BOOL mapLoad(char *filename)
 
 	mapFloodFillContinents();
 
+ok:
 	PHYSFS_close(fp);
 	return true;
 

src/map.h

@@ -292,7 +292,7 @@ extern BOOL mapShutdown(void);
 extern BOOL mapNew(UDWORD width, UDWORD height);
 
 /* Load the map data */
-extern BOOL mapLoad(char *filename);
+extern BOOL mapLoad(char *filename, BOOL preview);
 
 /* Save the map data */
 extern BOOL mapSave(char **ppFileData, UDWORD *pFileSize);

src/multiint.c

@@ -308,7 +308,7 @@ void loadMapPreview(bool hideInterface)
 	ptr = strrchr(aFileName, '/');
 	ASSERT(ptr, "this string was supposed to contain a /");
 	strcpy(ptr, "/game.map");
-	if (!mapLoad(aFileName))
+	if (!mapLoad(aFileName, true))
 	{
 		debug(LOG_ERROR, "loadMapPreview: Failed to load map");
 		return;