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

CScannableObjectInfo: Remove hardcoded capacity size 

We can just query the container for this.
This commit is contained in:
Lioncash 2020-04-12 21:45:08 -04:00
parent e91432ebf0
commit 8000fb9e42
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/CScannableObjectInfo.cpp
View File

@ -36,19 +36,21 @@ void CScannableObjectInfo::Load(CInputStream& in, u32 version) {
in.readUint32Big();
in.readUint32Big();
x4_stringId = in.readUint32Big();
if (version < 4)
if (version < 4) {
x8_totalDownloadTime = in.readFloatBig();
else {
u32 scanSpeed = in.readUint32Big();
} else {
const u32 scanSpeed = in.readUint32Big();
x8_totalDownloadTime = g_tweakGui->GetScanSpeed(scanSpeed);
}
xc_category = in.readUint32Big();
if (version > 4)
if (version > 4) {
x10_important = in.readBool();
}
for (u32 i = 0; i < 4; i++)
for (size_t i = 0; i < x14_buckets.capacity(); i++) {
x14_buckets.emplace_back(in, version);
}
}
CScannableObjectInfo::SBucket::SBucket(CInputStream& in, u32 version) {
x0_texture = in.readUint32Big();