print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from Reonu/revert_execute_mario_action_for_merge_nightly

Browse Source 
Revert execute_mario_action
This commit is contained in:
thecozies
2021-10-06 10:28:26 -05:00
committed by GitHub
parent a3c233004f 708980de21
commit 8601d3f516
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/game/mario.c
View File

@@ -1704,79 +1704,79 @@ void queue_rumble_particles(void) {
/**
* Main function for executing Mario's behavior. Returns particleFlags.
*/
s32 execute_mario_action(struct MarioState *m) {
s32 execute_mario_action(UNUSED struct Object *obj) {
s32 inLoop = TRUE;
// Updates once per frame:
vec3f_get_dist_and_lateral_dist_and_angle(m->prevPos, m->pos, &m->moveSpeed, &m->lateralSpeed, &m->movePitch, &m->moveYaw);
vec3_copy(m->prevPos, m->pos);
if (m->action) {
vec3f_get_dist_and_lateral_dist_and_angle(gMarioState->prevPos, gMarioState->pos, &gMarioState->moveSpeed, &gMarioState->lateralSpeed, &gMarioState->movePitch, &gMarioState->moveYaw);
vec3_copy(gMarioState->prevPos, gMarioState->pos);
if (gMarioState->action) {
#ifdef ENABLE_DEBUG_FREE_MOVE
if (gPlayer1Controller->buttonDown & U_JPAD) {
set_camera_mode(m->area->camera, CAMERA_MODE_8_DIRECTIONS, 1);
set_mario_action(m, ACT_DEBUG_FREE_MOVE, 0);
set_camera_mode(gMarioState->area->camera, CAMERA_MODE_8_DIRECTIONS, 1);
set_mario_action(gMarioState, ACT_DEBUG_FREE_MOVE, 0);
}
#endif
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
mario_reset_bodystate(m);
update_mario_inputs(m);
gMarioState->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
mario_reset_bodystate(gMarioState);
update_mario_inputs(gMarioState);
#ifdef PUPPYCAM
if (!(gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_FREE))
#endif
mario_handle_special_floors(m);
mario_process_interactions(m);
mario_handle_special_floors(gMarioState);
mario_process_interactions(gMarioState);
// If Mario is OOB, stop executing actions.
if (m->floor == NULL) {
if (gMarioState->floor == NULL) {
return ACTIVE_PARTICLE_NONE;
}
// The function can loop through many action shifts in one frame,
// which can lead to unexpected sub-frame behavior. Could potentially hang
// if a loop of actions were found, but there has not been a situation found.
while (inLoop) {
switch (m->action & ACT_GROUP_MASK) {
case ACT_GROUP_STATIONARY: inLoop = mario_execute_stationary_action(m); break;
case ACT_GROUP_MOVING: inLoop = mario_execute_moving_action(m); break;
case ACT_GROUP_AIRBORNE: inLoop = mario_execute_airborne_action(m); break;
case ACT_GROUP_SUBMERGED: inLoop = mario_execute_submerged_action(m); break;
case ACT_GROUP_CUTSCENE: inLoop = mario_execute_cutscene_action(m); break;
case ACT_GROUP_AUTOMATIC: inLoop = mario_execute_automatic_action(m); break;
case ACT_GROUP_OBJECT: inLoop = mario_execute_object_action(m); break;
switch (gMarioState->action & ACT_GROUP_MASK) {
case ACT_GROUP_STATIONARY: inLoop = mario_execute_stationary_action(gMarioState); break;
case ACT_GROUP_MOVING: inLoop = mario_execute_moving_action(gMarioState); break;
case ACT_GROUP_AIRBORNE: inLoop = mario_execute_airborne_action(gMarioState); break;
case ACT_GROUP_SUBMERGED: inLoop = mario_execute_submerged_action(gMarioState); break;
case ACT_GROUP_CUTSCENE: inLoop = mario_execute_cutscene_action(gMarioState); break;
case ACT_GROUP_AUTOMATIC: inLoop = mario_execute_automatic_action(gMarioState); break;
case ACT_GROUP_OBJECT: inLoop = mario_execute_object_action(gMarioState); break;
}
}
sink_mario_in_quicksand(m);
squish_mario_model(m);
set_submerged_cam_preset_and_spawn_bubbles(m);
update_mario_health(m);
sink_mario_in_quicksand(gMarioState);
squish_mario_model(gMarioState);
set_submerged_cam_preset_and_spawn_bubbles(gMarioState);
update_mario_health(gMarioState);
#ifdef BREATH_METER
update_mario_breath(m);
update_mario_breath(gMarioState);
#endif
update_mario_info_for_cam(m);
mario_update_hitbox_and_cap_model(m);
update_mario_info_for_cam(gMarioState);
mario_update_hitbox_and_cap_model(gMarioState);
// Both of the wind handling portions play wind audio only in
// non-Japanese releases.
if (m->floor->type == SURFACE_HORIZONTAL_WIND) {
spawn_wind_particles(0, (m->floor->force << 8));
if (gMarioState->floor->type == SURFACE_HORIZONTAL_WIND) {
spawn_wind_particles(0, (gMarioState->floor->force << 8));
#ifndef VERSION_JP
play_sound(SOUND_ENV_WIND2, m->marioObj->header.gfx.cameraToObject);
play_sound(SOUND_ENV_WIND2, gMarioState->marioObj->header.gfx.cameraToObject);
#endif
}
if (m->floor->type == SURFACE_VERTICAL_WIND) {
if (gMarioState->floor->type == SURFACE_VERTICAL_WIND) {
spawn_wind_particles(1, 0);
#ifndef VERSION_JP
play_sound(SOUND_ENV_WIND2, m->marioObj->header.gfx.cameraToObject);
play_sound(SOUND_ENV_WIND2, gMarioState->marioObj->header.gfx.cameraToObject);
#endif
}
play_infinite_stairs_music();
m->marioObj->oInteractStatus = 0;
gMarioState->marioObj->oInteractStatus = 0;
#if ENABLE_RUMBLE
queue_rumble_particles();
#endif
return m->particleFlags;
return gMarioState->particleFlags;
}
return ACTIVE_PARTICLE_NONE;

2
src/game/mario.h
View File

@@ -50,7 +50,7 @@ s32 check_common_hold_action_exits(struct MarioState *m);
s32 transition_submerged_to_walking(struct MarioState *m);
s32 transition_submerged_to_airborne(struct MarioState *m);
s32 set_water_plunge_action(struct MarioState *m);
s32 execute_mario_action(struct MarioState *m);
s32 execute_mario_action(UNUSED struct Object *obj);
void init_mario(void);
void init_mario_from_save_file(void);

2
src/game/object_list_processor.c
View File

@@ -253,7 +253,7 @@ void bhv_mario_update(void) {
u32 particleFlags = 0;
s32 i;
particleFlags = execute_mario_action(gMarioState);
particleFlags = execute_mario_action(gCurrentObject);
gCurrentObject->oMarioParticleFlags = particleFlags;
// Mario code updates MarioState's versions of position etc, so we need