thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-05 07:32:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Bowser 2 less likely to fall through floor

Browse source
This commit is contained in:
MysterD 2020-09-24 20:53:32 -07:00
parent 44c5b5b02b
commit 20631abc7f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/behaviors/bowser.inc.c
View file

@ -1075,9 +1075,6 @@ void bowser_act_ride_tilting_platform(void) {
platform->oAngleVelRoll = 0; platform->oAngleVelRoll = 0;
platform->oFaceAnglePitch = 0; platform->oFaceAnglePitch = 0;
platform->oFaceAngleRoll = 0; platform->oFaceAngleRoll = 0;
if (network_owns_object(o)) {
network_send_object(platform);
}
} }
} }
cur_obj_extend_animation_if_at_end(); cur_obj_extend_animation_if_at_end();
@ -1307,14 +1304,19 @@ void bhv_bowser_override_ownership(u8* shouldOverride, u8* shouldOwn) {
} }
// tilting platform // tilting platform
if (o->oAction == 19) { static u8 tiltingTimer = 0;
if (o->oAction == 19) { tiltingTimer = 5; }
if (tiltingTimer > 0) {
tiltingTimer--;
*shouldOverride = TRUE; *shouldOverride = TRUE;
*shouldOwn = (gNetworkType == NT_SERVER); *shouldOwn = (gNetworkType == NT_SERVER);
} }
} }
static u8 bhv_bowser_ignore_if_true(void) { static u8 bhv_bowser_ignore_if_true(void) {
return bowserIsDying; if (bowserIsDying) { return TRUE; }
if (o->oAction == 19) { return TRUE; } // let the platform get to a stable state
return FALSE;
} }
void bhv_bowser_init(void) { void bhv_bowser_init(void) {

2
src/pc/controller/controller_keyboard_debug.c
View file

@ -5,7 +5,7 @@
#ifdef DEBUG #ifdef DEBUG
static u8 warpToLevel = LEVEL_SSL; static u8 warpToLevel = LEVEL_BITFS;
#define SCANCODE_0 0x0B #define SCANCODE_0 0x0B
#define SCANCODE_3 0x04 #define SCANCODE_3 0x04