vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added rumble strength option

This commit is contained in:
Zerocker 2020-05-30 20:38:05 +09:00
parent 2bc577bc3c
commit 709a049ab6
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/text_options_strings.h.in
View File

@ -67,6 +67,7 @@
#define TEXT_BIND_LEFT _("STICK LEFT") #define TEXT_BIND_LEFT _("STICK LEFT")
#define TEXT_BIND_RIGHT _("STICK RIGHT") #define TEXT_BIND_RIGHT _("STICK RIGHT")
#define TEXT_OPT_DEADZONE _("STICK DEADZONE") #define TEXT_OPT_DEADZONE _("STICK DEADZONE")
#define TEXT_OPT_RUMBLE _("RUMBLE STRENGTH")
#define TEXT_OPT_CHEAT1 _("ENABLE CHEATS") #define TEXT_OPT_CHEAT1 _("ENABLE CHEATS")
#define TEXT_OPT_CHEAT2 _("MOONJUMP (PRESS L)") #define TEXT_OPT_CHEAT2 _("MOONJUMP (PRESS L)")
@ -128,6 +129,7 @@
#define TEXT_BIND_LEFT _("Stick Left") #define TEXT_BIND_LEFT _("Stick Left")
#define TEXT_BIND_RIGHT _("Stick Right") #define TEXT_BIND_RIGHT _("Stick Right")
#define TEXT_OPT_DEADZONE _("Stick Deadzone") #define TEXT_OPT_DEADZONE _("Stick Deadzone")
#define TEXT_OPT_RUMBLE _("Rumble Strength")
#define TEXT_OPT_CHEAT1 _("Enable cheats") #define TEXT_OPT_CHEAT1 _("Enable cheats")
#define TEXT_OPT_CHEAT2 _("Moonjump (Press L)") #define TEXT_OPT_CHEAT2 _("Moonjump (Press L)")

2
src/game/options_menu.c
View File

@ -120,6 +120,7 @@ static const u8 bindStr[][32] = {
{ TEXT_BIND_LEFT }, { TEXT_BIND_LEFT },
{ TEXT_BIND_RIGHT }, { TEXT_BIND_RIGHT },
{ TEXT_OPT_DEADZONE }, { TEXT_OPT_DEADZONE },
{ TEXT_OPT_RUMBLE }
}; };
static const u8 *filterChoices[] = { static const u8 *filterChoices[] = {
@ -241,6 +242,7 @@ static struct Option optsControls[] = {
// max deadzone is 31000; this is less than the max range of ~32768, but this // max deadzone is 31000; this is less than the max range of ~32768, but this
// way, the player can't accidentally lock themselves out of using the stick // way, the player can't accidentally lock themselves out of using the stick
DEF_OPT_SCROLL( bindStr[16], &configStickDeadzone, 0, 100, 1 ), DEF_OPT_SCROLL( bindStr[16], &configStickDeadzone, 0, 100, 1 ),
DEF_OPT_SCROLL( bindStr[17], &configRumbleStrength, 0, 100, 1)
}; };
static struct Option optsVideo[] = { static struct Option optsVideo[] = {

2
src/pc/configfile.c
View File

@ -67,6 +67,7 @@ unsigned int configKeyStickDown[MAX_BINDS] = { 0x001F, VK_INVALID, VK_INVALID
unsigned int configKeyStickLeft[MAX_BINDS] = { 0x001E, VK_INVALID, VK_INVALID }; unsigned int configKeyStickLeft[MAX_BINDS] = { 0x001E, VK_INVALID, VK_INVALID };
unsigned int configKeyStickRight[MAX_BINDS] = { 0x0020, VK_INVALID, VK_INVALID }; unsigned int configKeyStickRight[MAX_BINDS] = { 0x0020, VK_INVALID, VK_INVALID };
unsigned int configStickDeadzone = 16; // 16*DEADZONE_STEP=4960 (the original default deadzone) unsigned int configStickDeadzone = 16; // 16*DEADZONE_STEP=4960 (the original default deadzone)
unsigned int configRumbleStrength = 50;
#ifdef EXTERNAL_TEXTURES #ifdef EXTERNAL_TEXTURES
bool configPrecacheRes = false; bool configPrecacheRes = false;
#endif #endif
@ -109,6 +110,7 @@ static const struct ConfigOption options[] = {
{.name = "key_stickleft", .type = CONFIG_TYPE_BIND, .uintValue = configKeyStickLeft}, {.name = "key_stickleft", .type = CONFIG_TYPE_BIND, .uintValue = configKeyStickLeft},
{.name = "key_stickright", .type = CONFIG_TYPE_BIND, .uintValue = configKeyStickRight}, {.name = "key_stickright", .type = CONFIG_TYPE_BIND, .uintValue = configKeyStickRight},
{.name = "stick_deadzone", .type = CONFIG_TYPE_UINT, .uintValue = &configStickDeadzone}, {.name = "stick_deadzone", .type = CONFIG_TYPE_UINT, .uintValue = &configStickDeadzone},
{.name = "rumble_strength", .type = CONFIG_TYPE_UINT, .uintValue = &configRumbleStrength},
#ifdef EXTERNAL_TEXTURES #ifdef EXTERNAL_TEXTURES
{.name = "precache", .type = CONFIG_TYPE_BOOL, .boolValue = &configPrecacheRes}, {.name = "precache", .type = CONFIG_TYPE_BOOL, .boolValue = &configPrecacheRes},
#endif #endif

1
src/pc/configfile.h
View File

@ -36,6 +36,7 @@ extern unsigned int configKeyStickDown[];
extern unsigned int configKeyStickLeft[]; extern unsigned int configKeyStickLeft[];
extern unsigned int configKeyStickRight[]; extern unsigned int configKeyStickRight[];
extern unsigned int configStickDeadzone; extern unsigned int configStickDeadzone;
extern unsigned int configRumbleStrength;
#ifdef EXTERNAL_TEXTURES #ifdef EXTERNAL_TEXTURES
extern bool configPrecacheRes; extern bool configPrecacheRes;
#endif #endif