AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CGameState: Resolve sign conversion warnings in PutTo() 

Same behavior, but makes conversions explicit.
This commit is contained in:
Lioncash 2020-03-29 21:03:22 -04:00
parent 45ea19040d
commit 6d2ef0360f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/CGameState.cpp
View File

@ -38,15 +38,17 @@ CWorldLayerState::CWorldLayerState(CBitStreamReader& reader, const CSaveWorld& s
void CWorldLayerState::PutTo(CBitStreamWriter& writer) const { void CWorldLayerState::PutTo(CBitStreamWriter& writer) const {
u32 totalLayerCount = 0; u32 totalLayerCount = 0;
for (int i = 0; i < x0_areaLayers.size(); ++i) for (size_t i = 0; i < x0_areaLayers.size(); ++i) {
totalLayerCount += GetAreaLayerCount(i) - 1; totalLayerCount += GetAreaLayerCount(s32(i)) - 1;
}
writer.WriteEncoded(totalLayerCount, 10); writer.WriteEncoded(totalLayerCount, 10);
for (int i = 0; i < x0_areaLayers.size(); ++i) { for (size_t i = 0; i < x0_areaLayers.size(); ++i) {
u32 count = GetAreaLayerCount(i); const u32 count = GetAreaLayerCount(s32(i));
for (u32 l = 1; l < count; ++l) for (u32 l = 1; l < count; ++l) {
writer.WriteEncoded(IsLayerActive(i, l), 1); writer.WriteEncoded(IsLayerActive(s32(i), s32(l)), 1);
}
} }
} }
@ -95,8 +97,9 @@ CGameState::GameFileStateInfo CGameState::LoadGameFileState(const u8* data) {
CBitStreamReader stream(data, 4096); CBitStreamReader stream(data, 4096);
GameFileStateInfo ret; GameFileStateInfo ret;
for (u32 i = 0; i < 128; i++) for (u32 i = 0; i < 128; i++) {
stream.ReadEncoded(8); stream.ReadEncoded(8);
}
ret.x14_timestamp = stream.ReadEncoded(32); ret.x14_timestamp = stream.ReadEncoded(32);
ret.x20_hardMode = stream.ReadEncoded(1); ret.x20_hardMode = stream.ReadEncoded(1);