- Fixed: Saving on maps that don't contain a MAPINFO definition didn't work.

- Fixed: The Zip loader loaded all WADs inside a Zip into the lump directory.
  This is only supposed to be done for WADs in the root directory.
- Complete restructuring of the map loading code. Previously the only way
  to put maps into Zips was to load them as embedded WADs which caused
  some problems, most importantly that the map's file name was irrelevant
  and the internal map label was used instead. With the new code there
  is now a properly defined way to add maps to Zips:
  * Maps are placed in a subdirectory called 'maps'.
  * Maps are stored as WADs that contain all map related lumps.
  * The first lump in the map's WAD directory must be the map label.
  * All lumps not belonging to the first map are ignored.
  * The map's file name determines the name the map is identified with. 
    For maps stored this way the internal map label is ignored so with this 
    method renaming maps is as easy as renaming a file and it is no longer 
    necessary to manipulate the map label.
  With the new code it is also possible to load external maps without
  adding them to the WAD list. Type 'open mapfile.wad' in the console
  to start such a map.
  The new code also performs stricter lump name checks to prevent accidental
  loading of non-map data.


SVN r188 (trunk)

src/g_level.cpp

@@ -85,6 +85,7 @@ EXTERN_CVAR (Int, disableautosave)
 #define cioffset(x)		((size_t)&((cluster_info_t*)1)->x - 1)
 
 #define SNAP_ID			MAKE_ID('s','n','A','p')
+#define DSNP_ID			MAKE_ID('d','s','N','p')
 #define VIST_ID			MAKE_ID('v','i','S','t')
 #define ACSD_ID			MAKE_ID('a','c','S','d')
 #define RCLS_ID			MAKE_ID('r','c','L','s')
@@ -1298,7 +1299,7 @@ bool CheckWarpTransMap (char mapname[9], bool substitute)
 // Can be called by the startup code or the menu task,
 // consoleplayer, playeringame[] should be set.
 //
-static char d_mapname[9];
+static char d_mapname[256];
 
 void G_DeferedInitNew (char *mapname)
 {
@@ -1317,10 +1318,14 @@ CCMD (map)
 	}
 	if (argv.argc() > 1)
 	{
-		if (Wads.CheckNumForName (argv[1]) == -1)
+		MapData * map = P_OpenMapData(argv[1]);
+		if (map == NULL)
 			Printf ("No map %s\n", argv[1]);
 		else
+		{
+			delete map;
 			G_DeferedInitNew (argv[1]);
+		}
 	}
 	else
 	{
@@ -1328,6 +1333,32 @@ CCMD (map)
 	}
 }
 
+CCMD (open)
+{
+	if (netgame)
+	{
+		Printf ("You cannot use open in multiplayer games.\n");
+		return;
+	}
+	if (argv.argc() > 1)
+	{
+		sprintf(d_mapname, "file:%s", argv[1]);
+		MapData * map = P_OpenMapData(d_mapname);
+		if (map == NULL)
+			Printf ("No map %s\n", d_mapname);
+		else
+		{
+			delete map;
+			gameaction = ga_newgame2;
+		}
+	}
+	else
+	{
+		Printf ("Usage: open <map file>\n");
+	}
+}
+
+
 void G_NewInit ()
 {
 	int i;
@@ -1431,10 +1462,12 @@ void G_InitNew (char *mapname, bool bTitleLevel)
 	}
 
 	// [RH] If this map doesn't exist, bomb out
-	if (Wads.CheckNumForName (mapname) == -1)
+	MapData * map = P_OpenMapData(mapname);
+	if (!map)
 	{
 		I_Error ("Could not find map %s\n", mapname);
 	}
+	delete map;
 
 	if (dmflags & DF_MONSTERS_RESPAWN)
 	{
@@ -1504,8 +1537,7 @@ void G_InitNew (char *mapname, bool bTitleLevel)
 		bglobal.Init ();
 	}
 
-	strncpy (level.mapname, mapname, 8);
-	level.mapname[8] = 0;
+	strcpy (level.mapname, mapname);
 	if (bTitleLevel)
 	{
 		gamestate = GS_TITLELEVEL;
@@ -2560,7 +2592,7 @@ void G_SnapshotLevel ()
 	if (level.info->snapshot)
 		delete level.info->snapshot;
 
-	if (level.info->mapname[0] != 0)
+	if (level.info->mapname[0] != 0 || level.info == &TheDefaultLevelInfo)
 	{
 		level.info->snapshotVer = SAVEVER;
 		level.info->snapshot = new FCompressedMemFile;
@@ -2580,7 +2612,7 @@ void G_UnSnapshotLevel (bool hubLoad)
 	if (level.info->snapshot == NULL)
 		return;
 
-	if (level.info->mapname[0] != 0)
+	if (level.info->mapname[0] != 0 || level.info == &TheDefaultLevelInfo)
 	{
 		SaveVersion = level.info->snapshotVer;
 		level.info->snapshot->Reopen ();
@@ -2654,6 +2686,11 @@ void G_WriteSnapshots (FILE *file)
 			writeSnapShot (arc, (level_info_t *)&wadlevelinfos[i]);
 		}
 	}
+	if (TheDefaultLevelInfo.snapshot != NULL)
+	{
+		FPNGChunkArchive arc (file, DSNP_ID);
+		writeSnapShot(arc, &TheDefaultLevelInfo);
+	}
 
 	FPNGChunkArchive *arc = NULL;
 	
@@ -2730,6 +2767,20 @@ void G_ReadSnapshots (PNGHandle *png)
 		chunkLen = (DWORD)M_NextPNGChunk (png, SNAP_ID);
 	}
 
+	chunkLen = (DWORD)M_FindPNGChunk (png, DSNP_ID);
+	if (chunkLen != 0)
+	{
+		FPNGChunkArchive arc (png->File->GetFile(), DSNP_ID, chunkLen);
+		DWORD snapver;
+
+		arc << snapver;
+		arc << namelen;
+		arc.Read (mapname, namelen);
+		TheDefaultLevelInfo.snapshotVer = snapver;
+		TheDefaultLevelInfo.snapshot = new FCompressedMemFile;
+		TheDefaultLevelInfo.snapshot->Serialize (arc);
+	}
+
 	chunkLen = (DWORD)M_FindPNGChunk (png, VIST_ID);
 	if (chunkLen != 0)
 	{