thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-14 23:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow cup records in gamedata to be flexibly-sized

Browse source
This commit is contained in:
Eidolon 2024-02-21 18:40:35 -06:00
parent fdff7bbe9f
commit 4824b5d434
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/g_gamedata.cpp
View file

@ -182,7 +182,7 @@ void srb2::save_ng_gamedata()
}
srb2::GamedataCupJson cupdata {};
cupdata.name = std::string(cup->name);
for (int i = 0; i < 4; i++)
for (size_t i = 0; i < std::min<size_t>(KARTGP_MAX, cupdata.records.size()); i++)
{
cupdata.records[i].bestgrade = cup->windata[i].best_grade;
cupdata.records[i].bestplacement = cup->windata[i].best_placement;
@ -622,7 +622,7 @@ void srb2::load_ng_gamedata()
for (auto& cuppair : js.cups)
{
cupwindata_t dummywindata[4] {{}};
std::array<cupwindata_t, KARTGP_MAX> dummywindata {{}};
cupheader_t* cup = nullptr;
// Find the loaded cup
@ -636,7 +636,7 @@ void srb2::load_ng_gamedata()
}
// Digest its data...
for (size_t j = 0; j < (size_t)KARTGP_MAX; j++)
for (size_t j = 0; j < std::min<size_t>(KARTGP_MAX, cuppair.second.records.size()); j++)
{
dummywindata[j].best_placement = cuppair.second.records[j].bestplacement;
dummywindata[j].best_grade = static_cast<gp_rank_e>(cuppair.second.records[j].bestgrade);
@ -682,7 +682,7 @@ void srb2::load_ng_gamedata()
{
// We found a cup, so assign the windata.
memcpy(cup->windata, dummywindata, sizeof(cup->windata));
memcpy(cup->windata, dummywindata.data(), sizeof(cup->windata));
}
else if (dummywindata[0].best_placement != 0)
{
@ -704,7 +704,7 @@ void srb2::load_ng_gamedata()
unloadedcupheaders = unloadedcup;
// Finally, copy into.
memcpy(unloadedcup->windata, dummywindata, sizeof(cup->windata));
memcpy(unloadedcup->windata, dummywindata.data(), sizeof(cup->windata));
}
}

2
src/g_gamedata.h
View file

@ -179,7 +179,7 @@ struct GamedataCupRecordsJson final
struct GamedataCupJson final
{
std::string name;
std::array<GamedataCupRecordsJson, 4> records;
std::vector<GamedataCupRecordsJson> records;
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GamedataCupJson, name, records)
};