- Added Skulltag's HQ resite feature

- removed special handling for old ZSBSPs that threw out overlapping linedefs.
  If such nodes are encountered now a rebuild is forced instead of trying to
  work with the broken data.

- Update to ZDoom r1333:

- Added Karate Chris's new DMFlags submission.
- Fixed: The correct player class was not remembered when the menu had both
  a player class selection menu and an episode menu.
- Fixed: AddToConsole could write outside its working buffer.
- Fixed: 0 was no longer recognized as placeholder for 'no state' in A_Chase.
- Fixed: When picking up weapons the code did not check if it should switch away
  from weak weapons.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@279 b0f79afe-0144-0410-b225-9a4edf0717df

src/am_map.cpp

@@ -863,6 +863,10 @@ void AM_ToggleMap ()
 	if (gamestate != GS_LEVEL)
 		return;
 
+	// Don't activate the automap if we're not allowed to use it.
+	if (dmflags2 & DF2_NO_AUTOMAP)
+		return;
+
 	SB_state = screen->GetPageCount ();
 	if (!automapactive)
 	{
@@ -1572,6 +1576,10 @@ void AM_drawPlayers ()
 		{
 			continue;
 		}
+
+		// We don't always want to show allies on the automap.
+		if (dmflags2 & DF2_NO_AUTOMAP_ALLIES && i != consoleplayer)
+			continue;
 		
 		if (deathmatch && !demoplayback &&
 			!p->mo->IsTeammate (players[consoleplayer].mo) &&