move ColToButtonName from Game to Style, to reduce GAMESTATE use

in Game

stepmania/src/Game.cpp

@@ -83,18 +83,6 @@ void Game::MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, GameInput
 	}
 }
 
-RString Game::ColToButtonName( int iCol ) const
-{
-	const Style *pStyle = GAMESTATE->GetCurrentStyle();
-	const char *pzColumnName = pStyle->m_ColumnInfo[PLAYER_1][iCol].pzName;
-	if( pzColumnName != NULL )
-		return pzColumnName;
-
-	GameInput GI = pStyle->StyleInputToGameInput( iCol, PLAYER_1 );
-
-	return m_szButtonNames[GI.button];
-}
-
 TapNoteScore Game::MapTapNoteScore( TapNoteScore tns ) const
 {
 	switch( tns )

stepmania/src/Game.h

@@ -51,7 +51,6 @@ public:
 	GameButton ButtonNameToIndex( const RString &sButtonName ) const;
 	MenuButton GameInputToMenuButton( GameInput GameI ) const;
 	void MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) const;	// looks up current style in GAMESTATE.  Yuck.
-	RString ColToButtonName( int col ) const;	// looks up current style.  Yuck.
 
 	TapNoteScore MapTapNoteScore( TapNoteScore tns ) const;
 	TapNoteScore	m_mapW1To;

stepmania/src/GhostArrowRow.cpp

@@ -25,7 +25,7 @@ void GhostArrowRow::Load( const PlayerState* pPlayerState, float fYReverseOffset
 	// init arrows
 	for( int c=0; c<pStyle->m_iColsPerPlayer; c++ ) 
 	{
-		const RString &sButton = GAMESTATE->GetCurrentGame()->ColToButtonName( c );
+		const RString &sButton = GAMESTATE->GetCurrentStyle()->ColToButtonName( c );
 
 		m_bHoldIsActive.push_back( false );
 		m_bHoldWasActive.push_back( false );

stepmania/src/NoteDisplay.cpp

@@ -6,7 +6,7 @@
 #include "RageLog.h"
 #include "RageDisplay.h"
 #include "ActorUtil.h"
-#include "Game.h"
+#include "Style.h"
 #include "PlayerState.h"
 #include "Sprite.h"
 #include "NoteTypes.h"
@@ -259,7 +259,7 @@ void NoteDisplay::Load( int iColNum, const PlayerState* pPlayerState, float fYRe
 	m_pPlayerState = pPlayerState;
 	m_fYReverseOffsetPixels = fYReverseOffsetPixels;
 
-	const RString &sButton = GAMESTATE->GetCurrentGame()->ColToButtonName( iColNum );
+	const RString &sButton = GAMESTATE->GetCurrentStyle()->ColToButtonName( iColNum );
 
 	cache->Load( sButton );
 

stepmania/src/ScreenGameplay.cpp

@@ -2025,8 +2025,8 @@ void ScreenGameplay::SendCrossedMessages()
 					// Send col-specific crossed
 					if( i == 0 )
 					{
-						const Game* pGame = GAMESTATE->GetCurrentGame();
+						const Style *pStyle = GAMESTATE->GetCurrentStyle();
-						RString sButton = pGame->ColToButtonName( t );
+						RString sButton = pStyle->ColToButtonName( t );
 						RString sMessageName = "NoteCrossed" + sButton;
 						MESSAGEMAN->Broadcast( sMessageName );
 					}

stepmania/src/Style.cpp

@@ -95,6 +95,18 @@ void Style::GetMinAndMaxColX( PlayerNumber pn, float& fMixXOut, float& fMaxXOut
 	}
 }
 
+RString Style::ColToButtonName( int iCol ) const
+{
+	const char *pzColumnName = m_ColumnInfo[PLAYER_1][iCol].pzName;
+	if( pzColumnName != NULL )
+		return pzColumnName;
+
+	GameInput GI = StyleInputToGameInput( iCol, PLAYER_1 );
+
+	const Game *pGame = GAMESTATE->GetCurrentGame();
+	return pGame->m_szButtonNames[GI.button];
+}
+
 // Lua bindings
 #include "LuaBinding.h"
 

stepmania/src/Style.h

@@ -55,6 +55,7 @@ public:
 
 	GameInput StyleInputToGameInput( int iCol, PlayerNumber pn ) const;
 	int GameInputToColumn( const GameInput &GameI ) const;
+	RString ColToButtonName( int iCol ) const;
 
 	PlayerNumber ControllerToPlayerNumber( GameController controller ) const;