diff --git a/src/g_gamedata.cpp b/src/g_gamedata.cpp index 58a84685c..6697c97a7 100644 --- a/src/g_gamedata.cpp +++ b/src/g_gamedata.cpp @@ -519,23 +519,9 @@ void srb2::load_ng_gamedata() gamedata->achieved[i] = js.conditionsets[i]; } - if (M_CheckParm("-resetchallengegrid")) - { - gamedata->challengegridwidth = 0; - if (gamedata->challengegrid) - { - Z_Free(gamedata->challengegrid); - gamedata->challengegrid = nullptr; - } - } - else + if (!M_CheckParm("-resetchallengegrid")) { gamedata->challengegridwidth = std::max(js.challengegrid.width, (uint32_t)0); - if (gamedata->challengegrid) - { - Z_Free(gamedata->challengegrid); - gamedata->challengegrid = nullptr; - } if (gamedata->challengegridwidth) { gamedata->challengegrid = static_cast(Z_Malloc( @@ -549,10 +535,6 @@ void srb2::load_ng_gamedata() M_SanitiseChallengeGrid(); } - else - { - gamedata->challengegrid = nullptr; - } } gamedata->timesBeaten = js.timesBeaten; @@ -666,10 +648,6 @@ void srb2::load_ng_gamedata() gamedata->gotspraycans = 0; gamedata->numspraycans = js.spraycans.size(); - if (gamedata->spraycans) - { - Z_Free(gamedata->spraycans); - } if (gamedata->numspraycans) { gamedata->spraycans = static_cast(Z_Malloc( @@ -731,10 +709,6 @@ void srb2::load_ng_gamedata() gamedata->gotspraycans++; } } - else - { - gamedata->spraycans = nullptr; - } for (auto& cuppair : js.cups) {