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

CStateManager: Silence sign conversion and truncation warnings in LoadScriptObjects()

This commit is contained in:
Lioncash 2020-05-09 17:16:51 -04:00
parent f8670a2bdb
commit 439a55ed98
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Runtime/CStateManager.cpp
View File

@ -1308,18 +1308,24 @@ CStateManager::GetIdListForScript(TEditorId id) const {
void CStateManager::LoadScriptObjects(TAreaId aid, CInputStream& in, std::vector<TEditorId>& idsOut) {
in.readUByte();
int objCount = in.readUint32Big();
const u32 objCount = in.readUint32Big();
idsOut.reserve(idsOut.size() + objCount);
for (int i = 0; i < objCount; ++i) {
EScriptObjectType objType = EScriptObjectType(in.readUByte());
u32 objSize = in.readUint32Big();
u32 pos = in.position();
auto id = LoadScriptObject(aid, objType, objSize, in);
if (id.first == kInvalidEditorId)
for (u32 i = 0; i < objCount; ++i) {
const auto objType = static_cast<EScriptObjectType>(in.readUByte());
const u32 objSize = in.readUint32Big();
const u32 pos = static_cast<u32>(in.position());
const auto id = LoadScriptObject(aid, objType, objSize, in);
if (id.first == kInvalidEditorId) {
continue;
auto build = GetBuildForScript(id.first);
if (build.first)
}
const auto build = GetBuildForScript(id.first);
if (build.first) {
continue;
}
x8a4_loadedScriptObjects[id.first] = SScriptObjectStream{objType, pos, objSize};
idsOut.push_back(id.first);
}