thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename goner gamedata struct to milestones

Browse source
This commit is contained in:
Eidolon 2024-02-21 17:51:53 -06:00
parent ce6b76b0cf
commit 38940ee568
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/g_gamedata.cpp
View file

@ -56,15 +56,15 @@ void srb2::save_ng_gamedata()
ng.challengekeys.pendingkeyroundoffset = gamedata->pendingkeyroundoffset; ng.challengekeys.pendingkeyroundoffset = gamedata->pendingkeyroundoffset;
ng.challengekeys.keyspending = gamedata->keyspending; ng.challengekeys.keyspending = gamedata->keyspending;
ng.challengekeys.chaokeys = gamedata->chaokeys; ng.challengekeys.chaokeys = gamedata->chaokeys;
ng.goner.everloadedaddon = gamedata->everloadedaddon; ng.milestones.everloadedaddon = gamedata->everloadedaddon;
ng.goner.everfinishcredits = gamedata->everfinishedcredits; ng.milestones.everfinishcredits = gamedata->everfinishedcredits;
ng.goner.eversavedreplay = gamedata->eversavedreplay; ng.milestones.eversavedreplay = gamedata->eversavedreplay;
ng.goner.everseenspecial = gamedata->everseenspecial; ng.milestones.everseenspecial = gamedata->everseenspecial;
ng.goner.chaokeytutorial = gamedata->chaokeytutorial; ng.milestones.chaokeytutorial = gamedata->chaokeytutorial;
ng.goner.majorkeyskipattempted = gamedata->majorkeyskipattempted; ng.milestones.majorkeyskipattempted = gamedata->majorkeyskipattempted;
ng.goner.finishedtutorialchallenge = gamedata->finishedtutorialchallenge; ng.milestones.finishedtutorialchallenge = gamedata->finishedtutorialchallenge;
ng.goner.enteredtutorialchallenge = gamedata->enteredtutorialchallenge; ng.milestones.enteredtutorialchallenge = gamedata->enteredtutorialchallenge;
ng.goner.level = gamedata->gonerlevel; ng.milestones.gonerlevel = gamedata->gonerlevel;
ng.prisons.thisprisoneggpickup = gamedata->thisprisoneggpickup; ng.prisons.thisprisoneggpickup = gamedata->thisprisoneggpickup;
ng.prisons.prisoneggstothispickup = gamedata->prisoneggstothispickup; ng.prisons.prisoneggstothispickup = gamedata->prisoneggstothispickup;
ng.tafolderhash = quickncasehash(timeattackfolder, 64); ng.tafolderhash = quickncasehash(timeattackfolder, 64);
@ -390,15 +390,15 @@ void srb2::load_ng_gamedata()
gamedata->pendingkeyroundoffset = js.challengekeys.pendingkeyroundoffset; gamedata->pendingkeyroundoffset = js.challengekeys.pendingkeyroundoffset;
gamedata->keyspending = js.challengekeys.keyspending; gamedata->keyspending = js.challengekeys.keyspending;
gamedata->chaokeys = js.challengekeys.chaokeys; gamedata->chaokeys = js.challengekeys.chaokeys;
gamedata->everloadedaddon = js.goner.everloadedaddon; gamedata->everloadedaddon = js.milestones.everloadedaddon;
gamedata->everfinishedcredits = js.goner.everfinishcredits; gamedata->everfinishedcredits = js.milestones.everfinishcredits;
gamedata->eversavedreplay = js.goner.eversavedreplay; gamedata->eversavedreplay = js.milestones.eversavedreplay;
gamedata->everseenspecial = js.goner.everseenspecial; gamedata->everseenspecial = js.milestones.everseenspecial;
gamedata->chaokeytutorial = js.goner.chaokeytutorial; gamedata->chaokeytutorial = js.milestones.chaokeytutorial;
gamedata->majorkeyskipattempted = js.goner.majorkeyskipattempted; gamedata->majorkeyskipattempted = js.milestones.majorkeyskipattempted;
gamedata->finishedtutorialchallenge = js.goner.finishedtutorialchallenge; gamedata->finishedtutorialchallenge = js.milestones.finishedtutorialchallenge;
gamedata->enteredtutorialchallenge = js.goner.enteredtutorialchallenge; gamedata->enteredtutorialchallenge = js.milestones.enteredtutorialchallenge;
gamedata->gonerlevel = js.goner.level; gamedata->gonerlevel = js.milestones.gonerlevel;
gamedata->thisprisoneggpickup = js.prisons.thisprisoneggpickup; gamedata->thisprisoneggpickup = js.prisons.thisprisoneggpickup;
gamedata->prisoneggstothispickup = js.prisons.prisoneggstothispickup; gamedata->prisoneggstothispickup = js.prisons.prisoneggstothispickup;

12
src/g_gamedata.h
View file

@ -59,9 +59,9 @@ struct GamedataChallengeKeysJson final
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GamedataChallengeKeysJson, pendingkeyrounds, pendingkeyroundoffset, keyspending, chaokeys) NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GamedataChallengeKeysJson, pendingkeyrounds, pendingkeyroundoffset, keyspending, chaokeys)
}; };
struct GamedataGonerJson final struct GamedataMilestonesJson final
{ {
uint32_t level; uint32_t gonerlevel;
bool everloadedaddon; bool everloadedaddon;
bool everfinishcredits; bool everfinishcredits;
bool eversavedreplay; bool eversavedreplay;
@ -72,8 +72,8 @@ struct GamedataGonerJson final
bool enteredtutorialchallenge; bool enteredtutorialchallenge;
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT( NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(
GamedataGonerJson, GamedataMilestonesJson,
level, gonerlevel,
everloadedaddon, everloadedaddon,
everfinishcredits, everfinishcredits,
eversavedreplay, eversavedreplay,
@ -190,7 +190,7 @@ struct GamedataJson final
GamedataRingsJson rings; GamedataRingsJson rings;
GamedataRoundsJson rounds; GamedataRoundsJson rounds;
GamedataChallengeKeysJson challengekeys; GamedataChallengeKeysJson challengekeys;
GamedataGonerJson goner; GamedataMilestonesJson milestones;
GamedataPrisonEggPickupsJson prisons; GamedataPrisonEggPickupsJson prisons;
uint32_t tafolderhash; uint32_t tafolderhash;
std::vector<bool> emblems; std::vector<bool> emblems;
@ -210,7 +210,7 @@ struct GamedataJson final
rings, rings,
rounds, rounds,
challengekeys, challengekeys,
goner, milestones,
prisons, prisons,
tafolderhash, tafolderhash,
emblems, emblems,