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

move MenuButton alias into GameButton.h

Browse Source
This commit is contained in:
Glenn Maynard
2007-01-13 03:34:32 +00:00
parent aee0ed627b
commit 077f7a7f35
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameInput.h
+11
View File
@@ -149,6 +149,17 @@ GameButton StringToGameButton( const InputScheme* pInputs, const RString& s );
#define LIGHTS_BUTTON_BASS_RIGHT GAME_BUTTON_CUSTOM_08 #define LIGHTS_BUTTON_BASS_RIGHT GAME_BUTTON_CUSTOM_08
#define NUM_LIGHTS_BUTTONS GAME_BUTTON_CUSTOM_09 #define NUM_LIGHTS_BUTTONS GAME_BUTTON_CUSTOM_09
typedef GameButton MenuButton;
#define MENU_BUTTON_LEFT GAME_BUTTON_MENULEFT
#define MENU_BUTTON_RIGHT GAME_BUTTON_MENURIGHT
#define MENU_BUTTON_UP GAME_BUTTON_MENUUP
#define MENU_BUTTON_DOWN GAME_BUTTON_MENUDOWN
#define MENU_BUTTON_START GAME_BUTTON_START
#define MENU_BUTTON_SELECT GAME_BUTTON_SELECT
#define MENU_BUTTON_BACK GAME_BUTTON_BACK
#define MENU_BUTTON_COIN GAME_BUTTON_COIN
#define MENU_BUTTON_OPERATOR GAME_BUTTON_OPERATOR
#define MenuButton_Invalid GameButton_Invalid
struct GameInput struct GameInput
{ {
stepmania/src/MenuInput.h
-13
View File
@@ -3,19 +3,6 @@
#ifndef MENU_INPUT_H #ifndef MENU_INPUT_H
#define MENU_INPUT_H #define MENU_INPUT_H
#include "GameInput.h"
typedef GameButton MenuButton;
#define MENU_BUTTON_LEFT GAME_BUTTON_MENULEFT
#define MENU_BUTTON_RIGHT GAME_BUTTON_MENURIGHT
#define MENU_BUTTON_UP GAME_BUTTON_MENUUP
#define MENU_BUTTON_DOWN GAME_BUTTON_MENUDOWN
#define MENU_BUTTON_START GAME_BUTTON_START
#define MENU_BUTTON_SELECT GAME_BUTTON_SELECT
#define MENU_BUTTON_BACK GAME_BUTTON_BACK
#define MENU_BUTTON_COIN GAME_BUTTON_COIN
#define MENU_BUTTON_OPERATOR GAME_BUTTON_OPERATOR
#define MenuButton_Invalid GameButton_Invalid
#endif #endif
/* /*
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include "Steps.h" #include "Steps.h"
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "PlayerState.h" #include "PlayerState.h"
#include "MenuInput.h" #include "GameInput.h"
#include <map> #include <map>