remove "majormods" checks from stuff that saves to savegame
so its only there to throw a notice when you load an addon
This commit is contained in:
parent
939ffd61db
commit
19b7019e40
3 changed files with 4 additions and 29 deletions
|
|
@ -5826,12 +5826,8 @@ void Command_Retry_f(void)
|
|||
*/
|
||||
static void Command_Isgamemodified_f(void)
|
||||
{
|
||||
if (majormods)
|
||||
CONS_Printf("The game has been modified with major addons, so you cannot play Record Attack.\n");
|
||||
else if (savemoddata)
|
||||
CONS_Printf("The game has been modified with an addon with its own save data, so you can play Record Attack and earn medals.\n");
|
||||
else if (modifiedgame)
|
||||
CONS_Printf("The game has been modified with only minor addons. You can play Record Attack, earn medals and unlock extras.\n");
|
||||
if (majormods || modifiedgame)
|
||||
CONS_Printf("The game has been modified, Record Attack data will be saved to a seperate savegame.\n");
|
||||
else
|
||||
CONS_Printf("The game has not been modified. You can play Record Attack, earn medals and unlock extras.\n");
|
||||
}
|
||||
|
|
|
|||
14
src/g_game.c
14
src/g_game.c
|
|
@ -672,13 +672,12 @@ static void G_UpdateRecordReplays(void)
|
|||
G_SaveGameData();
|
||||
}
|
||||
|
||||
// hack t
|
||||
// kinda hacky way to do this, but this sets the game to use a seperate savefile if you have addons loaded
|
||||
static void G_SetSaveGameModified(void)
|
||||
{
|
||||
size_t filenamelen;
|
||||
|
||||
savemoddata = true;
|
||||
majormods = false; // FIXME: this breaks the menu warning screen from popping up, id still want to use it to mention the diff savefile
|
||||
|
||||
strlcpy(gamedatafilename, "modkartdata.dat", sizeof (gamedatafilename));
|
||||
strlwr(gamedatafilename);
|
||||
|
|
@ -711,6 +710,7 @@ void G_SetGameModified(boolean silent, boolean major)
|
|||
//savemoddata = false; -- there is literally no reason to do this anymore.
|
||||
majormods = true;
|
||||
|
||||
// should this only be done when you load a "major" gameplay modifieng addon?
|
||||
G_SetSaveGameModified();
|
||||
|
||||
if (!silent)
|
||||
|
|
@ -4500,16 +4500,6 @@ void G_SaveGameData(void)
|
|||
return;
|
||||
}
|
||||
|
||||
#if 0
|
||||
// SRB2Kart: Let players unlock stuff with addons.
|
||||
if (modifiedgame && !savemoddata)
|
||||
{
|
||||
free(save.buffer);
|
||||
save.p = save.buffer = NULL;
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Version test
|
||||
WRITEUINT32(save.p, GD_VERSIONCHECK); // 4
|
||||
|
||||
|
|
|
|||
11
src/m_menu.c
11
src/m_menu.c
|
|
@ -2952,17 +2952,6 @@ boolean M_Responder(event_t *ev)
|
|||
|
||||
if (routine)
|
||||
{
|
||||
if (((currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_CALL
|
||||
|| (currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_SUBMENU)
|
||||
&& (currentMenu->menuitems[itemOn].status & IT_CALLTYPE))
|
||||
{
|
||||
if (((currentMenu->menuitems[itemOn].status & IT_CALLTYPE) & IT_CALL_NOTMODIFIED) && majormods)
|
||||
{
|
||||
S_StartSound(NULL, sfx_menu1);
|
||||
M_StartMessage(M_GetText("This cannot be done with complex addons\nor in a cheated game.\n\n(Press a key)\n"), NULL, MM_NOTHING);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
S_StartSound(NULL, sfx_menu1);
|
||||
switch (currentMenu->menuitems[itemOn].status & IT_TYPE)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue