Load maps last, so files in them don't override game data.

Refs #2825.

Author: cybersphinx

src/init.cpp

@@ -362,9 +362,8 @@ bool rebuildSearchPath( searchPathMode mode, bool force )
 #ifdef DEBUG
 					debug(LOG_WZ, "Adding [%s] to search path", curSearchPath->path);
 #endif // DEBUG
-					// Add maps and global and multiplay mods
+					// Add global and multiplay mods
 					PHYSFS_addToSearchPath( curSearchPath->path, PHYSFS_APPEND );
-					addSubdirs( curSearchPath->path, "maps", PHYSFS_APPEND, NULL, false );
 					addSubdirs( curSearchPath->path, "mods/music", PHYSFS_APPEND, NULL, false );
 					addSubdirs( curSearchPath->path, "mods/global", PHYSFS_APPEND, use_override_mods?override_mods:global_mods, true );
 					addSubdirs( curSearchPath->path, "mods", PHYSFS_APPEND, use_override_mods?override_mods:global_mods, true );
@@ -393,6 +392,15 @@ bool rebuildSearchPath( searchPathMode mode, bool force )
 
 					curSearchPath = curSearchPath->higherPriority;
 				}
+				curSearchPath = searchPathRegistry;
+				while (curSearchPath->lowerPriority)
+					curSearchPath = curSearchPath->lowerPriority;
+				// Add maps last, so files in them don't override game data
+                                while (curSearchPath)
+				{
+					addSubdirs(curSearchPath->path, "maps", PHYSFS_APPEND, NULL, false);
+					curSearchPath = curSearchPath->higherPriority;
+				}
 				break;
 			default:
 				debug(LOG_ERROR, "Can't switch to unknown mods %i", mode);