diff --git a/doomsday/plugins/jdoom/src/d_main.c b/doomsday/plugins/jdoom/src/d_main.c index 3dbad4fb15..5f464b02f7 100644 --- a/doomsday/plugins/jdoom/src/d_main.c +++ b/doomsday/plugins/jdoom/src/d_main.c @@ -562,8 +562,8 @@ void G_PostInit(void) // Get skill / episode / map from parms. gameSkill = startSkill = SM_NOITEMS; - startEpisode = 1; - startMap = 1; + startEpisode = 0; + startMap = 0; autoStart = false; // Game mode specific settings. @@ -595,8 +595,8 @@ void G_PostInit(void) p = ArgCheck("-episode"); if(p && p < myargc - 1) { - startEpisode = Argv(p + 1)[0] - '0'; - startMap = 1; + startEpisode = Argv(p + 1)[0] - '1'; + startMap = 0; autoStart = true; } @@ -617,13 +617,13 @@ void G_PostInit(void) { if(gameMode == commercial) { - startMap = atoi(Argv(p + 1)); + startMap = atoi(Argv(p + 1)) - 1; autoStart = true; } else if(p < myargc - 2) { - startEpisode = Argv(p + 1)[0] - '0'; - startMap = Argv(p + 2)[0] - '0'; + startEpisode = Argv(p + 1)[0] - '1'; + startMap = Argv(p + 2)[0] - '1'; autoStart = true; } } @@ -651,11 +651,11 @@ void G_PostInit(void) if(autoStart) { if(gameMode == commercial) - Con_Message("Warp to Map %d, Skill %d\n", startMap, + Con_Message("Warp to Map %d, Skill %d\n", startMap+1, startSkill + 1); else Con_Message("Warp to Episode %d, Map %d, Skill %d\n", - startEpisode, startMap, startSkill + 1); + startEpisode+1, startMap+1, startSkill + 1); } // Load a saved game? @@ -671,14 +671,14 @@ void G_PostInit(void) if(autoStart || IS_NETGAME) { if(gameMode == commercial) - sprintf(mapStr, "MAP%2.2d", startMap); + sprintf(mapStr, "MAP%2.2d", startMap+1); else - sprintf(mapStr, "E%d%d", startEpisode, startMap); + sprintf(mapStr, "E%d%d", startEpisode+1, startMap+1); if(!W_CheckNumForName(mapStr)) { - startEpisode = 1; - startMap = 1; + startEpisode = 0; + startMap = 0; } } diff --git a/doomsday/plugins/jdoom64/src/d_main.c b/doomsday/plugins/jdoom64/src/d_main.c index c7a2de8a09..ece439939f 100644 --- a/doomsday/plugins/jdoom64/src/d_main.c +++ b/doomsday/plugins/jdoom64/src/d_main.c @@ -424,8 +424,8 @@ void G_PostInit(void) // Get skill / episode / map from parms. gameSkill = startSkill = SM_NOITEMS; - startEpisode = 1; - startMap = 1; + startEpisode = 0; + startMap = 0; autoStart = false; // Game mode specific settings @@ -464,7 +464,7 @@ void G_PostInit(void) p = ArgCheck("-warp"); if(p && p < myargc - 1) { - startMap = atoi(Argv(p + 1)); + startMap = atoi(Argv(p + 1)) - '1'; autoStart = true; } @@ -490,8 +490,8 @@ void G_PostInit(void) // Are we autostarting? if(autoStart) { - Con_Message("Warp to Episode %d, Map %d, Skill %d\n", startEpisode, - startMap, startSkill + 1); + Con_Message("Warp to Episode %d, Map %d, Skill %d\n", startEpisode+1, + startMap+1, startSkill + 1); } // Load a saved game? @@ -506,12 +506,12 @@ void G_PostInit(void) // Check valid episode and map. if((autoStart || IS_NETGAME)) { - sprintf(mapStr, "MAP%2.2d", startMap); + sprintf(mapStr, "MAP%2.2d", startMap+1); if(!W_CheckNumForName(mapStr)) { - startEpisode = 1; - startMap = 1; + startEpisode = 0; + startMap = 0; } } diff --git a/doomsday/plugins/jheretic/src/h_main.c b/doomsday/plugins/jheretic/src/h_main.c index 4f8240872b..3fb7883ff7 100644 --- a/doomsday/plugins/jheretic/src/h_main.c +++ b/doomsday/plugins/jheretic/src/h_main.c @@ -330,6 +330,7 @@ void G_PreInit(void) cfg.moveBlock = false; cfg.fallOff = true; cfg.fixFloorFire = false; + cfg.fixPlaneScrollMaterialsEastOnly = true; cfg.statusbarOpacity = 1; cfg.statusbarCounterAlpha = 1; @@ -461,8 +462,8 @@ void G_PostInit(void) // Defaults for skill, episode and map. startSkill = SM_MEDIUM; - startEpisode = 1; - startMap = 1; + startEpisode = 0; + startMap = 0; autoStart = false; // Game mode specific settings. @@ -488,16 +489,16 @@ void G_PostInit(void) p = ArgCheck("-episode"); if(p && p < myargc - 1) { - startEpisode = Argv(p + 1)[0] - '0'; - startMap = 1; + startEpisode = Argv(p + 1)[0] - '1'; + startMap = 0; autoStart = true; } p = ArgCheck("-warp"); if(p && p < myargc - 2) { - startEpisode = Argv(p + 1)[0] - '0'; - startMap = Argv(p + 2)[0] - '0'; + startEpisode = Argv(p + 1)[0] - '1'; + startMap = Argv(p + 2)[0] - '1'; autoStart = true; } @@ -527,13 +528,13 @@ void G_PostInit(void) p = ArgCheck("-devmap"); if(p && p < myargc - 2) { - e = Argv(p + 1)[0]; - m = Argv(p + 2)[0]; - sprintf(file, MAPDIR "E%cM%c.wad", e, m); + e = Argv(p + 1)[0] - 1; + m = Argv(p + 2)[0] - 1; + sprintf(file, MAPDIR "E%cM%c.wad", e+1, m+1); addFile(file); - printf("DEVMAP: Episode %c, Map %c.\n", e, m); - startEpisode = e - '0'; - startMap = m - '0'; + printf("DEVMAP: Episode %c, Map %c.\n", e+1, m+1); + startEpisode = e; + startMap = m; autoStart = true; devMap = true; } @@ -541,8 +542,8 @@ void G_PostInit(void) // Are we autostarting? if(autoStart) { - Con_Message("Warp to Episode %d, Map %d, Skill %d\n", startEpisode, - startMap, startSkill + 1); + Con_Message("Warp to Episode %d, Map %d, Skill %d\n", startEpisode+1, + startMap+1, startSkill + 1); } // Load a saved game? @@ -557,12 +558,12 @@ void G_PostInit(void) // Check valid episode and map if(autoStart || IS_NETGAME && !devMap) { - sprintf(mapStr, "E%d%d", startEpisode, startMap); + sprintf(mapStr, "E%d%d", startEpisode+1, startMap+1); if(!W_CheckNumForName(mapStr)) { - startEpisode = 1; - startMap = 1; + startEpisode = 0; + startMap = 0; } } diff --git a/doomsday/plugins/jhexen/src/h2_main.c b/doomsday/plugins/jhexen/src/h2_main.c index 8c7b800a4a..c9b81a2e64 100644 --- a/doomsday/plugins/jhexen/src/h2_main.c +++ b/doomsday/plugins/jhexen/src/h2_main.c @@ -404,9 +404,9 @@ void G_PostInit(void) /* None */ // Get skill / episode / map from parms. - startEpisode = 1; + startEpisode = 0; startSkill = SM_MEDIUM; - startMap = 1; + startMap = 0; // Game mode specific settings. /* None */ @@ -450,20 +450,9 @@ void G_PostInit(void) p = ArgCheck("-warp"); if(p && p < Argc() - 1) { - int map; - warpMap = atoi(Argv(p + 1)) - 1; - map = P_TranslateMap(warpMap); - if(map == -1) - { // Couldn't find real map number. - startMap = 1; - Con_Message("-WARP: Invalid map number.\n"); - } - else - { // Found a valid startmap. - startMap = map; - autoStart = true; - } + startMap = P_TranslateMap(warpMap); + autoStart = true; } else { @@ -487,12 +476,11 @@ void G_PostInit(void) // Check valid episode and map. if(autoStart || IS_NETGAME) { - sprintf(mapStr,"MAP%2.2d", startMap); + sprintf(mapStr,"MAP%2.2d", startMap+1); if(!W_CheckNumForName(mapStr)) { - startEpisode = 1; - startMap = 1; + startMap = 0; } }