thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename cup emerald field to gotemerald, make bool

Browse source
This commit is contained in:
Eidolon 2024-02-21 18:44:58 -06:00
parent b1cf0207bf
commit ec6e96ca49
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/g_gamedata.cpp
View file

@ -187,7 +187,7 @@ void srb2::save_ng_gamedata()
cupdata.records[i].bestgrade = cup->windata[i].best_grade; cupdata.records[i].bestgrade = cup->windata[i].best_grade;
cupdata.records[i].bestplacement = cup->windata[i].best_placement; 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].bestskin = std::string(skins[cup->windata[i].best_skin.id].name);
cupdata.records[i].emerald = cup->windata[i].got_emerald; cupdata.records[i].gotemerald = cup->windata[i].got_emerald;
} }
ng.cups[cupdata.name] = std::move(cupdata); ng.cups[cupdata.name] = std::move(cupdata);
} }
@ -204,7 +204,7 @@ void srb2::save_ng_gamedata()
cupdata.records[i].bestgrade = unloadedcup->windata[i].best_grade; cupdata.records[i].bestgrade = unloadedcup->windata[i].best_grade;
cupdata.records[i].bestplacement = unloadedcup->windata[i].best_placement; 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].bestskin = std::string(skins[unloadedcup->windata[i].best_skin.id].name);
cupdata.records[i].emerald = unloadedcup->windata[i].got_emerald; cupdata.records[i].gotemerald = unloadedcup->windata[i].got_emerald;
} }
ng.cups[cupdata.name] = std::move(cupdata); ng.cups[cupdata.name] = std::move(cupdata);
} }
@ -640,7 +640,7 @@ void srb2::load_ng_gamedata()
{ {
dummywindata[j].best_placement = cuppair.second.records[j].bestplacement; dummywindata[j].best_placement = cuppair.second.records[j].bestplacement;
dummywindata[j].best_grade = static_cast<gp_rank_e>(cuppair.second.records[j].bestgrade); dummywindata[j].best_grade = static_cast<gp_rank_e>(cuppair.second.records[j].bestgrade);
dummywindata[j].got_emerald = cuppair.second.records[j].emerald; dummywindata[j].got_emerald = cuppair.second.records[j].gotemerald;
dummywindata[j].best_skin.id = MAXSKINS; dummywindata[j].best_skin.id = MAXSKINS;
dummywindata[j].best_skin.unloaded = nullptr; dummywindata[j].best_skin.unloaded = nullptr;

4
src/g_gamedata.h
View file

@ -170,10 +170,10 @@ struct GamedataCupRecordsJson final
{ {
uint8_t bestplacement; uint8_t bestplacement;
uint8_t bestgrade; uint8_t bestgrade;
uint8_t emerald; bool gotemerald;
std::string bestskin; std::string bestskin;
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GamedataCupRecordsJson, bestplacement, bestgrade, emerald, bestskin) NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GamedataCupRecordsJson, bestplacement, bestgrade, gotemerald, bestskin)
}; };
struct GamedataCupJson final struct GamedataCupJson final