From e501a5a9cdc7ddaaf96abcf43c6ade672a16e3a9 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 29 Sep 2006 10:04:36 +0000
Subject: [PATCH] move color() into RageTypes

---
 stepmania/src/LuaManager.cpp | 11 -----------
 stepmania/src/RageTypes.cpp  | 10 ++++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp
index 5165b0ebc0..fcce689abd 100644
--- a/stepmania/src/LuaManager.cpp
+++ b/stepmania/src/LuaManager.cpp
@@ -703,17 +703,6 @@ LuaFunction( scale, scale(FArg(1), FArg(2), FArg(3), FArg(4), FArg(5)) );
 
 LuaFunction( clamp, clamp(FArg(1), FArg(2), FArg(3)) );
 
-#include "RageTypes.h"
-int LuaFunc_color( lua_State *L )
-{
-	RString sColor = SArg(1);
-	RageColor c;
-	c.FromString( sColor );
-	c.PushTable( L );
-	return 1;
-}
-static LuaFunctionList g_color( "color", LuaFunc_color ); /* register it */
-
 /*
  * (c) 2004-2006 Glenn Maynard, Steve Checkoway
  * All rights reserved.
diff --git a/stepmania/src/RageTypes.cpp b/stepmania/src/RageTypes.cpp
index 7482615e25..f8c5a38fd8 100644
--- a/stepmania/src/RageTypes.cpp
+++ b/stepmania/src/RageTypes.cpp
@@ -72,6 +72,16 @@ static const char *ZTestModeNames[] =
 XToString2( ZTestMode );
 LuaXType( ZTestMode );
 
+int LuaFunc_color( lua_State *L )
+{
+	RString sColor = SArg(1);
+	RageColor c;
+	c.FromString( sColor );
+	c.PushTable( L );
+	return 1;
+}
+static LuaFunctionList g_color( "color", LuaFunc_color ); /* register it */
+
 /*
  * Copyright (c) 2006 Glenn Maynard
  * All rights reserved.