From 9ea9f02591f00b47b12c9d4fdf67b0ba39158448 Mon Sep 17 00:00:00 2001 From: Dextinfire <> Date: Sat, 14 Sep 2024 06:56:18 -0700 Subject: [PATCH] Remove the inlining so functions can actually be used --- src/games/cc/titlemenu.cpp | 6 +++--- src/games/cclcc/titlemenu.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/games/cc/titlemenu.cpp b/src/games/cc/titlemenu.cpp index df22f8a0..48ebe5ec 100644 --- a/src/games/cc/titlemenu.cpp +++ b/src/games/cc/titlemenu.cpp @@ -317,7 +317,7 @@ void TitleMenu::Render() { } } -inline void TitleMenu::DrawMainBackground(float opacity) { +void TitleMenu::DrawMainBackground(float opacity) { glm::vec4 col = glm::vec4(1.0f); col.a = opacity; Renderer->DrawSprite(BackgroundSprite, glm::vec2(BackgroundX, BackgroundY), @@ -327,14 +327,14 @@ inline void TitleMenu::DrawMainBackground(float opacity) { col); } -inline void TitleMenu::DrawStartButton() { +void TitleMenu::DrawStartButton() { glm::vec4 col = glm::vec4(1.0f); col.a = glm::smoothstep(0.0f, 1.0f, PressToStartAnimation.Progress); Renderer->DrawSprite(PressToStartSprite, glm::vec2(PressToStartX, PressToStartY), col); } -inline void TitleMenu::DrawSmoke(float opacity) { +void TitleMenu::DrawSmoke(float opacity) { glm::vec4 col = glm::vec4(1.0f); col.a = opacity; SmokeSprite.Bounds = RectF( diff --git a/src/games/cclcc/titlemenu.cpp b/src/games/cclcc/titlemenu.cpp index 902b269e..fb8fbfde 100644 --- a/src/games/cclcc/titlemenu.cpp +++ b/src/games/cclcc/titlemenu.cpp @@ -327,7 +327,7 @@ void TitleMenu::Render() { } } -inline void TitleMenu::DrawMainBackground(float opacity) { +void TitleMenu::DrawMainBackground(float opacity) { Renderer->DrawSprite(BackgroundSprite, glm::vec2(0.0f)); Renderer->DrawSprite( OverlaySprite, @@ -335,14 +335,14 @@ inline void TitleMenu::DrawMainBackground(float opacity) { glm::vec4(1.0f)); } -inline void TitleMenu::DrawStartButton() { +void TitleMenu::DrawStartButton() { glm::vec4 col = glm::vec4(1.0f); col.a = glm::smoothstep(0.0f, 1.0f, PressToStartAnimation.Progress); Renderer->DrawSprite(PressToStartSprite, glm::vec2(PressToStartX, PressToStartY), col); } -inline void TitleMenu::DrawMainMenuBackGraphics(bool isTransition) { +void TitleMenu::DrawMainMenuBackGraphics(bool isTransition) { Renderer->DrawSprite(MainBackgroundSprite, glm::vec2(0.0f)); if (!isTransition) { Renderer->DrawSprite(MenuSprite, glm::vec2(MenuX, MenuY)); @@ -353,7 +353,7 @@ inline void TitleMenu::DrawMainMenuBackGraphics(bool isTransition) { glm::vec4(1.0f)); } -inline void TitleMenu::DrawSmoke(float opacity) { +void TitleMenu::DrawSmoke(float opacity) { glm::vec4 col = glm::vec4(1.0f); col.a = opacity; SmokeSprite.Bounds = RectF(