AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 01:07:43 +00:00
Code Issues Projects Releases Wiki Activity

Silence warnings, and fix Windows build

Browse Source
This commit is contained in:
Phillip Stephens
2016-12-21 11:27:15 -08:00
parent c92223301c
commit 598f64002c
13 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/GuiSys/CGuiModel.cpp
View File

@@ -76,13 +76,13 @@ void CGuiModel::Draw(const CGuiWidgetDrawParms& parms) const
}
case EGuiModelDrawFlags::Alpha:
{
CModelFlags flags(4, 0, (xb7_24_depthWrite << 1) | xb6_31_depthTest, moduCol);
CModelFlags flags(4, 0, (u32(xb7_24_depthWrite) << 1) | u32(xb6_31_depthTest), moduCol);
model->Draw(flags);
break;
}
case EGuiModelDrawFlags::Additive:
{
CModelFlags flags(3, 0, (xb7_24_depthWrite << 1) | xb6_31_depthTest, moduCol);
CModelFlags flags(3, 0, (u32(xb7_24_depthWrite) << 1) | u32(xb6_31_depthTest), moduCol);
model->Draw(flags);
break;
}
@@ -93,7 +93,7 @@ void CGuiModel::Draw(const CGuiWidgetDrawParms& parms) const
flags.m_blendMode = 5;
flags.m_matSetIdx = 0;
flags.m_flags = (xb7_24_depthWrite << 1) | xb6_31_depthTest;
flags.m_flags = (u32(xb7_24_depthWrite) << 1) | u32(xb6_31_depthTest);
flags.color = moduCol;
model->Draw(flags);
break;