From 468887a6f97c08137784443bd5841ec826e793ba Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 28 Aug 2020 23:36:56 -0400 Subject: [PATCH 1/5] Check for zero rumble setting before allowing rumble Fixes controllers which don't check for rumble_strength and have constant rumble from rumbling even when set to 0 in the config. --- src/pc/controller/controller_entry_point.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pc/controller/controller_entry_point.c b/src/pc/controller/controller_entry_point.c index d5403f938e..bc5e9fe6c5 100644 --- a/src/pc/controller/controller_entry_point.c +++ b/src/pc/controller/controller_entry_point.c @@ -33,12 +33,16 @@ s32 osContInit(UNUSED OSMesgQueue *mq, u8 *controllerBits, UNUSED OSContStatus * s32 osMotorStart(UNUSED void *pfs) { // Since rumble stops by osMotorStop, its duration is not nessecary. // Set it to 5 seconds and hope osMotorStop() is called in time. - controller_rumble_play(configRumbleStrength / 100.0f, 5.0f); + if (configRumbleStrength>0){ + controller_rumble_play(configRumbleStrength / 100.0f, 5.0f); + } return 0; } s32 osMotorStop(UNUSED void *pfs) { - controller_rumble_stop(); + if (configRumbleStrength>0){ + controller_rumble_stop(); + } return 0; } From 420d82ce8c9c9d0746e4be6ec33f2f4d358484ac Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sun, 30 Aug 2020 15:39:41 +0300 Subject: [PATCH 2/5] fix spaces --- src/pc/controller/controller_entry_point.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pc/controller/controller_entry_point.c b/src/pc/controller/controller_entry_point.c index bc5e9fe6c5..f1eeeedcf6 100644 --- a/src/pc/controller/controller_entry_point.c +++ b/src/pc/controller/controller_entry_point.c @@ -33,16 +33,14 @@ s32 osContInit(UNUSED OSMesgQueue *mq, u8 *controllerBits, UNUSED OSContStatus * s32 osMotorStart(UNUSED void *pfs) { // Since rumble stops by osMotorStop, its duration is not nessecary. // Set it to 5 seconds and hope osMotorStop() is called in time. - if (configRumbleStrength>0){ + if (configRumbleStrength) controller_rumble_play(configRumbleStrength / 100.0f, 5.0f); - } return 0; } s32 osMotorStop(UNUSED void *pfs) { - if (configRumbleStrength>0){ + if (configRumbleStrength) controller_rumble_stop(); - } return 0; } From d88bd76041ff0f30412260a5662c57bdac46309f Mon Sep 17 00:00:00 2001 From: Victor Diego Alejandro Diaz Urbaneja <49420637+sodomon2@users.noreply.github.com> Date: Wed, 9 Sep 2020 01:25:51 -0400 Subject: [PATCH 3/5] Update README_es_ES.md --- README_es_ES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README_es_ES.md b/README_es_ES.md index 44a34a1c5f..1382d88be5 100644 --- a/README_es_ES.md +++ b/README_es_ES.md @@ -155,6 +155,11 @@ sudo xbps-install -S base-devel python3 audiofile-devel SDL2-devel glew-devel sudo xbps-install -S base-devel python3 audiofile-devel-32bit SDL2-devel-32bit glew-devel-32bit ``` +##### Alpine Linux - (compilando para 32 bits y 64 bits) +``` +sudo apk add build-base python3 audiofile-dev sdl2-dev glew-dev +``` + #### Compila el ejecutable. Ejecuta `make` para compilar (por defecto `VERSION=us`) From 9ee16a3ef6337354e7b18f8a2bbf9552c874194e Mon Sep 17 00:00:00 2001 From: s4Ys369 <69868583+s4Ys369@users.noreply.github.com> Date: Sat, 3 Oct 2020 19:10:55 -0400 Subject: [PATCH 4/5] Bugfix: Discord Integration crashes Fix by PeachyPeach to stop crashes with Discord Integration when enter later Bowser courses and fights early --- src/pc/discord/discordrpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pc/discord/discordrpc.c b/src/pc/discord/discordrpc.c index f814f4d518..6ce0aebe74 100644 --- a/src/pc/discord/discordrpc.c +++ b/src/pc/discord/discordrpc.c @@ -186,7 +186,7 @@ static void set_state(void) { // when exiting a stage the act doesn't get reset if (gCurrActNum && gCurrCourseNum) { // any stage over 19 is a special stage without acts - if (gCurrCourseNum < 19) { + if (gCurrCourseNum <= COURSE_STAGES_MAX) { void **actNameTbl; #ifndef VERSION_EU actNameTbl = segmented_to_virtual(seg2_act_name_table); From e6d2e7afea17d9d2b2d3fcc6e389488ba1146ced Mon Sep 17 00:00:00 2001 From: s4Ys369 <69868583+s4Ys369@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:40:45 -0400 Subject: [PATCH 5/5] Revert "Bugfix: Discord Integration crashes" --- src/pc/discord/discordrpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pc/discord/discordrpc.c b/src/pc/discord/discordrpc.c index 6ce0aebe74..f814f4d518 100644 --- a/src/pc/discord/discordrpc.c +++ b/src/pc/discord/discordrpc.c @@ -186,7 +186,7 @@ static void set_state(void) { // when exiting a stage the act doesn't get reset if (gCurrActNum && gCurrCourseNum) { // any stage over 19 is a special stage without acts - if (gCurrCourseNum <= COURSE_STAGES_MAX) { + if (gCurrCourseNum < 19) { void **actNameTbl; #ifndef VERSION_EU actNameTbl = segmented_to_virtual(seg2_act_name_table);