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

CIOWin: Make Draw() non-const

Browse Source 
Allows removing several const_cast usages within the codebase.
This commit is contained in:
Lioncash
2020-03-29 21:55:58 -04:00
parent 0d3bab4c14
commit 6dce70895c
17 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/MP1/CMFGame.cpp
View File

@@ -193,9 +193,10 @@ void CMFGame::Touch() {
player.GetMorphBall()->TouchModel(*x14_stateManager);
}
void CMFGame::Draw() const {
if (!x2a_24_initialized)
void CMFGame::Draw() {
if (!x2a_24_initialized) {
return;
}
SCOPED_GRAPHICS_DEBUG_GROUP("CMFGame::Draw", zeus::skGreen);
const_cast<CMFGame&>(*this).Touch();
@@ -210,8 +211,8 @@ void CMFGame::Draw() const {
x18_guiManager->Draw(*x14_stateManager);
if (x1c_flowState == EGameFlowState::CinematicSkip) {
float c = std::min(1.f, 1.f - x20_cineSkipTime);
const_cast<CColoredQuadFilter&>(m_fadeToBlack).draw(zeus::CColor{c, c, c, c});
const float c = std::min(1.f, 1.f - x20_cineSkipTime);
m_fadeToBlack.draw(zeus::CColor{c, c, c, c});
}
}
@@ -364,7 +365,7 @@ CIOWin::EMessageReturn CMFGameLoader::OnMessage(const CArchitectureMessage& msg,
return EMessageReturn::Exit;
}
void CMFGameLoader::Draw() const {
void CMFGameLoader::Draw() {
SCOPED_GRAPHICS_DEBUG_GROUP("CMFGameLoader::Draw", zeus::skGreen);
g_GameState->GetWorldTransitionManager()->Draw();
}