From 07059f85e3fdd39d19e5e6d4067b40854cd3b485 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 27 Sep 2006 05:27:28 +0000 Subject: [PATCH] fix FOREACH_UsedGrade FOREACH_ENUM2 -> FOREACH_ENUM --- stepmania/src/EnumHelper.h | 5 +++-- stepmania/src/Grade.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/EnumHelper.h b/stepmania/src/EnumHelper.h index 489638d219..7709be29c5 100644 --- a/stepmania/src/EnumHelper.h +++ b/stepmania/src/EnumHelper.h @@ -41,8 +41,9 @@ static inline T enum_add2( T val, int iAmt ) return val; } -#define FOREACH_ENUM( e, max, var ) for( e var=(e)0; var( var, +1 ) ) -#define FOREACH_ENUM2( e, var ) for( e var=(e)0; var( var, +1 ) ) +#define FOREACH_ENUM_N( e, max, var ) for( e var=(e)0; var( var, +1 ) ) +#define FOREACH_ENUM( e, var ) for( e var=(e)0; var( var, +1 ) ) +#define FOREACH_ENUM2 FOREACH_ENUM int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType ); diff --git a/stepmania/src/Grade.h b/stepmania/src/Grade.h index 0aede287c8..93c5d0e46a 100644 --- a/stepmania/src/Grade.h +++ b/stepmania/src/Grade.h @@ -53,7 +53,7 @@ RString GradeToLocalizedString( Grade g ); Grade StringToGrade( const RString &s ); LuaDeclareType( Grade ); #define FOREACH_Grade( g ) FOREACH_ENUM2( Grade, g ) -#define FOREACH_UsedGrade( g ) FOREACH_ENUM( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g ) +#define FOREACH_UsedGrade( g ) FOREACH_ENUM_N( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g ) #endif