Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-02-18 02:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Harry Tuttle's fixes to fishing controls: invert fishing rod y and fishing stick y axis values so setting a negative axis is not necessary. Also changed reel to an analog input (similar to a pedal), whose neutral position is 0.

Browse source
This commit is contained in:
Bart Trzynadlowski 2017-04-07 04:42:04 +00:00
parent 4ca7d5ef0e
commit 006260be47
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Config/Supermodel.ini
View file

@ -218,8 +218,6 @@ InputFishingRodLeft = "KEY_LEFT"
InputFishingRodRight = "KEY_RIGHT" InputFishingRodRight = "KEY_RIGHT"
InputFishingRodUp = "KEY_UP" InputFishingRodUp = "KEY_UP"
InputFishingRodDown = "KEY_DOWN" InputFishingRodDown = "KEY_DOWN"
InputFishingReelFaster = "KEY_Q"
InputFishingReelSlower = "KEY_E"
InputFishingStickLeft = "KEY_A" InputFishingStickLeft = "KEY_A"
InputFishingStickRight = "KEY_D" InputFishingStickRight = "KEY_D"
InputFishingStickUp = "KEY_W" InputFishingStickUp = "KEY_W"
@ -228,6 +226,6 @@ InputFishingRodX = "JOY1_XAXIS"
InputFishingRodY = "JOY1_YAXIS" InputFishingRodY = "JOY1_YAXIS"
InputFishingStickX = "JOY1_RXAXIS" InputFishingStickX = "JOY1_RXAXIS"
InputFishingStickY = "JOY1_RYAXIS" InputFishingStickY = "JOY1_RYAXIS"
InputFishingReel = "JOY1_ZAXIS" InputFishingReel = "KEY_SPACE,JOY1_ZAXIS_POS"
InputFishingCast = "KEY_Z,JOY1_BUTTON1" InputFishingCast = "KEY_Z,JOY1_BUTTON1"
InputFishingSelect = "KEY_X,JOY1_BUTTON2" InputFishingSelect = "KEY_X,JOY1_BUTTON2"

9
Src/Inputs/Inputs.cpp
View file

@ -28,7 +28,6 @@
#include "Supermodel.h" #include "Supermodel.h"
#include "Game.h" #include "Game.h"
#include <stdarg.h> #include <stdarg.h>
#include <vector> #include <vector>
#include <string> #include <string>
@ -256,18 +255,16 @@ CInputs::CInputs(CInputSystem *system)
CAnalogInput *fishingRodRight = AddAnalogInput("FishingRodRight", "Rod Right", Game::INPUT_FISHING, "NONE"); CAnalogInput *fishingRodRight = AddAnalogInput("FishingRodRight", "Rod Right", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingRodUp = AddAnalogInput("FishingRodUp", "Rod Up", Game::INPUT_FISHING, "NONE"); CAnalogInput *fishingRodUp = AddAnalogInput("FishingRodUp", "Rod Up", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingRodDown = AddAnalogInput("FishingRodDown", "Rod Down", Game::INPUT_FISHING, "NONE"); CAnalogInput *fishingRodDown = AddAnalogInput("FishingRodDown", "Rod Down", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingReelFaster = AddAnalogInput("FishingReelFaster", "Reel Faster", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingReelSlower = AddAnalogInput("FishingReelSlower", "Reel Slower", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingStickLeft = AddAnalogInput("FishingStickLeft", "Stick Left", Game::INPUT_FISHING, "NONE"); CAnalogInput *fishingStickLeft = AddAnalogInput("FishingStickLeft", "Stick Left", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingStickRight = AddAnalogInput("FishingStickRight", "Stick Right", Game::INPUT_FISHING, "NONE"); CAnalogInput *fishingStickRight = AddAnalogInput("FishingStickRight", "Stick Right", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingStickUp = AddAnalogInput("FishingStickUp", "Stick Up", Game::INPUT_FISHING, "NONE"); CAnalogInput *fishingStickUp = AddAnalogInput("FishingStickUp", "Stick Up", Game::INPUT_FISHING, "NONE");
CAnalogInput *fishingStickDown = AddAnalogInput("FishingStickDown", "Stick Down", Game::INPUT_FISHING, "NONE"); CAnalogInput *fishingStickDown = AddAnalogInput("FishingStickDown", "Stick Down", Game::INPUT_FISHING, "NONE");
fishingRodX = AddAxisInput( "FishingRodX", "Rod X-Axis", Game::INPUT_FISHING, "NONE", fishingRodLeft, fishingRodRight, 0, 0x80, 0xFF); fishingRodX = AddAxisInput( "FishingRodX", "Rod X-Axis", Game::INPUT_FISHING, "NONE", fishingRodLeft, fishingRodRight, 0, 0x80, 0xFF);
fishingRodY = AddAxisInput( "FishingRodY", "Rod Y-Axis", Game::INPUT_FISHING, "NONE", fishingRodUp, fishingRodDown, 0xFF, 0x80, 0); fishingRodY = AddAxisInput( "FishingRodY", "Rod Y-Axis", Game::INPUT_FISHING, "NONE", fishingRodUp, fishingRodDown, 0, 0x80, 0xFF);
fishingReel = AddAxisInput( "FishingReel", "Reel Speed", Game::INPUT_FISHING, "NONE", fishingReelSlower, fishingReelFaster, 0, 0x80, 0xFF); fishingReel = AddAnalogInput( "FishingReel", "Reel Speed", Game::INPUT_FISHING, "NONE");
fishingStickX = AddAxisInput( "FishingStickX", "Stick X-Axis", Game::INPUT_FISHING, "NONE", fishingStickLeft, fishingStickRight, 0, 0x80, 0xFF); fishingStickX = AddAxisInput( "FishingStickX", "Stick X-Axis", Game::INPUT_FISHING, "NONE", fishingStickLeft, fishingStickRight, 0, 0x80, 0xFF);
fishingStickY = AddAxisInput( "FishingStickY", "Stick Y-Axis", Game::INPUT_FISHING, "NONE", fishingStickUp, fishingStickDown, 0xFF, 0x80, 0); fishingStickY = AddAxisInput( "FishingStickY", "Stick Y-Axis", Game::INPUT_FISHING, "NONE", fishingStickUp, fishingStickDown, 0, 0x80, 0xFF);
fishingCast = AddSwitchInput( "FishingCast", "Cast", Game::INPUT_FISHING, "NONE"); fishingCast = AddSwitchInput( "FishingCast", "Cast", Game::INPUT_FISHING, "NONE");
fishingSelect = AddSwitchInput( "FishingSelect", "Select", Game::INPUT_FISHING, "NONE"); fishingSelect = AddSwitchInput( "FishingSelect", "Select", Game::INPUT_FISHING, "NONE");
} }

2
Src/Inputs/Inputs.h
View file

@ -224,7 +224,7 @@ public:
// Sega Bass Fishing controls // Sega Bass Fishing controls
CAxisInput *fishingRodX; CAxisInput *fishingRodX;
CAxisInput *fishingRodY; CAxisInput *fishingRodY;
CAxisInput *fishingReel; CAnalogInput *fishingReel;
CAxisInput *fishingStickX; CAxisInput *fishingStickX;
CAxisInput *fishingStickY; CAxisInput *fishingStickY;
CSwitchInput *fishingCast; CSwitchInput *fishingCast;