actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

MenuButton -> GameButton

Browse Source
This commit is contained in:
Glenn Maynard
2007-01-13 03:44:16 +00:00
parent 077f7a7f35
commit 434e603026
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/InputEventPlus.h
+2 -2
View File
@@ -13,13 +13,13 @@ class InputEventPlus
public: public:
InputEventPlus(): InputEventPlus():
type(IET_FIRST_PRESS), type(IET_FIRST_PRESS),
MenuI(MenuButton_Invalid), MenuI(GameButton_Invalid),
pn(PLAYER_INVALID), pn(PLAYER_INVALID),
mp(MultiPlayer_Invalid) { } mp(MultiPlayer_Invalid) { }
DeviceInput DeviceI; DeviceInput DeviceI;
GameInput GameI; GameInput GameI;
InputEventType type; InputEventType type;
MenuButton MenuI; GameButton MenuI;
PlayerNumber pn; PlayerNumber pn;
MultiPlayer mp; MultiPlayer mp;
DeviceInputList InputList; DeviceInputList InputList;
stepmania/src/ScreenEdit.h
+4 -4
View File
@@ -152,15 +152,15 @@ struct MapEditToDI
} }
}; };
// Like MapEditToDI, but maps MenuButton instead of DeviceInput. // Like MapEditToDI, but maps GameButton instead of DeviceInput.
struct MapEditButtonToMenuButton struct MapEditButtonToMenuButton
{ {
MenuButton button[NUM_EditButton][NUM_EDIT_TO_MENU_SLOTS]; GameButton button[NUM_EditButton][NUM_EDIT_TO_MENU_SLOTS];
void Clear() void Clear()
{ {
FOREACH_EditButton(e) FOREACH_EditButton(e)
for( int slot = 0; slot < NUM_EDIT_TO_MENU_SLOTS; ++slot ) for( int slot = 0; slot < NUM_EDIT_TO_MENU_SLOTS; ++slot )
button[e][slot] = MenuButton_Invalid; button[e][slot] = GameButton_Invalid;
} }
}; };
@@ -465,7 +465,7 @@ public:
void InitEditMappings(); void InitEditMappings();
EditButton DeviceToEdit( const DeviceInput &DeviceI ) const; EditButton DeviceToEdit( const DeviceInput &DeviceI ) const;
EditButton MenuButtonToEditButton( MenuButton MenuI ) const; EditButton MenuButtonToEditButton( GameButton MenuI ) const;
bool EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) const; bool EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) const;
bool EditPressed( EditButton button, const DeviceInput &DeviceI ); bool EditPressed( EditButton button, const DeviceInput &DeviceI );
bool EditIsBeingPressed( EditButton button ) const; bool EditIsBeingPressed( EditButton button ) const;
stepmania/src/ScreenMapControllers.cpp
+1 -1
View File
@@ -102,7 +102,7 @@ void ScreenMapControllers::Init()
BitmapText *pSecondary = new BitmapText; BitmapText *pSecondary = new BitmapText;
pSecondary->SetName( "Secondary" ); pSecondary->SetName( "Secondary" );
pSecondary->LoadFromFont( THEME->GetPathF("Common","title") ); pSecondary->LoadFromFont( THEME->GetPathF("Common","title") );
MenuButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( pKey->m_GameButton ); GameButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( pKey->m_GameButton );
RString sText; RString sText;
if( mb != MenuButton_Invalid ) if( mb != MenuButton_Invalid )
sText = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb ); sText = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb );
stepmania/src/ScreenNameEntry.cpp
+1 -1
View File
@@ -278,7 +278,7 @@ void ScreenNameEntry::Init()
/* Find out if this column is associated with the START menu button. */ /* Find out if this column is associated with the START menu button. */
GameInput gi = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( iCol, p ); GameInput gi = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( iCol, p );
MenuButton mb = INPUTMAPPER->GameButtonToMenuButton( gi.button ); GameButton mb = INPUTMAPPER->GameButtonToMenuButton( gi.button );
if( mb == MENU_BUTTON_START ) if( mb == MENU_BUTTON_START )
continue; continue;
m_ColToStringIndex[p][iCol] = CurrentStringIndex++; m_ColToStringIndex[p][iCol] = CurrentStringIndex++;
stepmania/src/ScreenSelectMaster.h
+1 -1
View File
@@ -101,7 +101,7 @@ protected:
int m_iChoice[NUM_PLAYERS]; int m_iChoice[NUM_PLAYERS];
bool m_bChosen[NUM_PLAYERS]; bool m_bChosen[NUM_PLAYERS];
MenuButton m_TrackingRepeatingInput; GameButton m_TrackingRepeatingInput;
}; };
stepmania/src/ScreenTestInput.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ class InputList: public BitmapText
if( !PREFSMAN->m_bOnlyDedicatedMenuButtons ) if( !PREFSMAN->m_bOnlyDedicatedMenuButtons )
{ {
MenuButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( gi.button ); GameButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( gi.button );
if( mb != MenuButton_Invalid ) if( mb != MenuButton_Invalid )
{ {
RString sGameButtonString = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb ); RString sGameButtonString = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb );