From 0ae10fbc593a3ef3112c7873718f9ba2cb5f66b9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 10 Jun 2004 23:12:35 +0000 Subject: [PATCH] move MakeArchHooks into ArchHooks --- stepmania/src/arch/ArchHooks/ArchHooks.cpp | 3 +++ stepmania/src/arch/ArchHooks/ArchHooks.h | 2 ++ stepmania/src/arch/arch.cpp | 1 - stepmania/src/arch/arch.h | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.cpp b/stepmania/src/arch/ArchHooks/ArchHooks.cpp index 60f9508a63..c82f6586cb 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks.cpp @@ -3,6 +3,9 @@ ArchHooks *HOOKS = NULL; +#include "../arch_platform.h" +ArchHooks *MakeArchHooks() { return new ARCH_HOOKS; } + /* * (c) 2003-2004 Glenn Maynard, Chris Danford * All rights reserved. diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.h b/stepmania/src/arch/ArchHooks/ArchHooks.h index 6fa0b822c7..950b412e57 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks.h @@ -38,6 +38,8 @@ public: virtual void SetTime( tm newtime ) { } }; +ArchHooks *MakeArchHooks(); + #endif extern ArchHooks *HOOKS; // global and accessable from anywhere in our program diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp index 36eb91e3dd..21b0df9115 100644 --- a/stepmania/src/arch/arch.cpp +++ b/stepmania/src/arch/arch.cpp @@ -57,7 +57,6 @@ LoadingWindow *MakeLoadingWindow() return ret; } -ArchHooks *MakeArchHooks() { return new ARCH_HOOKS; } #if defined(SUPPORT_OPENGL) LowLevelWindow *MakeLowLevelWindow() { return new ARCH_LOW_LEVEL_WINDOW; } #endif diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h index 9b032dc9ff..9ff5eae4eb 100644 --- a/stepmania/src/arch/arch.h +++ b/stepmania/src/arch/arch.h @@ -11,7 +11,6 @@ class LightsDriver; class MemoryCardDriver; LoadingWindow *MakeLoadingWindow(); -ArchHooks *MakeArchHooks(); LowLevelWindow *MakeLowLevelWindow(); void MakeInputHandlers(vector &Add);