etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-10-19 11:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Swimming interference fix (#37)

Browse source
This commit is contained in:
Prince Frizzy 2022-03-21 14:55:36 -04:00 committed by GitHub
parent 0b4dd4cfbc
commit 74be5ad3d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/game/mario_actions_submerged.c
View file

@ -24,8 +24,15 @@
#define MIN_SWIM_STRENGTH 160 #define MIN_SWIM_STRENGTH 160
#define MIN_SWIM_SPEED 16.0f #define MIN_SWIM_SPEED 16.0f
static s16 sWasAtSurface = FALSE; static s16 sWasAtSurface[MAX_PLAYERS] = { FALSE, FALSE, FALSE, FALSE,
static s16 sSwimStrength = MIN_SWIM_STRENGTH; FALSE, FALSE, FALSE, FALSE,
FALSE, FALSE, FALSE, FALSE,
FALSE, FALSE, FALSE, FALSE };
static s16 sSwimStrength[MAX_PLAYERS] = { MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH,
MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH,
MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH,
MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH, MIN_SWIM_STRENGTH };
static s16 sWaterCurrentSpeeds[] = { 28, 12, 8, 4 }; static s16 sWaterCurrentSpeeds[] = { 28, 12, 8, 4 };
static s16 D_80339FD0; static s16 D_80339FD0;
@ -34,15 +41,16 @@ static f32 D_80339FD4;
void set_swimming_at_surface_particles(struct MarioState *m, u32 particleFlag) { void set_swimming_at_surface_particles(struct MarioState *m, u32 particleFlag) {
s16 atSurface = m->pos[1] >= m->waterLevel - 130; s16 atSurface = m->pos[1] >= m->waterLevel - 130;
u16 pIndex = m->playerIndex;
if (atSurface) { if (atSurface) {
m->particleFlags |= particleFlag; m->particleFlags |= particleFlag;
if (atSurface ^ sWasAtSurface) { if (atSurface ^ sWasAtSurface[pIndex]) {
play_sound(SOUND_ACTION_UNKNOWN431, m->marioObj->header.gfx.cameraToObject); play_sound(SOUND_ACTION_UNKNOWN431, m->marioObj->header.gfx.cameraToObject);
} }
} }
sWasAtSurface = atSurface; sWasAtSurface[pIndex] = atSurface;
} }
static s32 swimming_near_surface(struct MarioState *m) { static s32 swimming_near_surface(struct MarioState *m) {
@ -513,8 +521,10 @@ static s32 check_water_jump(struct MarioState *m) {
} }
static s32 act_breaststroke(struct MarioState *m) { static s32 act_breaststroke(struct MarioState *m) {
u16 pIndex = m->playerIndex;
if (m->actionArg == 0) { if (m->actionArg == 0) {
sSwimStrength = MIN_SWIM_STRENGTH; sSwimStrength[pIndex] = MIN_SWIM_STRENGTH;
} }
if (m->flags & MARIO_METAL_CAP) { if (m->flags & MARIO_METAL_CAP) {
@ -550,12 +560,12 @@ static s32 act_breaststroke(struct MarioState *m) {
set_anim_to_frame(m, 0); set_anim_to_frame(m, 0);
m->actionState = 0; m->actionState = 0;
m->actionTimer = 1; m->actionTimer = 1;
sSwimStrength = MIN_SWIM_STRENGTH; sSwimStrength[pIndex] = MIN_SWIM_STRENGTH;
} }
} }
if (m->actionTimer == 1) { if (m->actionTimer == 1) {
play_sound(sSwimStrength == MIN_SWIM_STRENGTH ? SOUND_ACTION_SWIM : SOUND_ACTION_SWIM_FAST, play_sound(sSwimStrength[pIndex] == MIN_SWIM_STRENGTH ? SOUND_ACTION_SWIM : SOUND_ACTION_SWIM_FAST,
m->marioObj->header.gfx.cameraToObject); m->marioObj->header.gfx.cameraToObject);
reset_float_globals(m); reset_float_globals(m);
} }
@ -565,12 +575,14 @@ static s32 act_breaststroke(struct MarioState *m) {
} }
set_mario_animation(m, MARIO_ANIM_SWIM_PART1); set_mario_animation(m, MARIO_ANIM_SWIM_PART1);
common_swimming_step(m, sSwimStrength); common_swimming_step(m, sSwimStrength[pIndex]);
return FALSE; return FALSE;
} }
static s32 act_swimming_end(struct MarioState *m) { static s32 act_swimming_end(struct MarioState *m) {
u16 pIndex = m->playerIndex;
if (m->flags & MARIO_METAL_CAP) { if (m->flags & MARIO_METAL_CAP) {
return set_mario_action(m, ACT_METAL_WATER_FALLING, 1); return set_mario_action(m, ACT_METAL_WATER_FALLING, 1);
} }
@ -588,26 +600,28 @@ static s32 act_swimming_end(struct MarioState *m) {
} }
if ((m->input & INPUT_A_DOWN) && m->actionTimer >= 7) { if ((m->input & INPUT_A_DOWN) && m->actionTimer >= 7) {
if (m->actionTimer == 7 && sSwimStrength < 280) { if (m->actionTimer == 7 && sSwimStrength[pIndex] < 280) {
sSwimStrength += 10; sSwimStrength[pIndex] += 10;
} }
return set_mario_action(m, ACT_BREASTSTROKE, 1); return set_mario_action(m, ACT_BREASTSTROKE, 1);
} }
if (m->actionTimer >= 7) { if (m->actionTimer >= 7) {
sSwimStrength = MIN_SWIM_STRENGTH; sSwimStrength[pIndex] = MIN_SWIM_STRENGTH;
} }
m->actionTimer++; m->actionTimer++;
m->forwardVel -= 0.25f; m->forwardVel -= 0.25f;
set_mario_animation(m, MARIO_ANIM_SWIM_PART2); set_mario_animation(m, MARIO_ANIM_SWIM_PART2);
common_swimming_step(m, sSwimStrength); common_swimming_step(m, sSwimStrength[pIndex]);
return FALSE; return FALSE;
} }
static s32 act_flutter_kick(struct MarioState *m) { static s32 act_flutter_kick(struct MarioState *m) {
u16 pIndex = m->playerIndex;
if (m->flags & MARIO_METAL_CAP) { if (m->flags & MARIO_METAL_CAP) {
return set_mario_action(m, ACT_METAL_WATER_FALLING, 1); return set_mario_action(m, ACT_METAL_WATER_FALLING, 1);
} }
@ -617,22 +631,22 @@ static s32 act_flutter_kick(struct MarioState *m) {
} }
if (!(m->input & INPUT_A_DOWN)) { if (!(m->input & INPUT_A_DOWN)) {
if (m->actionTimer == 0 && sSwimStrength < 280) { if (m->actionTimer == 0 && sSwimStrength[pIndex] < 280) {
sSwimStrength += 10; sSwimStrength[pIndex] += 10;
} }
return set_mario_action(m, ACT_SWIMMING_END, 0); return set_mario_action(m, ACT_SWIMMING_END, 0);
} }
m->forwardVel = approach_f32(m->forwardVel, 12.0f, 0.1f, 0.15f); m->forwardVel = approach_f32(m->forwardVel, 12.0f, 0.1f, 0.15f);
m->actionTimer = 1; m->actionTimer = 1;
sSwimStrength = MIN_SWIM_STRENGTH; sSwimStrength[pIndex] = MIN_SWIM_STRENGTH;
if (m->forwardVel < 14.0f) { if (m->forwardVel < 14.0f) {
play_swimming_noise(m); play_swimming_noise(m);
set_mario_animation(m, MARIO_ANIM_FLUTTERKICK); set_mario_animation(m, MARIO_ANIM_FLUTTERKICK);
} }
common_swimming_step(m, sSwimStrength); common_swimming_step(m, sSwimStrength[pIndex]);
return FALSE; return FALSE;
} }

3
src/pc/ultra_reimplementation.c
View file

@ -18,6 +18,7 @@ u64 osClockRate = 62500000;
s32 osPiStartDma(UNUSED OSIoMesg *mb, UNUSED s32 priority, UNUSED s32 direction, s32 osPiStartDma(UNUSED OSIoMesg *mb, UNUSED s32 priority, UNUSED s32 direction,
uintptr_t devAddr, void *vAddr, size_t nbytes, uintptr_t devAddr, void *vAddr, size_t nbytes,
UNUSED OSMesgQueue *mq) { UNUSED OSMesgQueue *mq) {
//printf("osPiStartDma: Copying %u bytes from %p to %p!\n", nbytes, (void *)devAddr, vAddr);
memcpy(vAddr, (const void *) devAddr, nbytes); memcpy(vAddr, (const void *) devAddr, nbytes);
return 0; return 0;
} }
@ -32,9 +33,11 @@ void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msgBuf, s32 count) {
void osSetEventMesg(UNUSED OSEvent e, UNUSED OSMesgQueue *mq, UNUSED OSMesg msg) { void osSetEventMesg(UNUSED OSEvent e, UNUSED OSMesgQueue *mq, UNUSED OSMesg msg) {
} }
s32 osJamMesg(UNUSED OSMesgQueue *mq, UNUSED OSMesg msg, UNUSED s32 flag) { s32 osJamMesg(UNUSED OSMesgQueue *mq, UNUSED OSMesg msg, UNUSED s32 flag) {
return 0; return 0;
} }
s32 osSendMesg(UNUSED OSMesgQueue *mq, UNUSED OSMesg msg, UNUSED s32 flag) { s32 osSendMesg(UNUSED OSMesgQueue *mq, UNUSED OSMesg msg, UNUSED s32 flag) {
#ifdef VERSION_EU #ifdef VERSION_EU
s32 index; s32 index;