From 2ed1154dfb04e33d7cbb0ae841963278c9f4393d Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 26 Sep 2006 07:33:26 +0000
Subject: [PATCH] update bindings

---
 stepmania/src/GameConstantsAndTypes.cpp | 37 ++++++-------------------
 stepmania/src/GameConstantsAndTypes.h   |  8 ++++--
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 1766918022..7a8d7c5631 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -118,21 +118,12 @@ REGISTER_WITH_LUA_FUNCTION( LuaCoinMode );
 
 
 static const char *PremiumNames[] = {
-	"none",
-	"double",
-	"joint",
+	"None",
+	"Double",
+	"Joint",
 };
-XToString( Premium, NUM_PREMIUMS );
-static void LuaPremium(lua_State* L)
-{
-	FOREACH_Premium( i )
-	{
-		RString s = PremiumNames[i];
-		s.MakeUpper();
-		LUA->SetGlobal( "PREMIUM_"+s, i );
-	}
-}
-REGISTER_WITH_LUA_FUNCTION( LuaPremium );
+XToString( Premium, NUM_Premium );
+LuaXType( Premium );
 
 
 static const char *SortOrderNames[] = {
@@ -286,13 +277,8 @@ static const char *PerDifficultyAwardNames[] = {
 XToString( PerDifficultyAward, NUM_PerDifficultyAward );
 XToLocalizedString( PerDifficultyAward );
 StringToX( PerDifficultyAward );
-LuaFunction( PerDifficultyAwardToLocalizedString, PerDifficultyAwardToLocalizedString((PerDifficultyAward) IArg(1)) );
-static void LuaPerDifficultyAward( lua_State* L )
-{
-	FOREACH_PerDifficultyAward( i )
-		LUA->SetGlobal( PerDifficultyAwardNames[i], i );
-}
-REGISTER_WITH_LUA_FUNCTION( LuaPerDifficultyAward );
+LuaFunction( PerDifficultyAwardToLocalizedString, PerDifficultyAwardToLocalizedString(Enum::Check<PerDifficultyAward>(L, 1)) );
+LuaXType( PerDifficultyAward );
 
 // Numbers are intentially not at the front of these strings so that the 
 // strings can be used as XML entity names.
@@ -313,13 +299,8 @@ static const char *PeakComboAwardNames[] = {
 XToString( PeakComboAward, NUM_PeakComboAward );
 XToLocalizedString( PeakComboAward );
 StringToX( PeakComboAward );
-LuaFunction( PeakComboAwardToLocalizedString, PeakComboAwardToLocalizedString((PeakComboAward) IArg(1)) );
-static void LuaPeakComboAward( lua_State* L )
-{
-	FOREACH_PeakComboAward( i )
-		LUA->SetGlobal( PeakComboAwardNames[i], i );
-}
-REGISTER_WITH_LUA_FUNCTION( LuaPeakComboAward );
+LuaFunction( PeakComboAwardToLocalizedString, PeakComboAwardToLocalizedString(Enum::Check<PeakComboAward>(L, 1)) );
+LuaXType( PeakComboAward );
 
 
 void DisplayBpms::Add( float f )
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index 91498425b0..9618d32942 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -314,10 +314,12 @@ enum Premium
 	PREMIUM_NONE,
 	PREMIUM_DOUBLE,
 	PREMIUM_JOINT,
-	NUM_PREMIUMS
+	NUM_Premium,
+	Premium_Invalidz
 };
-#define FOREACH_Premium( i ) FOREACH_ENUM( Premium, NUM_PREMIUMS, i )
+#define FOREACH_Premium( i ) FOREACH_ENUM( Premium, NUM_Premium, i )
 const RString& PremiumToString( Premium p );
+LuaDeclareType( Premium );
 
 
 //
@@ -343,6 +345,7 @@ enum PerDifficultyAward
 const RString& PerDifficultyAwardToString( PerDifficultyAward pma );
 const RString& PerDifficultyAwardToLocalizedString( PerDifficultyAward pma );
 PerDifficultyAward StringToPerDifficultyAward( const RString& pma );
+LuaDeclareType( PerDifficultyAward );
 
 
 enum PeakComboAward 
@@ -364,6 +367,7 @@ enum PeakComboAward
 const RString& PeakComboAwardToString( PeakComboAward pma );
 const RString& PeakComboAwardToLocalizedString( PeakComboAward pma );
 PeakComboAward StringToPeakComboAward( const RString& pma );
+LuaDeclareType( PeakComboAward );
 
 
 struct DisplayBpms