From 6d49da50ee222fffb725545f011b5a170ac353f1 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 20 May 2005 08:03:01 +0000
Subject: [PATCH] doubles -> double add Lua Premium constants

---
 stepmania/src/GameCommand.cpp              |  2 +-
 stepmania/src/GameConstantsAndTypes.cpp    | 12 +++++++++++-
 stepmania/src/GameConstantsAndTypes.h      |  4 ++--
 stepmania/src/ScreenOptionsMasterPrefs.cpp |  2 +-
 stepmania/src/ScreenSelectStyle.cpp        |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index b347735df8..74132299b3 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -434,7 +434,7 @@ int GetCreditsRequiredToPlayStyle( const Style *style )
 	case TWO_PLAYERS_TWO_SIDES:
 		return 2;
 	case ONE_PLAYER_TWO_SIDES:
-		return (GAMESTATE->GetPremium() == PREMIUM_DOUBLES) ? 1 : 2;
+		return (GAMESTATE->GetPremium() == PREMIUM_DOUBLE) ? 1 : 2;
 	default:
 		ASSERT(0);
 		return 1;
diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index c3608cab06..f18efcc247 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -112,10 +112,20 @@ REGISTER_WITH_LUA_FUNCTION( LuaCoinMode );
 
 static const CString PremiumNames[] = {
 	"none",
-	"doubles",
+	"double",
 	"joint",
 };
 XToString( Premium, NUM_PREMIUMS );
+static void LuaPremium(lua_State* L)
+{
+	FOREACH_Premium( i )
+	{
+		CString s = PremiumNames[i];
+		s.MakeUpper();
+		LUA->SetGlobal( "PREMIUM_"+s, i );
+	}
+}
+REGISTER_WITH_LUA_FUNCTION( LuaPremium );
 
 
 static const CString SortOrderNames[] = {
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index f8c59f7037..5d19c41d61 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -275,8 +275,8 @@ const CString& CoinModeToString( CoinMode cm );
 //
 // Premium
 //
-enum Premium { PREMIUM_NONE, PREMIUM_DOUBLES, PREMIUM_JOINT, NUM_PREMIUMS };
-
+enum Premium { PREMIUM_NONE, PREMIUM_DOUBLE, PREMIUM_JOINT, NUM_PREMIUMS };
+#define FOREACH_Premium( i ) FOREACH_ENUM( Premium, NUM_PREMIUMS, i )
 const CString& PremiumToString( Premium p );
 
 
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index 7f97def93b..60cfc2ec0e 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -340,7 +340,7 @@ static void CoinsPerCredit( int &sel, bool ToSel, const ConfOption *pConfOption
 
 static void PremiumM( int &sel, bool ToSel, const ConfOption *pConfOption )
 {
-	const Premium mapping[] = { PREMIUM_NONE, PREMIUM_DOUBLES, PREMIUM_JOINT };
+	const Premium mapping[] = { PREMIUM_NONE, PREMIUM_DOUBLE, PREMIUM_JOINT };
 	MoveMap( sel, PREFSMAN->m_Premium, ToSel, mapping, ARRAYSIZE(mapping) );
 }
 
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index 9e201aa6f2..def31971aa 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -107,7 +107,7 @@ void ScreenSelectStyle::Init()
 
 	switch( GAMESTATE->GetPremium() )
 	{
-	case PREMIUM_DOUBLES:
+	case PREMIUM_DOUBLE:
 		m_sprPremium.Load( THEME->GetPathG(m_sName,"doubles premium") );
 		this->AddChild( &m_sprPremium );
 		break;