thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 10:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'delete-your-developringdata' into 'master'

Browse source 
Add a short help instruction to "Game data is from the future!" error

See merge request KartKrew/Kart!997
This commit is contained in:
toaster 2023-03-01 18:23:52 +00:00
commit 946a9b0849
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/g_game.c
View file

@ -4319,6 +4319,14 @@ void G_LoadGameSettings(void)
#define GD_VERSIONCHECK 0xBA5ED123 // Change every major version, as usual #define GD_VERSIONCHECK 0xBA5ED123 // Change every major version, as usual
#define GD_VERSIONMINOR 1 // Change every format update #define GD_VERSIONMINOR 1 // Change every format update
static const char *G_GameDataFolder(void)
{
if (strcmp(srb2home,"."))
return srb2home;
else
return "the Ring Racers folder";
}
// G_LoadGameData // G_LoadGameData
// Loads the main data file, which stores information such as emblems found, etc. // Loads the main data file, which stores information such as emblems found, etc.
void G_LoadGameData(void) void G_LoadGameData(void)
@ -4368,19 +4376,19 @@ void G_LoadGameData(void)
versionID = READUINT32(save.p); versionID = READUINT32(save.p);
if (versionID != GD_VERSIONCHECK) if (versionID != GD_VERSIONCHECK)
{ {
const char *gdfolder = "the Ring Racers folder"; const char *gdfolder = G_GameDataFolder();
if (strcmp(srb2home,"."))
gdfolder = srb2home;
P_SaveBufferFree(&save); P_SaveBufferFree(&save);
I_Error("Game data is not for Ring Racers v2.0.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder); I_Error("Game data is not for Ring Racers v2.0.\nDelete %s (maybe in %s) and try again.", gamedatafilename, gdfolder);
} }
versionMinor = READUINT8(save.p); versionMinor = READUINT8(save.p);
if (versionMinor > GD_VERSIONMINOR) if (versionMinor > GD_VERSIONMINOR)
{ {
const char *gdfolder = G_GameDataFolder();
P_SaveBufferFree(&save); P_SaveBufferFree(&save);
I_Error("Game data is from the future! (expected %d, got %d)", GD_VERSIONMINOR, versionMinor); I_Error("Game data is from the future! (expected %d, got %d)\nRename or delete %s (maybe in %s) and try again.", GD_VERSIONMINOR, versionMinor, gamedatafilename, gdfolder);
} }
if (versionMinor == 0) if (versionMinor == 0)
{ {