From 83b856dce80ef0dbf50e433e9f2364107fe26a55 Mon Sep 17 00:00:00 2001 From: hispidence Date: Sat, 29 Jan 2022 01:31:13 +0000 Subject: [PATCH] Change headers, move a global. --- Scripting/include/Scripting/GameFlowScript.h | 1 - Scripting/include/Scripting/ScriptInterfaceFlow.h | 1 + TR5Main/Game/Lara/lara_helpers.cpp | 2 +- TR5Main/Game/Lara/lara_jump.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripting/include/Scripting/GameFlowScript.h b/Scripting/include/Scripting/GameFlowScript.h index fac7aae44..dbf9f1894 100644 --- a/Scripting/include/Scripting/GameFlowScript.h +++ b/Scripting/include/Scripting/GameFlowScript.h @@ -64,5 +64,4 @@ public: bool DoGameflow() override; }; -extern ScriptInterfaceFlow* g_GameFlow; extern ScriptInterfaceGame* g_GameScript; diff --git a/Scripting/include/Scripting/ScriptInterfaceFlow.h b/Scripting/include/Scripting/ScriptInterfaceFlow.h index c190071d9..968e9049c 100644 --- a/Scripting/include/Scripting/ScriptInterfaceFlow.h +++ b/Scripting/include/Scripting/ScriptInterfaceFlow.h @@ -35,3 +35,4 @@ public: virtual bool DoGameflow() = 0; }; +extern ScriptInterfaceFlow* g_GameFlow; diff --git a/TR5Main/Game/Lara/lara_helpers.cpp b/TR5Main/Game/Lara/lara_helpers.cpp index 3990a2a5d..760fbf34c 100644 --- a/TR5Main/Game/Lara/lara_helpers.cpp +++ b/TR5Main/Game/Lara/lara_helpers.cpp @@ -7,7 +7,7 @@ #include "Game/Lara/lara.h" #include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_collide.h" -#include "Scripting/GameFlowScript.h" +#include "Scripting/ScriptInterfaceFlow.h" #include "Specific/input.h" #include "Specific/level.h" #include "Specific/setup.h" diff --git a/TR5Main/Game/Lara/lara_jump.cpp b/TR5Main/Game/Lara/lara_jump.cpp index 19e49183f..e60bd3f66 100644 --- a/TR5Main/Game/Lara/lara_jump.cpp +++ b/TR5Main/Game/Lara/lara_jump.cpp @@ -9,7 +9,7 @@ #include "Game/Lara/lara_helpers.h" #include "Game/Lara/lara_basic.h" #include "Game/Lara/lara_slide.h" -#include "Scripting/GameFlowScript.h" +#include "Scripting/ScriptInterfaceFlow.h" #include "Sound/sound.h" #include "Specific/input.h" #include "Specific/level.h"