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

Small adjustments

Browse source
This commit is contained in:
Agent X 2024-12-31 10:54:49 -05:00
parent e04248d7e8
commit 37079a6fc0
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game/bettercamera.inc.h
View file

@ -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;

16
src/pc/djui/djui_text.c
View file

@ -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);