From 70ea342ac164cbac20430fd19b9b5189c341fccc Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Wed, 24 Nov 2004 00:00:56 +0000
Subject: [PATCH] Move: Utility from ActorUtil to ScreenNetBase

---
 stepmania/src/ActorUtil.cpp           | 8 --------
 stepmania/src/ActorUtil.h             | 3 ---
 stepmania/src/ScreenNetSelectBase.cpp | 8 ++++++++
 stepmania/src/ScreenNetSelectBase.h   | 4 ++++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index 956ace6c79..3f779e02b0 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -322,14 +322,6 @@ void AutoActor::LoadAndSetName( const CString &sScreenName, const CString &sActo
 	m_pActor->SetName( sActorName );
 }
 
-void UtilSetQuadInit( Actor& actor, const CString &sClassName )
-{
-	UtilSetXYAndOnCommand( actor, sClassName );
-	actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.m_sName + "Color" ) );
-	actor.SetWidth( THEME->GetMetricF( sClassName, actor.m_sName + "Width" ) );
-	actor.SetHeight( THEME->GetMetricF( sClassName, actor.m_sName + "Height" ) );
-}
-
 /*
  * (c) 2003-2004 Chris Danford
  * All rights reserved.
diff --git a/stepmania/src/ActorUtil.h b/stepmania/src/ActorUtil.h
index 84964eb81b..5547ae968e 100644
--- a/stepmania/src/ActorUtil.h
+++ b/stepmania/src/ActorUtil.h
@@ -10,8 +10,6 @@
 #define OFF_COMMAND( actor )	UtilOffCommand( actor, m_sName )
 #define SET_XY_AND_ON_COMMAND( actor )		UtilSetXYAndOnCommand( actor, m_sName )
 #define COMMAND( actor, command_name )		UtilCommand( actor, m_sName, command_name )
-#define SET_QUAD_INIT( actor )	UtilSetQuadInit( actor, m_sName );
-
 
 void UtilSetXY( Actor& actor, const CString &sClassName );
 inline void UtilSetXY( Actor* pActor, const CString &sClassName ) { UtilSetXY( *pActor, sClassName ); }
@@ -26,7 +24,6 @@ inline void UtilSetXYAndOnCommand( Actor& actor, const CString &sClassName )
 	UtilSetXY( actor, sClassName );
 	UtilOnCommand( actor, sClassName );
 }
-void UtilSetQuadInit( Actor& actor, const CString &sClassName );
 
 /* convenience */
 inline void UtilCommand( Actor* pActor, const CString &sClassName, const CString &sCommandName ) { if(pActor) UtilCommand( *pActor, sClassName, sCommandName ); }
diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp
index f21f146d55..a4436c8482 100644
--- a/stepmania/src/ScreenNetSelectBase.cpp
+++ b/stepmania/src/ScreenNetSelectBase.cpp
@@ -257,6 +257,14 @@ void ScreenNetSelectBase::UpdateUsers()
 	}
 }
 
+void UtilSetQuadInit( Actor& actor, const CString &sClassName )
+{
+	UtilSetXYAndOnCommand( actor, sClassName );
+	actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.m_sName + "Color" ) );
+	actor.SetWidth( THEME->GetMetricF( sClassName, actor.m_sName + "Width" ) );
+	actor.SetHeight( THEME->GetMetricF( sClassName, actor.m_sName + "Height" ) );
+}
+
 #endif
 
 /*
diff --git a/stepmania/src/ScreenNetSelectBase.h b/stepmania/src/ScreenNetSelectBase.h
index b4d74d7800..c77865f684 100644
--- a/stepmania/src/ScreenNetSelectBase.h
+++ b/stepmania/src/ScreenNetSelectBase.h
@@ -36,6 +36,10 @@ private:
 	vector <BitmapText>	m_textUsers;
 };
 
+//Eventually we won't be using quads in this method.
+#define SET_QUAD_INIT( actor )	UtilSetQuadInit( actor, m_sName );
+void UtilSetQuadInit( Actor& actor, const CString &sClassName );
+
 #endif
 
 /*