From 38940ee56876da313122fddfc1110c83ee95f42b Mon Sep 17 00:00:00 2001 From: Eidolon Date: Wed, 21 Feb 2024 17:51:53 -0600 Subject: [PATCH] Rename goner gamedata struct to milestones --- src/g_gamedata.cpp | 36 ++++++++++++++++++------------------ src/g_gamedata.h | 12 ++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/g_gamedata.cpp b/src/g_gamedata.cpp index ee0c53706..56a126e8e 100644 --- a/src/g_gamedata.cpp +++ b/src/g_gamedata.cpp @@ -56,15 +56,15 @@ void srb2::save_ng_gamedata() ng.challengekeys.pendingkeyroundoffset = gamedata->pendingkeyroundoffset; ng.challengekeys.keyspending = gamedata->keyspending; ng.challengekeys.chaokeys = gamedata->chaokeys; - ng.goner.everloadedaddon = gamedata->everloadedaddon; - ng.goner.everfinishcredits = gamedata->everfinishedcredits; - ng.goner.eversavedreplay = gamedata->eversavedreplay; - ng.goner.everseenspecial = gamedata->everseenspecial; - ng.goner.chaokeytutorial = gamedata->chaokeytutorial; - ng.goner.majorkeyskipattempted = gamedata->majorkeyskipattempted; - ng.goner.finishedtutorialchallenge = gamedata->finishedtutorialchallenge; - ng.goner.enteredtutorialchallenge = gamedata->enteredtutorialchallenge; - ng.goner.level = gamedata->gonerlevel; + ng.milestones.everloadedaddon = gamedata->everloadedaddon; + ng.milestones.everfinishcredits = gamedata->everfinishedcredits; + ng.milestones.eversavedreplay = gamedata->eversavedreplay; + ng.milestones.everseenspecial = gamedata->everseenspecial; + ng.milestones.chaokeytutorial = gamedata->chaokeytutorial; + ng.milestones.majorkeyskipattempted = gamedata->majorkeyskipattempted; + ng.milestones.finishedtutorialchallenge = gamedata->finishedtutorialchallenge; + ng.milestones.enteredtutorialchallenge = gamedata->enteredtutorialchallenge; + ng.milestones.gonerlevel = gamedata->gonerlevel; ng.prisons.thisprisoneggpickup = gamedata->thisprisoneggpickup; ng.prisons.prisoneggstothispickup = gamedata->prisoneggstothispickup; ng.tafolderhash = quickncasehash(timeattackfolder, 64); @@ -390,15 +390,15 @@ void srb2::load_ng_gamedata() gamedata->pendingkeyroundoffset = js.challengekeys.pendingkeyroundoffset; gamedata->keyspending = js.challengekeys.keyspending; gamedata->chaokeys = js.challengekeys.chaokeys; - gamedata->everloadedaddon = js.goner.everloadedaddon; - gamedata->everfinishedcredits = js.goner.everfinishcredits; - gamedata->eversavedreplay = js.goner.eversavedreplay; - gamedata->everseenspecial = js.goner.everseenspecial; - gamedata->chaokeytutorial = js.goner.chaokeytutorial; - gamedata->majorkeyskipattempted = js.goner.majorkeyskipattempted; - gamedata->finishedtutorialchallenge = js.goner.finishedtutorialchallenge; - gamedata->enteredtutorialchallenge = js.goner.enteredtutorialchallenge; - gamedata->gonerlevel = js.goner.level; + gamedata->everloadedaddon = js.milestones.everloadedaddon; + gamedata->everfinishedcredits = js.milestones.everfinishcredits; + gamedata->eversavedreplay = js.milestones.eversavedreplay; + gamedata->everseenspecial = js.milestones.everseenspecial; + gamedata->chaokeytutorial = js.milestones.chaokeytutorial; + gamedata->majorkeyskipattempted = js.milestones.majorkeyskipattempted; + gamedata->finishedtutorialchallenge = js.milestones.finishedtutorialchallenge; + gamedata->enteredtutorialchallenge = js.milestones.enteredtutorialchallenge; + gamedata->gonerlevel = js.milestones.gonerlevel; gamedata->thisprisoneggpickup = js.prisons.thisprisoneggpickup; gamedata->prisoneggstothispickup = js.prisons.prisoneggstothispickup; diff --git a/src/g_gamedata.h b/src/g_gamedata.h index eb759fd59..385e83f38 100644 --- a/src/g_gamedata.h +++ b/src/g_gamedata.h @@ -59,9 +59,9 @@ struct GamedataChallengeKeysJson final 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 everfinishcredits; bool eversavedreplay; @@ -72,8 +72,8 @@ struct GamedataGonerJson final bool enteredtutorialchallenge; NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT( - GamedataGonerJson, - level, + GamedataMilestonesJson, + gonerlevel, everloadedaddon, everfinishcredits, eversavedreplay, @@ -190,7 +190,7 @@ struct GamedataJson final GamedataRingsJson rings; GamedataRoundsJson rounds; GamedataChallengeKeysJson challengekeys; - GamedataGonerJson goner; + GamedataMilestonesJson milestones; GamedataPrisonEggPickupsJson prisons; uint32_t tafolderhash; std::vector emblems; @@ -210,7 +210,7 @@ struct GamedataJson final rings, rounds, challengekeys, - goner, + milestones, prisons, tafolderhash, emblems,