mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix the actual problem with saving in DEVELOP: cv_cheats didn't have CV_NOINIT
Also fixes a likely waiting-in-the-wings crash for the next time we make a non-DEVELOP build.
This commit is contained in:
parent
6d0637d39d
commit
b074d6cbdd
2 changed files with 9 additions and 10 deletions
|
|
@ -84,7 +84,7 @@ CV_PossibleValue_t CV_Natural[] = {{1, "MIN"}, {999999999, "MAX"}, {0, NULL}};
|
||||||
#else
|
#else
|
||||||
#define VALUE "Off"
|
#define VALUE "Off"
|
||||||
#endif
|
#endif
|
||||||
consvar_t cv_cheats = CVAR_INIT ("cheats", VALUE, CV_NETVAR|CV_CALL, CV_OnOff, CV_CheatsChanged);
|
consvar_t cv_cheats = CVAR_INIT ("cheats", VALUE, CV_NETVAR|CV_CALL|CV_NOINIT, CV_OnOff, CV_CheatsChanged);
|
||||||
#undef VALUE
|
#undef VALUE
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
|
|
|
||||||
17
src/g_game.c
17
src/g_game.c
|
|
@ -4501,6 +4501,14 @@ void G_SaveGameData(void)
|
||||||
if (!gamedataloaded)
|
if (!gamedataloaded)
|
||||||
return; // If never loaded (-nodata), don't save
|
return; // If never loaded (-nodata), don't save
|
||||||
|
|
||||||
|
if (usedCheats)
|
||||||
|
{
|
||||||
|
#ifdef DEVELOP
|
||||||
|
CONS_Alert(CONS_WARNING, M_GetText("Cheats used - Gamedata will not be saved.\n"));
|
||||||
|
#endif
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
length = (4+4+4+1+(MAXEMBLEMS)+MAXEXTRAEMBLEMS+MAXUNLOCKABLES+MAXCONDITIONSETS+4+4);
|
length = (4+4+4+1+(MAXEMBLEMS)+MAXEXTRAEMBLEMS+MAXUNLOCKABLES+MAXCONDITIONSETS+4+4);
|
||||||
length += nummapheaders * (MAXMAPLUMPNAME+1+4+4);
|
length += nummapheaders * (MAXMAPLUMPNAME+1+4+4);
|
||||||
|
|
||||||
|
|
@ -4511,15 +4519,6 @@ void G_SaveGameData(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef DEVELOP
|
|
||||||
if (usedCheats)
|
|
||||||
{
|
|
||||||
free(savebuffer);
|
|
||||||
save_p = savebuffer = NULL;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Version test
|
// Version test
|
||||||
|
|
||||||
WRITEUINT32(save_p, GD_VERSIONCHECK); // 4
|
WRITEUINT32(save_p, GD_VERSIONCHECK); // 4
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue