diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 7ca9b26cc1..06d07055bb 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -1273,6 +1273,8 @@ public: static int shadowlength( T* p, lua_State *L ) { p->SetShadowLength(FArg(1)); return 0; } static int horizalign( T* p, lua_State *L ) { p->SetHorizAlign(Enum::Check(L, 1)); return 0; } static int vertalign( T* p, lua_State *L ) { p->SetVertAlign(Enum::Check(L, 1)); return 0; } + static int halign( T* p, lua_State *L ) { p->SetHorizAlign(FArg(1)); return 0; } + static int valign( T* p, lua_State *L ) { p->SetVertAlign(FArg(1)); return 0; } static int diffuseblink( T* p, lua_State *L ) { p->SetEffectDiffuseBlink(); return 0; } static int diffuseshift( T* p, lua_State *L ) { p->SetEffectDiffuseShift(); return 0; } static int diffuseramp( T* p, lua_State *L ) { p->SetEffectDiffuseRamp(); return 0; } @@ -1466,6 +1468,8 @@ public: ADD_METHOD( shadowlength ); ADD_METHOD( horizalign ); ADD_METHOD( vertalign ); + ADD_METHOD( halign ); + ADD_METHOD( valign ); ADD_METHOD( diffuseblink ); ADD_METHOD( diffuseshift ); ADD_METHOD( diffuseramp ); diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index 5c784dd168..931d337ce7 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -251,8 +251,10 @@ public: // // Alignment settings. These need to be virtual for BitmapText // - virtual void SetHorizAlign( HorizAlign ha ) { m_fHorizAlign = (ha == HorizAlign_Left)? 0.0f: (ha == HorizAlign_Center)? 0.5f: +1.0f; } - virtual void SetVertAlign( VertAlign va ) { m_fVertAlign = (va == VertAlign_Top)? 0.0f: (va == VertAlign_Middle)? 0.5f: +1.0f; } + virtual void SetHorizAlign( float f ) { m_fHorizAlign = f; } + virtual void SetVertAlign( float f ) { m_fVertAlign = f; } + void SetHorizAlign( HorizAlign ha ) { SetHorizAlign( (ha == HorizAlign_Left)? 0.0f: (ha == HorizAlign_Center)? 0.5f: +1.0f ); } + void SetVertAlign( VertAlign va ) { SetVertAlign( (va == VertAlign_Top)? 0.0f: (va == VertAlign_Middle)? 0.5f: +1.0f ); } // diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 70e4540b84..b2eb7016ea 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -599,10 +599,10 @@ void BitmapText::DrawPrimitives() } /* Rebuild when these change. */ -void BitmapText::SetHorizAlign( HorizAlign ha ) +void BitmapText::SetHorizAlign( float f ) { float fHorizAlign = m_fHorizAlign; - Actor::SetHorizAlign(ha); + Actor::SetHorizAlign(f); if( fHorizAlign == m_fHorizAlign ) return; BuildChars(); diff --git a/stepmania/src/BitmapText.h b/stepmania/src/BitmapText.h index ff5382aeb8..53bb6d3fdc 100644 --- a/stepmania/src/BitmapText.h +++ b/stepmania/src/BitmapText.h @@ -34,7 +34,7 @@ public: void SetRainbowScroll( bool b ) { m_bRainbowScroll = b; } void SetJitter( bool b ) { m_bJitter = b; } - void SetHorizAlign( HorizAlign ha ); + void SetHorizAlign( float f ); void GetLines( vector &wTextLines ) { wTextLines = m_wTextLines; }