From 71861bd6007e3f9c1d1ca4e77f54f96d689f5002 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 9 Jan 2005 01:43:58 +0000
Subject: [PATCH] PrefsManager should not depend on ThemeManager

---
 stepmania/src/GameConstantsAndTypes.cpp | 5 +++++
 stepmania/src/PrefsManager.cpp          | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 61f745e4ee..4f7169bf8c 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -5,6 +5,7 @@
 #include "ThemeManager.h"
 #include "EnumHelper.h"
 #include "Foreach.h"
+#include "PrefsManager.h"
 
 
 static const CString RadarCategoryNames[NUM_RADAR_CATEGORIES] = {
@@ -235,6 +236,10 @@ static const CString StyleTypeNames[NUM_STYLE_TYPES] = {
 XToString( StyleType );
 StringToX( StyleType );
 
+#include "LuaFunctions.h"
+LuaFunction_NoArgs( CoinMode,   CoinModeToString(PREFSMAN->m_CoinMode) )
+LuaFunction_NoArgs( Premium,    PremiumToString(PREFSMAN->m_Premium) )
+
 /*
  * (c) 2001-2004 Chris Danford
  * All rights reserved.
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 2d3501ecb7..f75d8e0f13 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -8,7 +8,6 @@
 #include "RageSoundReader_Resample.h" /* for ResampleQuality */
 #include "RageFile.h"
 #include "ProductInfo.h"
-#include "GameConstantsAndTypes.h"
 #include "Foreach.h"
 #include "Preference.h"
 
@@ -848,11 +847,6 @@ Premium	PrefsManager::GetPremium()
 }
 
 
-#include "LuaFunctions.h"
-LuaFunction_NoArgs( CoinMode,	CoinModeToString(PREFSMAN->m_CoinMode) )
-LuaFunction_NoArgs( Premium,	PremiumToString(PREFSMAN->m_Premium) )
-
-
 /*
  * (c) 2001-2004 Chris Danford, Chris Gomez
  * All rights reserved.