AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2017-07-30 19:19:26 -10:00
parent 925aa3fe1a db03927e1d
commit 0cae1bb036
28 changed files with 363 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/CGameState.cpp
View File

@@ -129,16 +129,16 @@ CGameState::GameFileStateInfo CGameState::LoadGameFileState(const u8* data)
if (origMLVL == 0x158EFE17)
itemPercent = 0;
else
itemPercent = std::ceil(playerState.CalculateItemCollectionRate() * 100.f / playerState.GetPickupTotal());
itemPercent = u32(std::ceil(playerState.CalculateItemCollectionRate() * 100.f / playerState.GetPickupTotal()));
ret.x18_itemPercent = itemPercent;
float somePercent;
float scanPercent;
if (playerState.GetTotalLogScans() == 0)
somePercent = 0.f;
scanPercent = 0.f;
else
somePercent = 100.f * playerState.GetLogScans() / float(playerState.GetTotalLogScans());
ret.x1c_scanPercent = somePercent;
scanPercent = 100.f * playerState.GetLogScans() / float(playerState.GetTotalLogScans());
ret.x1c_scanPercent = scanPercent;
return ret;
}