2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 17:07:41 +00:00

Windows compile fixes, and warning squash

This commit is contained in:
2016-07-23 23:05:12 -07:00
parent 4b10697a5a
commit 76b88d0ad6
11 changed files with 48 additions and 18 deletions

View File

@@ -27,6 +27,7 @@ void CGameArea::CAreaFog::SetFogExplicit(ERglFogMode, const zeus::CColor& color,
bool CGameArea::CAreaFog::IsFogDisabled() const
{
return true;
}
void CGameArea::CAreaFog::DisableFog()
@@ -45,49 +46,58 @@ CDummyGameArea::CDummyGameArea(CInputStream& in, int idx, int mlvlVersion)
u32 attachAreaCount = in.readUint32Big();
x44_attachedAreaIndices.reserve(attachAreaCount);
for (int i=0 ; i<attachAreaCount ; ++i)
for (u32 i=0 ; i<attachAreaCount ; ++i)
x44_attachedAreaIndices.push_back(in.readUint16Big());
u32 depCount = in.readUint32Big();
for (int i=0 ; i<depCount ; ++i)
for (u32 i=0 ; i<depCount ; ++i)
in.readUint32Big();
u32 dockCount = in.readUint32Big();
x54_docks.reserve(dockCount);
for (int i=0 ; i<dockCount ; ++i)
for (u32 i=0 ; i<dockCount ; ++i)
x54_docks.emplace_back(in, x14_transform);
}
bool CDummyGameArea::IGetScriptingMemoryAlways() const
{
return false;
}
TAreaId CDummyGameArea::IGetAreaId() const
{
return 0;
}
ResId CDummyGameArea::IGetAreaAssetId() const
{
return 0;
}
bool CDummyGameArea::IIsActive() const
{
return false;
}
TAreaId CDummyGameArea::IGetAttachedAreaId(int) const
{
return 0;
}
u32 CDummyGameArea::IGetNumAttachedAreas() const
{
return 0;
}
ResId CDummyGameArea::IGetStringTableAssetId() const
{
return 0;
}
static zeus::CTransform identityXf(zeus::CMatrix3f::skIdentityMatrix3f);
const zeus::CTransform& CDummyGameArea::IGetTM() const
{
return identityXf;
}
static std::vector<SObjectTag> ReadDependencyList(CInputStream& in)
@@ -95,7 +105,7 @@ static std::vector<SObjectTag> ReadDependencyList(CInputStream& in)
std::vector<SObjectTag> ret;
u32 count = in.readUint32Big();
ret.reserve(count);
for (int i=0 ; i<count ; ++i)
for (u32 i=0 ; i<count ; ++i)
{
ret.emplace_back();
ret.back().readMLVL(in);
@@ -119,7 +129,7 @@ CGameArea::CGameArea(CInputStream& in, int idx, int mlvlVersion)
u32 attachedCount = in.readUint32Big();
x8c_attachedAreaIndices.reserve(attachedCount);
for (int i=0 ; i<attachedCount ; ++i)
for (u32 i=0 ; i<attachedCount ; ++i)
x8c_attachedAreaIndices.push_back(in.readUint16Big());
x9c_deps1 = ::urde::ReadDependencyList(in);
@@ -129,42 +139,52 @@ CGameArea::CGameArea(CInputStream& in, int idx, int mlvlVersion)
bool CGameArea::IGetScriptingMemoryAlways() const
{
return false;
}
TAreaId CGameArea::IGetAreaId() const
{
return 0;
}
ResId CGameArea::IGetAreaAssetId() const
{
return 0;
}
bool CGameArea::IIsActive() const
{
return false;
}
TAreaId CGameArea::IGetAttachedAreaId(int) const
{
return 0;
}
u32 CGameArea::IGetNumAttachedAreas() const
{
return 0;
}
ResId CGameArea::IGetStringTableAssetId() const
{
return 0;
}
const zeus::CTransform& CGameArea::IGetTM() const
{
return identityXf;
}
bool CGameArea::DoesAreaNeedEnvFx() const
{
return false;
}
bool CGameArea::DoesAreaNeedSkyNow() const
{
return false;
}
void CGameArea::UpdateFog(float dt)
@@ -173,6 +193,7 @@ void CGameArea::UpdateFog(float dt)
bool CGameArea::OtherAreaOcclusionChanged()
{
return false;
}
void CGameArea::PingOcclusionState()
@@ -238,6 +259,7 @@ void CGameArea::StartStreamingMainArea()
u32 CGameArea::GetNumPartSizes() const
{
return 0;
}
void CGameArea::AllocNewAreaData(int, int)
@@ -258,6 +280,7 @@ void CGameArea::StartStreamIn(CStateManager& mgr)
bool CGameArea::Validate(CStateManager& mgr)
{
return false;
}
void CGameArea::PostConstructArea()
@@ -278,10 +301,12 @@ void CGameArea::ClearTokenList()
u32 CGameArea::GetPreConstructedSize() const
{
return 0;
}
bool CGameArea::VerifyHeader() const
{
return false;
}
}