kill kickbox mode

Lightseypoo · May 5, 2017 · 6219d33 · 6219d33
1 parent b652bd7
commit 6219d33
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 530 deletions.
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
@@ -6,7 +6,6 @@ StepMania=StepMania
 Couldn't open any loading windows.=Couldn't open any loading windows.
 Starting sound subsystem...=Starting sound subsystem...
 Initializing bookkeeper...=Initializing bookkeeper...
-Starting lights subsystem...=Starting lights subsystem...
 Loading game type...=Loading game type...
 Building song cache index...=Building song cache index...
 Loading banner cache...=Loading banner cache...
@@ -510,7 +509,6 @@ Steps=Steps
 StretchBackgrounds=Toggle the stretching of backgrounds.
 Style=
 Test Input=Test the responsiveness of connected joysticks.
-Test Lights=Test the responsiveness of connected lights.
 TextureColorDepth=Choose the color depth of textures. 32 bit textures use more memory, but look nicer.
 Theme=Choose from this list of installed theme packs.
 ThreeKeyNavigation=&oq;Five Key&oq;: L/R/D/U menu buttons and Start.  &oq;Three Key&oq;: L/R menu buttons and Start.
@@ -1246,7 +1244,6 @@ SuperGrowth=Super Growth
 Tap Steps=Tap Steps
 Tempo=Tempo
 Test Input=Test Input
-Test Lights=Test Lights
 TextureColorDepth=Texture Color
 Theme=Theme
 ThreeKeyNavigation=Menu Navigation
@@ -1460,7 +1457,6 @@ Fill Profile Stats=Fill Profile Stats
 Flush Log=Flush Log
 Force Crash=Force Crash
 Halt=Halt
-Lights Debug=Lights Debug
 Machine=Machine
 Menu Timer=Menu Timer
 Monkey Input=Monkey Input
@@ -1842,7 +1838,6 @@ HelpTextContinue=Press any button or key.  Press ESCAPE when done.
 HelpTextEvaluation=Press &START; to continue
 HelpTextScreenshot=Press &SELECT; to take a screenshot
 HelpTextTestInput=Press any button or key.  Press ESCAPE when done.
-HelpTextTestLights=Press &MENULEFT;&MENURIGHT; to cycle lights.  Press ESCAPE when done.
 HelpTextTextEntry=Type a value using the keyboard.  Press Enter to finish.
 HelpTextMapControllers=Use arrow keys to move, ENTER to assign, SPACE to clear::Press ESCAPE when done
 HelpTextOnline=stepmaniaonline.net to connect to official Stepmania Online Server::Check out stepmaniaonline.net for more information
@@ -1952,12 +1947,6 @@ Controller=Controller
 not mapped=not mapped
 secondary=secondary
 
-[ScreenTestLights]
-Auto Cycle=Auto Cycle
-Manual Cycle=Manual Cycle
-cabinet light=cabinet light
-controller light=controller light
-
 [ScreenTextEntry]
 Backspace=Backsp
 Cancel=Cancel
@@ -2077,7 +2066,6 @@ dance-single=single
 dance-solo=solo
 dance-threepanel=3panel
 dance-routine=routine
-lights-cabinet=Lights
 #
 Dance_Single=Single
 Dance_Double=Double
@@ -2112,11 +2100,6 @@ Pnm_Five=5 Button
 Pnm_Nine=9 Button
 Guitar_Five=5 Frets
 Karaoke=Karaoke
-Lights_Cabinet=Lights
-Kickbox_Human=Human
-Kickbox_Quadarm=Quadarm
-Kickbox_Insect=Insect
-Kickbox_Arachnid=Arachnid
 
 [StyleType]
 StyleType_OnePlayerOneSide=1 Player
@@ -2666,10 +2649,6 @@ Pump_Halfdouble=Half-Double
 Pump_Couple=Couple
 Pump_Routine=Routine
 Kb7_Single=KB7
-Kickbox_Human=Human
-Kickbox_Quadarm=Quadarm
-Kickbox_Insect=Insect
-Kickbox_Arachnid=Arachnid
 Ez2_Single=Single
 Ez2_Double=Double
 Ez2_Real=Real
@@ -2691,7 +2670,6 @@ Pnm_Five=5 Button
 Pnm_Nine=9 Button
 Guitar_Five=5 Frets
 Karaoke=Karaoke
-Lights_Cabinet=Lights
 [StepsListDisplayRow StepsType]
 Dance_Single=Single
 Dance_Double=Double
@@ -2705,10 +2683,6 @@ Pump_Halfdouble=Half-Double
 Pump_Couple=Couple
 Pump_Routine=Routine
 Kb7_Single=KB7
-Kickbox_Human=Human
-Kickbox_Quadarm=Quadarm
-Kickbox_Insect=Insect
-Kickbox_Arachnid=Arachnid
 Ez2_Single=Single
 Ez2_Double=Double
 Ez2_Real=Real
@@ -2729,7 +2703,6 @@ Pnm_Five=5 Button
 Pnm_Nine=9 Button
 Guitar_Five=5 Frets
 Karaoke=Karaoke
-Lights_Cabinet=Lights
 
 [ScreenHowToInstallSongs]
 HeaderText=Installing Songs

diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h
@@ -113,10 +113,6 @@ enum StepsType
 	StepsType_techno_double8,
 	StepsType_popn_five,
 	StepsType_popn_nine,
-	StepsType_kickbox_human,
-	StepsType_kickbox_quadarm,
-	StepsType_kickbox_insect,
-	StepsType_kickbox_arachnid,
 	NUM_StepsType,		// leave this at the end
 	StepsType_Invalid,
 };

diff --git a/src/GameInput.h b/src/GameInput.h
@@ -174,16 +174,6 @@ GameButton StringToGameButton( const InputScheme* pInputs, const RString& s );
 #define LIGHTS_BUTTON_BASS_RIGHT	GAME_BUTTON_CUSTOM_08
 #define NUM_LIGHTS_BUTTONS		GAME_BUTTON_CUSTOM_09
 
-#define KICKBOX_BUTTON_DOWN_LEFT_FOOT GAME_BUTTON_CUSTOM_01
-#define KICKBOX_BUTTON_UP_LEFT_FOOT GAME_BUTTON_CUSTOM_02
-#define KICKBOX_BUTTON_UP_LEFT_FIST GAME_BUTTON_CUSTOM_03
-#define KICKBOX_BUTTON_DOWN_LEFT_FIST GAME_BUTTON_CUSTOM_04
-#define KICKBOX_BUTTON_DOWN_RIGHT_FIST GAME_BUTTON_CUSTOM_05
-#define KICKBOX_BUTTON_UP_RIGHT_FIST GAME_BUTTON_CUSTOM_06
-#define KICKBOX_BUTTON_UP_RIGHT_FOOT GAME_BUTTON_CUSTOM_07
-#define KICKBOX_BUTTON_DOWN_RIGHT_FOOT GAME_BUTTON_CUSTOM_08
-#define NUM_KICKBOX_BUTTONS GAME_BUTTON_CUSTOM_09
-
 #define GAME_BUTTON_LEFT GAME_BUTTON_MENULEFT
 #define GAME_BUTTON_RIGHT GAME_BUTTON_MENURIGHT
 #define GAME_BUTTON_UP GAME_BUTTON_MENUUP