More scrolling friendliness.

Fair warning: mass recompile of many files.

src/EnumHelper.h

@@ -15,7 +15,12 @@ extern "C"
 /** @brief A general foreach loop for enumerators. */
 #define FOREACH_ENUM( e, var )	for( e var=(e)0; var<NUM_##e; enum_add<e>( var, +1 ) )
 
-int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType, bool bAllowInvalid );
+int CheckEnum(lua_State *L,
+	      LuaReference &table,
+	      int iPos,
+	      int iInvalid,
+	      const char *szType,
+	      bool bAllowInvalid);
 
 template<typename T>
 struct EnumTraits
@@ -33,7 +38,12 @@ namespace Enum
 	template<typename T>
 	static T Check( lua_State *L, int iPos, bool bAllowInvalid = false )
 	{
-		return (T) CheckEnum( L, EnumTraits<T>::StringToEnum, iPos, EnumTraits<T>::Invalid, EnumTraits<T>::szName, bAllowInvalid );
+		return (T) CheckEnum(L,
+				     EnumTraits<T>::StringToEnum,
+				     iPos,
+				     EnumTraits<T>::Invalid,
+				     EnumTraits<T>::szName,
+				     bAllowInvalid);
 	}
 	template<typename T>
 	static void Push( lua_State *L, T iVal )
@@ -57,19 +67,19 @@ namespace Enum
 const RString &EnumToString( int iVal, int iMax, const char **szNameArray, auto_ptr<RString> *pNameCache ); // XToString helper
 
 #define XToString(X) \
-	const RString& X##ToString(X x); \
+const RString& X##ToString(X x); \
-	COMPILE_ASSERT( NUM_##X == ARRAYLEN(X##Names) ); \
+COMPILE_ASSERT( NUM_##X == ARRAYLEN(X##Names) ); \
-	const RString& X##ToString( X x ) \
+const RString& X##ToString( X x ) \
-	{	\
+{	\
 	static auto_ptr<RString> as_##X##Name[NUM_##X+2]; \
 	return EnumToString( x, NUM_##X, X##Names, as_##X##Name ); \
-	} \
+} \
-	namespace StringConversion { template<> RString ToString<X>( const X &value ) { return X##ToString(value); } }
+namespace StringConversion { template<> RString ToString<X>( const X &value ) { return X##ToString(value); } }
 
 #define XToLocalizedString(X)      \
-	const RString &X##ToLocalizedString(X x); \
+const RString &X##ToLocalizedString(X x); \
-	const RString &X##ToLocalizedString( X x ) \
+const RString &X##ToLocalizedString( X x ) \
-	{       \
+{       \
 	static auto_ptr<LocalizedString> g_##X##Name[NUM_##X]; \
 	if( g_##X##Name[0].get() == NULL ) { \
 		for( unsigned i = 0; i < NUM_##X; ++i ) \
@@ -79,18 +89,25 @@ const RString &EnumToString( int iVal, int iMax, const char **szNameArray, auto_
 		} \
 	} \
 	return g_##X##Name[x]->GetValue();  \
-	}
+}
 
 #define StringToX(X)	\
-	X StringTo##X(const RString&); \
+X StringTo##X(const RString&); \
-	X StringTo##X( const RString& s ) \
+X StringTo##X( const RString& s ) \
-	{	\
+{	\
 	for( unsigned i = 0; i < ARRAYLEN(X##Names); ++i )	\
 		if( !s.CompareNoCase(X##Names[i]) )	\
 			return (X)i;	\
 	return X##_Invalid;	\
+} \
+namespace StringConversion \
+{ \
+	template<> bool FromString<X>( const RString &sValue, X &out ) \
+	{ \
+		out = StringTo##X(sValue); \
+		return out != X##_Invalid; \
 	} \
-	namespace StringConversion { template<> bool FromString<X>( const RString &sValue, X &out ) { out = StringTo##X(sValue); return out != X##_Invalid; } }
+}
 
 // currently unused
 #define LuaDeclareType(X)
@@ -126,8 +143,21 @@ static void Lua##X(lua_State* L) \
 REGISTER_WITH_LUA_FUNCTION( Lua##X ); \
 template<> X EnumTraits<X>::Invalid = X##_Invalid; \
 template<> const char *EnumTraits<X>::szName = #X; \
-namespace LuaHelpers { template<> bool FromStack<X>( lua_State *L, X &Object, int iOffset ) { Object = Enum::Check<X>( L, iOffset, true ); return Object != EnumTraits<X>::Invalid; } } \
+namespace LuaHelpers \
-namespace LuaHelpers { template<> void Push<X>( lua_State *L, const X &Object ) { Enum::Push<X>( L, Object ); } }
+{ \
+	template<> bool FromStack<X>( lua_State *L, X &Object, int iOffset ) \
+	{ \
+		Object = Enum::Check<X>( L, iOffset, true ); \
+		return Object != EnumTraits<X>::Invalid; \
+	} \
+} \
+namespace LuaHelpers \
+{ \
+	template<> void Push<X>( lua_State *L, const X &Object ) \
+	{ \
+		Enum::Push<X>( L, Object ); \
+	} \
+}
 
 #endif