diff --git a/sys/src/games/doom/d_main.c b/sys/src/games/doom/d_main.c
index c5e3f02f5..f693bebff 100644
--- a/sys/src/games/doom/d_main.c
+++ b/sys/src/games/doom/d_main.c
@@ -917,13 +917,11 @@ void D_DoomMain (void)
     p = M_CheckParm ("-warp");
     if (p && p < myargc-1)
     {
-	if (gamemode == commercial)
-	    startmap = atoi (myargv[p+1]);
-	else
-	{
-	    startepisode = myargv[p+1][0]-'0';
-	    startmap = myargv[p+2][0]-'0';
-	}
+	startmap = atoi (myargv[p+1]);
+	if (gamemode != commercial){
+            startepisode = startmap / 10;
+            startmap %= 10;
+        }
 	autostart = true;
     }