From 9501cb22e5ed7a6dbcb6372a4cca1c83346a9283 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 26 Sep 2006 19:50:53 +0000
Subject: [PATCH] standard enum convention

---
 stepmania/src/Actor.cpp | 28 ++++++++++++++--------------
 stepmania/src/Actor.h   | 26 ++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index f40b895d10..b1e355eac5 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -57,8 +57,8 @@ void Actor::InitState()
 	m_start.Init();
 	m_current.Init();
 
-	m_HorizAlign = align_center;
-	m_VertAlign = align_middle;
+	m_HorizAlign = HorizAlign_Center;
+	m_VertAlign = VertAlign_Middle;
 
 	m_Effect =  no_effect;
 	m_fSecsIntoEffect = 0;
@@ -814,16 +814,16 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
 
 	switch( m_HorizAlign )
 	{
-	case align_left: SetX( rect.left ); break;
-	case align_center: SetX( rect.left + rect_width/2 ); break;
-	case align_right: SetX( rect.left + rect_width ); break;
+	case HorizAlign_Left: SetX( rect.left ); break;
+	case HorizAlign_Center: SetX( rect.left + rect_width/2 ); break;
+	case HorizAlign_Right: SetX( rect.left + rect_width ); break;
 	}
 
 	switch( m_VertAlign )
 	{
-	case align_top: SetY( rect.top ); break;
-	case align_middle: SetY( rect.top + rect_height/2 ); break;
-	case align_bottom: SetY( rect.top + rect_height ); break;
+	case VertAlign_Top: SetY( rect.top ); break;
+	case VertAlign_Middle: SetY( rect.top + rect_height/2 ); break;
+	case VertAlign_Bottom: SetY( rect.top + rect_height ); break;
 	}
 
 	SetZoom( fNewZoom );
@@ -831,17 +831,17 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
 
 void Actor::SetHorizAlignString( const RString &s )
 {
-	if     (s.EqualsNoCase("left"))		this->SetHorizAlign( align_left ); /* call derived */
-	else if(s.EqualsNoCase("center"))	this->SetHorizAlign( align_center );
-	else if(s.EqualsNoCase("right"))	this->SetHorizAlign( align_right );
+	if     (s.EqualsNoCase("left"))		this->SetHorizAlign( HorizAlign_Left ); /* call derived */
+	else if(s.EqualsNoCase("center"))	this->SetHorizAlign( HorizAlign_Center );
+	else if(s.EqualsNoCase("right"))	this->SetHorizAlign( HorizAlign_Right );
 	else	ASSERT(0);
 }
 
 void Actor::SetVertAlignString( const RString &s )
 {
-	if     (s.EqualsNoCase("top"))		this->SetVertAlign( align_top ); /* call derived */
-	else if(s.EqualsNoCase("middle"))	this->SetVertAlign( align_middle );
-	else if(s.EqualsNoCase("bottom"))	this->SetVertAlign( align_bottom );
+	if     (s.EqualsNoCase("top"))		this->SetVertAlign( VertAlign_Top ); /* call derived */
+	else if(s.EqualsNoCase("middle"))	this->SetVertAlign( VertAlign_Middle );
+	else if(s.EqualsNoCase("bottom"))	this->SetVertAlign( VertAlign_Bottom );
 	else	ASSERT(0);
 }
 
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index 220b411003..00d6a85af5 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -22,6 +22,30 @@ typedef AutoPtrCopyOnWrite<LuaReference> apActorCommands;
 #define DRAW_ORDER_TRANSITIONS			+110
 #define DRAW_ORDER_AFTER_EVERYTHING		+200
 
+enum HorizAlign
+{
+	HorizAlign_Left,
+	HorizAlign_Center,
+	HorizAlign_Right,
+	NUM_HorizAlign,
+	HorizAlign_Invalid
+};
+
+enum VertAlign
+{
+	VertAlign_Top,
+	VertAlign_Middle,
+	VertAlign_Bottom,
+	NUM_VertAlign,
+	VertAlign_Invalid
+};
+#define align_left HorizAlign_Left
+#define align_center HorizAlign_Center
+#define align_right HorizAlign_Right
+#define align_top VertAlign_Top
+#define align_middle VertAlign_Middle
+#define align_bottom VertAlign_Bottom
+
 class Actor : public MessageSubscriber
 {
 public:
@@ -226,11 +250,9 @@ public:
 	//
 	// Alignment settings.  These need to be virtual for BitmapText
 	//
-	enum HorizAlign { align_left, align_center, align_right };
 	virtual void SetHorizAlign( HorizAlign ha ) { m_HorizAlign = ha; }
 	void SetHorizAlignString( const RString &s );	// convenience
 
-	enum VertAlign { align_top, align_middle, align_bottom };
 	virtual void SetVertAlign( VertAlign va ) { m_VertAlign = va; }
 	void SetVertAlignString( const RString &s );	// convenience