From e1bc16930a6096925d55570a4ad1f8b517341ed0 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 9 Apr 2005 11:29:18 +0000 Subject: [PATCH] Restore XToString with *_INVALID (Profile uses it). Trying a different fix. --- stepmania/src/EnumHelper.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stepmania/src/EnumHelper.h b/stepmania/src/EnumHelper.h index 11df78df40..47e4748f7f 100644 --- a/stepmania/src/EnumHelper.h +++ b/stepmania/src/EnumHelper.h @@ -35,10 +35,15 @@ static inline void enum_add( T &val, int iAmt ) #define FOREACH_ENUM( e, max, var ) for( e var=(e)0; var( var, +1 ) ) +static const CString EMPTY_STRING; + #define XToString(X, CNT) \ const CString& X##ToString( X x ) \ { \ - ASSERT(unsigned(x) < CNT); \ + if( x == CNT+1 ) \ + return EMPTY_STRING; \ + ASSERT( x < CNT ); \ + ASSERT( x < (int)ARRAYSIZE(X##Names) ); \ return X##Names[x]; \ }