thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-17 19:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cup placement saving

Browse source
This commit is contained in:
Eidolon 2024-02-22 20:39:36 -06:00
parent 3d512c9787
commit 10d8ca0bac
1 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/g_gamedata.cpp
View file

@ -182,12 +182,22 @@ void srb2::save_ng_gamedata()
}
srb2::GamedataCupJson cupdata {};
cupdata.name = std::string(cup->name);
for (size_t i = 0; i < std::min<size_t>(KARTGP_MAX, cupdata.records.size()); i++)
for (size_t i = 0; i < KARTGP_MAX; i++)
{
cupdata.records[i].bestgrade = cup->windata[i].best_grade;
cupdata.records[i].bestplacement = cup->windata[i].best_placement;
cupdata.records[i].bestskin = std::string(skins[cup->windata[i].best_skin.id].name);
cupdata.records[i].gotemerald = cup->windata[i].got_emerald;
srb2::GamedataCupRecordsJson newrecords {};
newrecords.bestgrade = cup->windata[i].best_grade;
newrecords.bestplacement = cup->windata[i].best_placement;
skinreference_t& skinref = cup->windata[i].best_skin;
if (skinref.unloaded)
{
newrecords.bestskin = std::string(skinref.unloaded->name);
}
else
{
newrecords.bestskin = std::string(skins[skinref.id].name);
}
newrecords.gotemerald = cup->windata[i].got_emerald;
cupdata.records.emplace_back(std::move(newrecords));
}
ng.cups[cupdata.name] = std::move(cupdata);
}
@ -199,12 +209,22 @@ void srb2::save_ng_gamedata()
}
srb2::GamedataCupJson cupdata {};
cupdata.name = std::string(unloadedcup->name);
for (int i = 0; i < 4; i++)
for (int i = 0; i < KARTGP_MAX; i++)
{
cupdata.records[i].bestgrade = unloadedcup->windata[i].best_grade;
cupdata.records[i].bestplacement = unloadedcup->windata[i].best_placement;
cupdata.records[i].bestskin = std::string(skins[unloadedcup->windata[i].best_skin.id].name);
cupdata.records[i].gotemerald = unloadedcup->windata[i].got_emerald;
srb2::GamedataCupRecordsJson newrecords {};
newrecords.bestgrade = unloadedcup->windata[i].best_grade;
newrecords.bestplacement = unloadedcup->windata[i].best_placement;
skinreference_t& skinref = unloadedcup->windata[i].best_skin;
if (skinref.unloaded)
{
newrecords.bestskin = std::string(skinref.unloaded->name);
}
else
{
newrecords.bestskin = std::string(skins[skinref.id].name);
}
newrecords.gotemerald = unloadedcup->windata[i].got_emerald;
cupdata.records.emplace_back(std::move(newrecords));
}
ng.cups[cupdata.name] = std::move(cupdata);
}
@ -645,22 +665,10 @@ void srb2::load_ng_gamedata()
dummywindata[j].best_skin.id = MAXSKINS;
dummywindata[j].best_skin.unloaded = nullptr;
bool skinfound = false;
for (int skin = 0; skin < numskins; skin++)
{
std::string skinname = std::string(skins[skin].name);
if (skinname == cuppair.second.records[j].bestskin)
{
skinreference_t ref {};
ref.id = skin;
ref.unloaded = nullptr;
dummywindata[j].best_skin = ref;
skinfound = true;
break;
}
}
if (skinfound)
int skinloaded = R_SkinAvailable(cuppair.second.records[j].bestskin.c_str());
if (skinloaded >= 0)
{
dummywindata[j].best_skin.id = skinloaded;
continue;
}
for (auto unloadedskin = unloadedskins; unloadedskin; unloadedskin = unloadedskin->next)
@ -672,7 +680,6 @@ void srb2::load_ng_gamedata()
ref.id = MAXSKINS;
ref.unloaded = unloadedskin;
dummywindata[j].best_skin = ref;
skinfound = true;
break;
}
}