Challenge Grid is 5 tiles high now again

I'm sorry, it was just TOO SWAG.
Gamedata minor version increment
This commit is contained in:
toaster 2023-09-28 22:30:26 +01:00
parent 20f47a69dd
commit 07afe6cb06
4 changed files with 7 additions and 7 deletions

View file

@ -4388,7 +4388,7 @@ 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 6 // Change every format update #define GD_VERSIONMINOR 7 // Change every format update
typedef enum typedef enum
{ {
@ -4481,7 +4481,7 @@ void G_LoadGameData(void)
FIL_WriteFile(va("%s" PATHSEP "%s.bak", srb2home, gamedatafilename), save.buffer, save.size); FIL_WriteFile(va("%s" PATHSEP "%s.bak", srb2home, gamedatafilename), save.buffer, save.size);
} }
if ((versionMinor == 0 || versionMinor == 1) if ((versionMinor <= 6)
#ifdef DEVELOP #ifdef DEVELOP
|| M_CheckParm("-resetchallengegrid") || M_CheckParm("-resetchallengegrid")
#endif #endif
@ -4593,7 +4593,7 @@ void G_LoadGameData(void)
if (gridunusable) if (gridunusable)
{ {
UINT16 burn = READUINT16(save.p); // Previous challengegridwidth UINT16 burn = READUINT16(save.p); // Previous challengegridwidth
UINT8 height = (versionMinor > 0) ? CHALLENGEGRIDHEIGHT : 5; UINT8 height = (versionMinor && versionMinor <= 6) ? 4 : CHALLENGEGRIDHEIGHT;
save.p += (burn * height * unlockreadsize); // Step over previous grid data save.p += (burn * height * unlockreadsize); // Step over previous grid data
gamedata->challengegridwidth = 0; gamedata->challengegridwidth = 0;

View file

@ -5572,7 +5572,7 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
addflags ^= V_FLIP; // This sprite is left/right flipped! addflags ^= V_FLIP; // This sprite is left/right flipped!
} }
V_DrawFixedPatch(x*FRACUNIT, (y+6)*FRACUNIT, FRACUNIT, addflags, patch, NULL); V_DrawFixedPatch(x*FRACUNIT, (y+7)*FRACUNIT, FRACUNIT, addflags, patch, NULL);
return; return;
} }
@ -6105,7 +6105,7 @@ void M_DrawChallenges(void)
y = currentMenu->y; y = currentMenu->y;
V_DrawFadeFill(0, y-2, BASEVIDWIDTH, 90, 0, 31, challengetransparentstrength); V_DrawFadeFill(0, y-2, BASEVIDWIDTH, (challengesgridstep * CHALLENGEGRIDHEIGHT) + 2, 0, 31, challengetransparentstrength);
x -= (challengesgridstep-1); x -= (challengesgridstep-1);

View file

@ -219,7 +219,7 @@ typedef enum
#define MAXEMBLEMS (MAXCONDITIONSETS*2) #define MAXEMBLEMS (MAXCONDITIONSETS*2)
#define MAXUNLOCKABLES MAXCONDITIONSETS #define MAXUNLOCKABLES MAXCONDITIONSETS
#define CHALLENGEGRIDHEIGHT 4 #define CHALLENGEGRIDHEIGHT 5
#ifdef DEVELOP #ifdef DEVELOP
#define CHALLENGEGRIDLOOPWIDTH 3 #define CHALLENGEGRIDLOOPWIDTH 3
#else #else

View file

@ -21,7 +21,7 @@ menu_t MISC_ChallengesDef = {
&MainDef, &MainDef,
0, 0,
MISC_ChallengesStatsDummyMenu, MISC_ChallengesStatsDummyMenu,
BASEVIDWIDTH/2, 30, BASEVIDWIDTH/2, 11,
0, 0, 0, 0,
0, 0,
"UNLOCK", "UNLOCK",