Eliminated the rest of the notion of an episode, added proper sky

setting, and other misc code in g_game. Also started *trying* to add new
savegame code in g_game, but this is a just about a lost cause without
any portable filepath handling support from the engine.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2152

1 files changed, 8 insertions, 20 deletions

diff --git a/src/strife/p_setup.c b/src/strife/p_setup.c
index 2145c5d5..b1a02b04 100644
--- a/src/strife/p_setup.c
+++ b/src/strife/p_setup.c
@@ -751,8 +751,7 @@ static void P_LoadReject(int lumpnum)
 //
 void
 P_SetupLevel
-( int		episode,
-  int		map,
+( int		map,
   int		playermask,
   skill_t	skill)
 {
@@ -789,28 +788,17 @@ P_SetupLevel
 
     // UNUSED W_Profile ();
     P_InitThinkers ();
-	   
-    // find map name
-    if ( gamemode == commercial)
-    {
-	if (map<10)
-	    DEH_snprintf(lumpname, 9, "map0%i", map);
-	else
-	    DEH_snprintf(lumpname, 9, "map%i", map);
-    }
+
+    // [STRIFE] Removed ExMy map support
+    if (map<10)
+        DEH_snprintf(lumpname, 9, "map0%i", map);
     else
-    {
-	lumpname[0] = 'E';
-	lumpname[1] = '0' + episode;
-	lumpname[2] = 'M';
-	lumpname[3] = '0' + map;
-	lumpname[4] = 0;
-    }
+        DEH_snprintf(lumpname, 9, "map%i", map);
 
     lumpnum = W_GetNumForName (lumpname);
-	
+
     leveltime = 0;
-	
+
     // note: most of this ordering is important	
     P_LoadBlockMap (lumpnum+ML_BLOCKMAP);
     P_LoadVertexes (lumpnum+ML_VERTEXES);