diff --git a/src/d_netcmd.c b/src/d_netcmd.c index e01e0d1f6..00df2bc6a 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -830,7 +830,7 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_recordmultiplayerdemos); CV_RegisterVar(&cv_netdemosyncquality); CV_RegisterVar(&cv_maxdemosize); - CV_RegisterVar(&cv_demosamemap); + CV_RegisterVar(&cv_demochangemap); CV_RegisterVar(&cv_keyboardlayout); } @@ -2968,7 +2968,7 @@ static void Command_Map_f(void) } // spend atleast 35 seconds in one map - if (demo.recording && demo.savemode != DSM_NOTSAVING && (timeinmap > 1463) && ((cv_demosamemap.value && newmapnum == gamemap) || newmapnum != gamemap)) + if (cv_demochangemap.value && demo.recording && demo.savemode != DSM_NOTSAVING && (timeinmap > 1463) && ((cv_demochangemap.value == 2 && newmapnum == gamemap) || newmapnum != gamemap)) G_SaveDemo(); fromlevelselect = false; diff --git a/src/g_game.c b/src/g_game.c index 2e3ff64b7..b6487e7c5 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -346,7 +346,8 @@ consvar_t cv_netdemosyncquality = {"netdemo_syncquality", "1", CV_SAVE, netdemos static CV_PossibleValue_t maxdemosize_cons_t[] = {{10, "MIN"}, {100, "MAX"}, {0, NULL}}; consvar_t cv_maxdemosize = {"maxdemosize", "10", CV_SAVE, maxdemosize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_demosamemap = {"netdemo_savesamemap", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t demochangemap_cons_t[] = {{0, "Disabled"}, {1, "Diff Map"}, {2, "Always"}, {0, NULL}}; +consvar_t cv_demochangemap = {"netdemo_savemapchange", "Disabled", CV_SAVE, demochangemap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static UINT8 *savebuffer; diff --git a/src/g_game.h b/src/g_game.h index 432a10039..83d85ed91 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -39,7 +39,7 @@ extern UINT8 *demo_p; // ====================================== // demoplaying back and demo recording -extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosize, cv_demosamemap; +extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosize, cv_demochangemap; // Publicly-accessible demo vars struct demovars_s { diff --git a/src/m_menu.c b/src/m_menu.c index 053ebb5a6..60671d826 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -629,7 +629,7 @@ static menuitem_t MISC_ReplayStartMenu[] = static menuitem_t MISC_ReplayOptionsMenu[] = { {IT_CVAR|IT_STRING, NULL, "Record Replays", &cv_recordmultiplayerdemos, 0}, - {IT_CVAR|IT_STRING, NULL, "Save Replays on Map restart", &cv_demosamemap, 10}, + {IT_CVAR|IT_STRING, NULL, "Save Replays on Map change", &cv_demochangemap, 10}, {IT_CVAR|IT_STRING, NULL, "Sync Check Interval", &cv_netdemosyncquality, 20}, {IT_CVAR|IT_STRING, NULL, "Max demo size (MiB)", &cv_maxdemosize, 30}, {IT_CVAR|IT_STRING, NULL, "Replay Search Rate", &cv_replaysearchrate, 40},