thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed character anim offsets during certain dialog boxes

Browse source
This commit is contained in:
MysterD 2023-06-16 18:09:23 -07:00
parent 9e0e2be194
commit ccfb46043b
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/characters.c
View file

@ -555,7 +555,7 @@ f32 get_character_anim_offset(struct MarioState* m) {
switch (sAnimTypes[animID]) { switch (sAnimTypes[animID]) {
case ANIM_TYPE_LOWY: case ANIM_TYPE_LOWY:
if (m->minimumBoneY < c->animOffsetLowYPoint) { if (m->minimumBoneY < c->animOffsetLowYPoint) {
return -(m->minimumBoneY - c->animOffsetLowYPoint); return c->animOffsetLowYPoint - m->minimumBoneY;
} }
break; break;
case ANIM_TYPE_FEET: case ANIM_TYPE_FEET:
@ -584,10 +584,6 @@ void update_character_anim_offset(struct MarioState* m) {
if (m->curAnimOffset > 40) { m->curAnimOffset = 40; } if (m->curAnimOffset > 40) { m->curAnimOffset = 40; }
if (m->curAnimOffset < -40) { m->curAnimOffset = -40; } if (m->curAnimOffset < -40) { m->curAnimOffset = -40; }
if (m->action == ACT_JUMBO_STAR_CUTSCENE) {
marioObj->header.gfx.pos[1] = m->pos[1] + m->curAnimOffset; marioObj->header.gfx.pos[1] = m->pos[1] + m->curAnimOffset;
} else {
marioObj->header.gfx.pos[1] += m->curAnimOffset;
}
marioObj->header.gfx.node.flags |= GRAPH_RENDER_PLAYER; marioObj->header.gfx.node.flags |= GRAPH_RENDER_PLAYER;
} }

2
src/game/rendering_graph_node.c
View file

@ -1222,7 +1222,7 @@ static void geo_process_object(struct Object *node) {
} }
} }
if (gCurGraphNodeMarioState != NULL) { if (gCurGraphNodeMarioState != NULL) {
gCurGraphNodeMarioState->minimumBoneY = 999; gCurGraphNodeMarioState->minimumBoneY = 9999;
} }
} }