PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-09 13:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor correction to CInputStream::Get

Browse Source
This commit is contained in:
Phillip Stephens
2022-07-30 17:38:13 -07:00
parent 2f39c70005
commit 7cd80cf53b
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Kyoto/Text/CStringTable.cpp
View File

@@ -11,11 +11,11 @@ static const wchar_t skInvalidString[] = L"Invalid";
CStringTable::CStringTable(CInputStream& in) : x0_stringCount(0), x4_data(NULL) {
in.ReadLong();
in.ReadLong();
size_t langCount = in.Get< size_t >();
x0_stringCount = in.Get< u32 >();
size_t langCount = in.Get(TType< size_t >());
x0_stringCount = in.Get(TType< u32 >());
rstl::vector< rstl::pair< FourCC, u32 > > langOffsets(langCount);
for (size_t i = 0; i < langCount; ++i) {
langOffsets.push_back(in.Get< rstl::pair< FourCC, u32 > >());
langOffsets.push_back(in.Get(TType< rstl::pair< FourCC, u32 > >()));
}
size_t offset = langOffsets.front().second;
@@ -29,7 +29,7 @@ CStringTable::CStringTable(CInputStream& in) : x0_stringCount(0), x4_data(NULL)
in.ReadChar();
}
u32 dataLen = in.Get< u32 >();
u32 dataLen = in.Get(TType< u32 >());
x4_data = new u8[dataLen];
in.ReadBytes(x4_data.get(), dataLen);
}

2
src/MetroidPrime/HUD/CHUDMemoParms.cpp
View File

@@ -2,4 +2,4 @@
#include "Kyoto/Streams/CInputStream.hpp"
CHUDMemoParms::CHUDMemoParms(CInputStream& in)
: mDispTime(in.ReadFloat()), mClearMemoWindow(in.ReadBool()), mFadeOutOnly(false), mHintMemo(false) {}
: mDispTime(in.Get(TType<float>())), mClearMemoWindow(in.ReadBool()), mFadeOutOnly(false), mHintMemo(false) {}