From 37079a6fc03f2ca957410f414a0eba269fb9074f Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Tue, 31 Dec 2024 10:54:49 -0500 Subject: [PATCH] Small adjustments --- src/game/bettercamera.inc.h | 14 +++++++------- src/pc/djui/djui_text.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/game/bettercamera.inc.h b/src/game/bettercamera.inc.h index be50ca65c..673fc8de8 100644 --- a/src/game/bettercamera.inc.h +++ b/src/game/bettercamera.inc.h @@ -461,15 +461,15 @@ static void newcam_update_values(void) { if (newcam_modeflags & NC_FLAG_XTURN) newcam_yaw -= ((newcam_yaw_acc*(newcam_sensitivityX/10))*ivrt(0)); - if (((newcam_tilt <= 15000) && (newcam_tilt >= -15000)) && newcam_modeflags & NC_FLAG_YTURN) + if (((newcam_tilt <= 0x3000) && (newcam_tilt >= -0x3000)) && newcam_modeflags & NC_FLAG_YTURN) newcam_tilt += ((newcam_tilt_acc*ivrt(1))*(newcam_sensitivityY/10)); - if (newcam_tilt > 15000) - newcam_tilt = 15000; - if (newcam_tilt < -15000 && gMarioStates[0].pos[1] - gMarioStates[0].floorHeight > 20) - newcam_tilt = -15000; - if (newcam_tilt < -12000 && gMarioStates[0].pos[1] - gMarioStates[0].floorHeight < 20) - newcam_tilt = -12000; + if (newcam_tilt > 0x3000) + newcam_tilt = 0x3000; + if (newcam_tilt < -0x3000 && gMarioStates[0].pos[1] - gMarioStates[0].floorHeight > 20) + newcam_tilt = -0x3000; + if (newcam_tilt < -0x3000 && gMarioStates[0].pos[1] - gMarioStates[0].floorHeight < 20) + newcam_tilt = -0x3000; if (newcam_turnwait > 0 && gMarioStates[0].vel[1] == 0) { newcam_turnwait -= 1; diff --git a/src/pc/djui/djui_text.c b/src/pc/djui/djui_text.c index 48f362aac..3d7d0edca 100644 --- a/src/pc/djui/djui_text.c +++ b/src/pc/djui/djui_text.c @@ -65,16 +65,16 @@ static void djui_text_translate(f32 x, f32 y) { } static void djui_text_render_single_char(struct DjuiText* text, char* c) { - struct DjuiBaseRect* comp = &text->base.comp; + // struct DjuiBaseRect* comp = &text->base.comp; - f32 dX = comp->x + sTextRenderX * text->fontScale; - f32 dY = comp->y + sTextRenderY * text->fontScale; - f32 dW = text->font->charWidth * text->fontScale; - f32 dH = text->font->charHeight * text->fontScale; + // f32 dX = comp->x + sTextRenderX * text->fontScale; + // f32 dY = comp->y + sTextRenderY * text->fontScale; + // f32 dW = text->font->charWidth * text->fontScale; + // f32 dH = text->font->charHeight * text->fontScale; - if (djui_gfx_add_clipping_specific(&text->base, dX, dY, dW, dH)) { - return; - } + // if (djui_gfx_add_clipping_specific(&text->base, dX, dY, dW, dH)) { + // return; + // } create_dl_translation_matrix(DJUI_MTX_NOPUSH, sTextRenderX - sTextRenderLastX, (sTextRenderY - sTextRenderLastY) * -1.0f, 0); text->font->render_char(c);