thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-23 16:32:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up risky default-init of gamedata structs

Browse source
This commit is contained in:
Eidolon 2024-02-21 18:20:00 -06:00
parent 38940ee568
commit fdff7bbe9f
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/g_gamedata.cpp
View file

@ -42,7 +42,7 @@ void srb2::save_ng_gamedata()
return; return;
} }
GamedataJson ng{}; GamedataJson ng {};
ng.playtime.total = gamedata->totalplaytime; ng.playtime.total = gamedata->totalplaytime;
ng.rings.total = gamedata->totalrings; ng.rings.total = gamedata->totalrings;
@ -100,21 +100,21 @@ void srb2::save_ng_gamedata()
ng.timesBeaten = gamedata->timesBeaten; ng.timesBeaten = gamedata->timesBeaten;
for (int i = 0; i < numskins; i++) for (int i = 0; i < numskins; i++)
{ {
srb2::GamedataSkinJson skin; srb2::GamedataSkinJson skin {};
std::string name = std::string(skins[i].name); std::string name = std::string(skins[i].name);
skin.records.wins = skins[i].records.wins; skin.records.wins = skins[i].records.wins;
ng.skins[name] = skin; ng.skins[name] = std::move(skin);
} }
for (auto unloadedskin = unloadedskins; unloadedskin; unloadedskin = unloadedskin->next) for (auto unloadedskin = unloadedskins; unloadedskin; unloadedskin = unloadedskin->next)
{ {
srb2::GamedataSkinJson skin; srb2::GamedataSkinJson skin {};
std::string name = std::string(unloadedskin->name); std::string name = std::string(unloadedskin->name);
skin.records.wins = unloadedskin->records.wins; skin.records.wins = unloadedskin->records.wins;
ng.skins[name] = skin; ng.skins[name] = std::move(skin);
} }
for (int i = 0; i < nummapheaders; i++) for (int i = 0; i < nummapheaders; i++)
{ {
srb2::GamedataMapJson map; srb2::GamedataMapJson map {};
std::string lumpname = std::string(mapheaderinfo[i]->lumpname); std::string lumpname = std::string(mapheaderinfo[i]->lumpname);
map.visited.visited = mapheaderinfo[i]->records.mapvisited & MV_VISITED; map.visited.visited = mapheaderinfo[i]->records.mapvisited & MV_VISITED;
map.visited.beaten = mapheaderinfo[i]->records.mapvisited & MV_BEATEN; map.visited.beaten = mapheaderinfo[i]->records.mapvisited & MV_BEATEN;
@ -125,11 +125,11 @@ void srb2::save_ng_gamedata()
map.stats.timeattack.bestlap = mapheaderinfo[i]->records.lap; map.stats.timeattack.bestlap = mapheaderinfo[i]->records.lap;
map.stats.spbattack.besttime = 0; map.stats.spbattack.besttime = 0;
map.stats.spbattack.bestlap = 0; map.stats.spbattack.bestlap = 0;
ng.maps[lumpname] = map; ng.maps[lumpname] = std::move(map);
} }
for (auto unloadedmap = unloadedmapheaders; unloadedmap; unloadedmap = unloadedmap->next) for (auto unloadedmap = unloadedmapheaders; unloadedmap; unloadedmap = unloadedmap->next)
{ {
srb2::GamedataMapJson map; srb2::GamedataMapJson map {};
std::string lumpname = std::string(unloadedmap->lumpname); std::string lumpname = std::string(unloadedmap->lumpname);
map.visited.visited = unloadedmap->records.mapvisited & MV_VISITED; map.visited.visited = unloadedmap->records.mapvisited & MV_VISITED;
map.visited.beaten = unloadedmap->records.mapvisited & MV_BEATEN; map.visited.beaten = unloadedmap->records.mapvisited & MV_BEATEN;
@ -140,11 +140,11 @@ void srb2::save_ng_gamedata()
map.stats.timeattack.bestlap = unloadedmap->records.lap; map.stats.timeattack.bestlap = unloadedmap->records.lap;
map.stats.spbattack.besttime = 0; map.stats.spbattack.besttime = 0;
map.stats.spbattack.bestlap = 0; map.stats.spbattack.bestlap = 0;
ng.maps[lumpname] = map; ng.maps[lumpname] = std::move(map);
} }
for (int i = 0; i < gamedata->numspraycans; i++) for (int i = 0; i < gamedata->numspraycans; i++)
{ {
srb2::GamedataSprayCanJson spraycan; srb2::GamedataSprayCanJson spraycan {};
candata_t* can = &gamedata->spraycans[i]; candata_t* can = &gamedata->spraycans[i];
@ -172,7 +172,7 @@ void srb2::save_ng_gamedata()
continue; continue;
} }
spraycan.map = std::string(mapheader->lumpname); spraycan.map = std::string(mapheader->lumpname);
ng.spraycans.push_back(spraycan); ng.spraycans.emplace_back(std::move(spraycan));
} }
for (auto cup = kartcupheaders; cup; cup = cup->next) for (auto cup = kartcupheaders; cup; cup = cup->next)
{ {
@ -180,7 +180,7 @@ void srb2::save_ng_gamedata()
{ {
continue; continue;
} }
srb2::GamedataCupJson cupdata; srb2::GamedataCupJson cupdata {};
cupdata.name = std::string(cup->name); cupdata.name = std::string(cup->name);
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
@ -189,7 +189,7 @@ void srb2::save_ng_gamedata()
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].emerald = cup->windata[i].got_emerald;
} }
ng.cups[cupdata.name] = cupdata; ng.cups[cupdata.name] = std::move(cupdata);
} }
for (auto unloadedcup = unloadedcupheaders; unloadedcup; unloadedcup = unloadedcup->next) for (auto unloadedcup = unloadedcupheaders; unloadedcup; unloadedcup = unloadedcup->next)
{ {
@ -197,7 +197,7 @@ void srb2::save_ng_gamedata()
{ {
continue; continue;
} }
srb2::GamedataCupJson cupdata; srb2::GamedataCupJson cupdata {};
cupdata.name = std::string(unloadedcup->name); cupdata.name = std::string(unloadedcup->name);
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
@ -206,12 +206,12 @@ void srb2::save_ng_gamedata()
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].emerald = unloadedcup->windata[i].got_emerald;
} }
ng.cups[cupdata.name] = cupdata; ng.cups[cupdata.name] = std::move(cupdata);
} }
std::string gamedataname_s{gamedatafilename}; std::string gamedataname_s {gamedatafilename};
fs::path savepath{fmt::format("{}/{}", srb2home, gamedataname_s)}; fs::path savepath {fmt::format("{}/{}", srb2home, gamedataname_s)};
fs::path tmpsavepath{fmt::format("{}/{}.tmp", srb2home, gamedataname_s)}; fs::path tmpsavepath {fmt::format("{}/{}.tmp", srb2home, gamedataname_s)};
json ngdata_json = ng; json ngdata_json = ng;
@ -465,7 +465,7 @@ void srb2::load_ng_gamedata()
} }
else else
{ {
gamedata->challengegrid = NULL; gamedata->challengegrid = nullptr;
} }
} }