From e55c504f28caf0815a0bf7ba31c4014dd8d3d849 Mon Sep 17 00:00:00 2001
From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com>
Date: Tue, 1 Apr 2025 22:05:30 -0400
Subject: d_camera work (#2369)

* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
---
 src/d/d_error_msg.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/d/d_error_msg.cpp')

diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp
index 6fb13694b9..c14db920f6 100644
--- a/src/d/d_error_msg.cpp
+++ b/src/d/d_error_msg.cpp
@@ -177,7 +177,6 @@ u8 dDvdErrorMsg_c::execute() {
 static u8 l_captureAlpha = 0xFF;
 
 /* 8009D410-8009D790 097D50 0380+00 1/1 0/0 0/0 .text            drawCapture__FUc */
-// NONMATCHING - stack too small
 static void drawCapture(u8 alpha) {
     static bool l_texCopied = false;
 
@@ -188,7 +187,7 @@ static void drawCapture(u8 alpha) {
         l_texCopied = true;
     }
 
-    JFWDisplay::getManager()->setClearColor(g_clearColor);
+    mDoGph_gInf_c::setClearColor(g_clearColor);
     mDoGph_gInf_c::beginRender();
     GXSetAlphaUpdate(GX_FALSE);
     j3dSys.drawInit();
@@ -218,7 +217,7 @@ static void drawCapture(u8 alpha) {
     GXSetCullMode(GX_CULL_NONE);
     GXSetDither(GX_ENABLE);
 
-    Mtx m;
+    Mtx44 m;
     C_MTXOrtho(m, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 10.0f);
     GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0);
     GXSetProjection(m, GX_ORTHOGRAPHIC);
-- 
cgit v1.2.3