Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mostly fix up the title screen camera interp jank

This commit is contained in:
Agent X 2024-06-27 07:58:34 -04:00
parent 1baf316a26
commit 9054a722e0
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/camera.c
View File

@ -10866,6 +10866,7 @@ void cutscene_palette_editor(struct Camera *c) {
} }
gCutsceneTimer = CUTSCENE_STOP; gCutsceneTimer = CUTSCENE_STOP;
c->cutscene = 0; c->cutscene = 0;
skip_camera_interpolation();
return; return;
} }

7
src/game/level_update.c
View File

@ -1638,12 +1638,6 @@ void update_menu_level(void) {
break; break;
} }
if (gCurrentArea != NULL) {
vec3f_copy(gCurrentArea->camera->pos, gLakituState.curPos);
}
vec3f_copy(gLakituState.pos, gLakituState.curPos);
vec3f_copy(gLakituState.goalPos, gLakituState.curPos);
gMarioState->health = 0x880; gMarioState->health = 0x880;
// reset input // reset input
gMarioState->input = 0; gMarioState->input = 0;
@ -1660,7 +1654,6 @@ void update_menu_level(void) {
s32 update_level(void) { s32 update_level(void) {
// update main menu level // update main menu level
if (gDjuiInMainMenu) { if (gDjuiInMainMenu) {
skip_camera_interpolation(); // we can't have nice things with this engine and interpolation
update_menu_level(); update_menu_level();
} }
sCancelNextActSelector = gDjuiInMainMenu; sCancelNextActSelector = gDjuiInMainMenu;

6
src/pc/nametags.c
View File

@ -96,9 +96,9 @@ void nametags_render(void) {
snprintf(name, MAX_CONFIG_STRING, "%s", np->name); snprintf(name, MAX_CONFIG_STRING, "%s", np->name);
name_without_hex(name); name_without_hex(name);
Color color = { Color color = {
np->palette.parts[CAP][0], np->palette.parts[EMBLEM][0],
np->palette.parts[CAP][1], np->palette.parts[EMBLEM][1],
np->palette.parts[CAP][2] np->palette.parts[EMBLEM][2]
}; };
f32 measure = djui_hud_measure_text(name) * scale * 0.5f; f32 measure = djui_hud_measure_text(name) * scale * 0.5f;