From 5abe3577ae8a2294545cecf9743fc9f4dece50bd Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 11 Sep 2020 22:36:29 -0700 Subject: [PATCH] Added Luigi's face in place of 'Mario Cam' Fixes #42 --- bin/segment2.c | 2 +- src/game/hud.c | 2 +- src/game/hud.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/segment2.c b/bin/segment2.c index d08b37bc..8cf462ad 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -2076,7 +2076,7 @@ const u8 *const main_credits_font_lut[] = { // HUD camera table 0x020087CC-0x020087E3 const u8 *const main_hud_camera_lut[] = { texture_hud_char_camera, texture_hud_char_mario_head, texture_hud_char_lakitu, texture_hud_char_no_camera, - texture_hud_char_arrow_up, texture_hud_char_arrow_down, + texture_hud_char_arrow_up, texture_hud_char_arrow_down, texture_hud_char_luigi_head, }; // If you change the language here, the following Makefile rule also needs to diff --git a/src/game/hud.c b/src/game/hud.c index 6ab372d4..7cb67611 100644 --- a/src/game/hud.c +++ b/src/game/hud.c @@ -433,7 +433,7 @@ void render_hud_camera_status(void) { switch (sCameraHUD.status & CAM_STATUS_MODE_GROUP) { case CAM_STATUS_MARIO: - render_hud_tex_lut(x + 16, y, (*cameraLUT)[GLYPH_CAM_MARIO_HEAD]); + render_hud_tex_lut(x + 16, y, (*cameraLUT)[(gNetworkType == NT_SERVER) ? GLYPH_CAM_MARIO_HEAD : GLYPH_CAM_LUIGI_HEAD]); break; case CAM_STATUS_LAKITU: render_hud_tex_lut(x + 16, y, (*cameraLUT)[GLYPH_CAM_LAKITU_HEAD]); diff --git a/src/game/hud.h b/src/game/hud.h index cbcbdeb8..c788e41e 100644 --- a/src/game/hud.h +++ b/src/game/hud.h @@ -18,7 +18,8 @@ enum CameraHUDLut { GLYPH_CAM_LAKITU_HEAD, GLYPH_CAM_FIXED, GLYPH_CAM_ARROW_UP, - GLYPH_CAM_ARROW_DOWN + GLYPH_CAM_ARROW_DOWN, + GLYPH_CAM_LUIGI_HEAD, }; // Functions