Compiler compat fix: Passing of rvalue GXColors to non-const reference parameters (#1142)

16 files changed, 87 insertions, 171 deletions

diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index b9e2b4f2..edd981a1 100644
--- a/include/JSystem/JUtility/JUTFont.h
+++ b/include/JSystem/JUtility/JUTFont.h
@@ -62,16 +62,16 @@ public:
     };
 
     /* 0x0C */ virtual void setGX() = 0;
-    /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2);
+    /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2) { setGX(); }
     /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0;
     /* 0x18 */ virtual int getLeading() const = 0;
-    /* 0x1C */ virtual s32 getAscent() const = 0;
-    /* 0x20 */ virtual s32 getDescent() const = 0;
-    /* 0x24 */ virtual s32 getHeight() const = 0;
-    /* 0x28 */ virtual s32 getWidth() const = 0;
+    /* 0x1C */ virtual int getAscent() const = 0;
+    /* 0x20 */ virtual int getDescent() const = 0;
+    /* 0x24 */ virtual int getHeight() const = 0;
+    /* 0x28 */ virtual int getWidth() const = 0;
     /* 0x2C */ virtual void getWidthEntry(int i_no, TWidth* width) const = 0;
-    /* 0x30 */ virtual int getCellWidth() const;
-    /* 0x34 */ virtual s32 getCellHeight() const;
+    /* 0x30 */ virtual int getCellWidth() const { return getWidth(); }
+    /* 0x34 */ virtual int getCellHeight() const { return getHeight(); }
     /* 0x38 */ virtual int getFontType() const = 0;
     /* 0x3C */ virtual const ResFONT* getResFont() const = 0;
     /* 0x40 */ virtual bool isLeadByte(int a1) const = 0;
diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h
index 77047933..72a68d9e 100644
--- a/include/JSystem/JUtility/JUTResFont.h
+++ b/include/JSystem/JUtility/JUTResFont.h
@@ -17,13 +17,13 @@ public:
     virtual const ResFONT* getResFont() const { return mResFont; }
     virtual int getFontType() const { return mInfoBlock->fontType; }
     virtual int getLeading() const { return mInfoBlock->leading; }
-    virtual s32 getWidth() const { return mInfoBlock->width; }
-    virtual s32 getAscent() const { return mInfoBlock->ascent; }
-    virtual s32 getDescent() const { return mInfoBlock->descent; }
-    virtual s32 getHeight() const { return getAscent() + getDescent(); }
+    virtual int getWidth() const { return mInfoBlock->width; }
+    virtual int getAscent() const { return mInfoBlock->ascent; }
+    virtual int getDescent() const { return mInfoBlock->descent; }
+    virtual int getHeight() const { return getAscent() + getDescent(); }
     virtual void getWidthEntry(int, JUTFont::TWidth*) const;
     virtual int getCellWidth() const;
-    virtual s32 getCellHeight() const;
+    virtual int getCellHeight() const;
     virtual bool isLeadByte(int) const;
     virtual void loadImage(int, GXTexMapID);
     virtual void setBlock();
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index 6ab8c6c9..58ed7da0 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -151,8 +151,14 @@ public:
     virtual void draw();
 
     void setAlpha(u8 i_alpha) { mBlack.a = i_alpha; }
-    void setBlackColor(GXColor& c) { mBlack = c; }
-    void setWhiteColor(GXColor& c) { mWhite = c; }
+    void setBlackColor(GXColor& i_color) { mBlack = i_color; }
+    void setWhiteColor(GXColor& i_color) { mWhite = i_color; }
+    // some calls to these functions define i_color inline which is illegal in C++ for a non-const
+    // reference parameter - we add these overloads to enable standard compiler compatibility
+#if !__MWERKS__
+    void setBlackColor(const GXColor& i_color) { mBlack = const_cast<GXColor&>(i_color); }
+    void setWhiteColor(const GXColor& i_color) { mWhite = const_cast<GXColor&>(i_color); }
+#endif
 
 public:
     struct TexEntry {
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 7c0756e8..f970b207 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -454,9 +454,10 @@ public:
 
     void reset() { mp3DlineMat = NULL; }
 
-    void setMat(mDoExt_3DlineMat_c* pMat);
+    void setMat(mDoExt_3DlineMat_c* i_3DlineMat);
+
     virtual void draw();
-    virtual ~mDoExt_3DlineMatSortPacket();
+    virtual ~mDoExt_3DlineMatSortPacket() {}
 
 private:
     /* 0x10 */ mDoExt_3DlineMat_c* mp3DlineMat;
@@ -588,11 +589,22 @@ public:
     ~mDoExt_3DlineMat0_c() {}
 
     BOOL init(u16 numLines, u16 numSegments, BOOL hasSize);
-    void setMaterial();
-    void draw();
-    void update(u16, f32, GXColor&, u16, dKy_tevstr_c*);
-    void update(u16, GXColor&, dKy_tevstr_c*);
-    int getMaterialID();
+    void update(u16 i_segs, f32 i_size, GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr);
+    void update(u16 i_segs, GXColor& i_color, dKy_tevstr_c* i_tevStr);
+    // some calls to these functions define i_color inline which is illegal in C++ for a non-const
+    // reference parameter - we add these overloads to enable standard compiler compatibility
+#if !__MWERKS__
+    void update(u16 i_segs, f32 i_size, const _GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr) {
+        update(i_segs, i_size, const_cast<_GXColor&>(i_color), i_space, i_tevStr);
+    }
+    void update(u16 i_segs, const _GXColor& i_color, dKy_tevstr_c* i_tevStr) {
+        update(i_segs, const_cast<_GXColor&>(i_color), i_tevStr);
+    }
+#endif
+
+    virtual int getMaterialID() { return 0; }
+    virtual void setMaterial();
+    virtual void draw();
 
     cXyz* getPos(int i_idx) { return mpLines[i_idx].mpSegments; }
     u8* getSize(int i_idx) { return mpLines[i_idx].mpSize; }
@@ -612,11 +624,22 @@ public:
     ~mDoExt_3DlineMat1_c() {}
     
     BOOL init(u16 numLines, u16 numSegments, ResTIMG* i_img, BOOL hasSize);
-    void setMaterial();
-    void draw();
-    void update(u16, f32, GXColor&, u16, dKy_tevstr_c*);
-    void update(u16, GXColor&, dKy_tevstr_c*);
-    int getMaterialID();
+    void update(u16 i_segs, f32 i_size, GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr);
+    void update(u16 i_segs, GXColor& i_color, dKy_tevstr_c* i_tevStr);
+    // some calls to these functions define i_color inline which is illegal in C++ for a non-const
+    // reference parameter - we add these overloads to enable standard compiler compatibility
+#if !__MWERKS__
+    void update(u16 i_segs, f32 i_size, const GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr) {
+        update(i_segs, i_size, const_cast<GXColor&>(i_color), i_space, i_tevStr);
+    }
+    void update(u16 i_segs, const GXColor& i_color, dKy_tevstr_c* i_tevStr) {
+        update(i_segs, const_cast<GXColor&>(i_color), i_tevStr);
+    }
+#endif
+
+    virtual int getMaterialID() { return 1; }
+    virtual void setMaterial();
+    virtual void draw();
 
     cXyz* getPos(int i_idx) { return mpLines[i_idx].mpSegments; }
     u8* getSize(int i_idx) { return mpLines[i_idx].mpSize; }
diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp
index 71ae0598..979824ce 100644
--- a/src/JSystem/JUtility/JUTResFont.cpp
+++ b/src/JSystem/JUtility/JUTResFont.cpp
@@ -328,7 +328,7 @@ int JUTResFont::getCellWidth() const {
 }
 
 /* 802C2EDC-802C2F28       .text getCellHeight__10JUTResFontCFv */
-s32 JUTResFont::getCellHeight() const {
+int JUTResFont::getCellHeight() const {
     if (mpGlyphBlocks) {
         ResFONT::GLY1* glyph = *mpGlyphBlocks;
         if (glyph) {
diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp
index 03843c2b..2f461c2d 100644
--- a/src/d/actor/d_a_bgn.cpp
+++ b/src/d/actor/d_a_bgn.cpp
@@ -668,19 +668,9 @@ static void daBgn_DrawS(bgn_class* i_this) {
     for (s32 i = 0; i < BGN_TAIL_MAX; i++) {
         part_draw(i_this, &i_this->mTailParts[i]);
     }
-#ifdef __MWERKS__
     i_this->mBlueRopeMat.update(60, (GXColor){DEMO_SELECT(0, 0xFF), 0xFF, 0xFF, 0}, &actor->tevStr);
-#else
-    GXColor local_24 = (GXColor){DEMO_SELECT(0, 0xFF), 0xFF, 0xFF, 0};
-    i_this->mBlueRopeMat.update(60, local_24, &actor->tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->mBlueRopeMat);
-#ifdef __MWERKS__
     i_this->mRedRopeMat.update(60, (GXColor){DEMO_SELECT(0xD2, 0xFF), DEMO_SELECT(0x32, 0xFF), DEMO_SELECT(0x5A, 0xFF), 0}, &actor->tevStr);
-#else
-    GXColor local_28 = (GXColor){DEMO_SELECT(0xD2, 0xFF), DEMO_SELECT(0x32, 0xFF), DEMO_SELECT(0x5A, 0xFF), 0};
-    i_this->mRedRopeMat.update(60, local_28, &actor->tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->mRedRopeMat);
 }
 
@@ -752,12 +742,7 @@ static BOOL daBgn2_Draw(bgn2_class* i_this) {
             i_this->m02E4.update();
         }
     }
-#ifdef __MWERKS__
-    i_this->mRedRopeMat.update(60, (GXColor){0xD2, 0x32, 0x5A, 0}, &actor->tevStr);
-#else
-    GXColor local_28 = (GXColor){0xD2, 0x32, 0x5A, 0};
-    i_this->mRedRopeMat.update(60, local_28, &actor->tevStr);
-#endif
+    i_this->mRedRopeMat.update(60, (GXColor){0xD2, 0x32, 0x5A, 0x00}, &actor->tevStr);
     dComIfGd_set3DlineMat(&i_this->mRedRopeMat);
     return TRUE;
 }
@@ -880,12 +865,7 @@ static BOOL daBgn3_Draw(bgn3_class* i_this) {
 #endif
         }
     }
-#ifdef __MWERKS__
     i_this->mRedRopeMat.update(60, (GXColor){0xD2, 0x32, 0x5A, 0}, &actor->tevStr);
-#else
-    GXColor local_48 = (GXColor){0xD2, 0x32, 0x5A, 0};
-    i_this->mRedRopeMat.update(60, local_48, &actor->tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->mRedRopeMat);
     return TRUE;
 }
@@ -1011,12 +991,7 @@ static BOOL daBgn_Draw(bgn_class* i_this) {
         }
 #if VERSION > VERSION_DEMO
         if (i_this->mC720 != 0) {
-#ifdef __MWERKS__
             i_this->mDefeatCSRopeMat.update(60, (GXColor){0xFF, 0xFF, 0xFF, 0}, &actor->tevStr);
-#else
-            GXColor local_18 = (GXColor){0xFF, 0xFF, 0xFF, 0};
-            i_this->mDefeatCSRopeMat.update(60, local_18, &actor->tevStr);
-#endif
             dComIfGd_set3DlineMat(&i_this->mDefeatCSRopeMat);
         }
 #endif
diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp
index 79c0cd76..e2c30d10 100644
--- a/src/d/actor/d_a_bmdhand.cpp
+++ b/src/d/actor/d_a_bmdhand.cpp
@@ -47,12 +47,7 @@ void hand_draw(bmdhand_class* i_this) {
         g_env_light.setLightTevColorType(i_this->mpMorf->getModel(), &actor->tevStr);
         i_this->mpMorf->updateDL();
     }
-#ifdef __MWERKS__
     i_this->mLineMat.update(0x14, (GXColor){0xFF, 0xFF, 0xFF, 0xFF}, &actor->tevStr);
-#else
-    GXColor local_18 = (GXColor){0xFF, 0xFF, 0xFF, 0xFF};
-    i_this->mLineMat.update(0x14, local_18, &actor->tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->mLineMat);
 }
 
diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp
index 318bd721..af104961 100644
--- a/src/d/actor/d_a_boko.cpp
+++ b/src/d/actor/d_a_boko.cpp
@@ -73,12 +73,7 @@ static daBoko_HIO_c l_HIO;
 
 /* 000000EC-0000017C       .text keDraw__8daBoko_cFv */
 void daBoko_c::keDraw() {
-#ifdef __MWERKS__
     mpLineKe->lineMat.update(0xA, 1.25f, (GXColor){0xFF, 0x64, 0x00, 0xFF}, 2, &tevStr);
-#else
-    GXColor color = {0xFF, 0x64, 0x00, 0xFF};
-    mpLineKe->lineMat.update(0xA, 1.25f, color, 2, &tevStr);
-#endif
     dComIfGd_set3DlineMat(&mpLineKe->lineMat);
 }
 
diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp
index 8fb90d0f..97b82873 100644
--- a/src/d/actor/d_a_bridge.cpp
+++ b/src/d/actor/d_a_bridge.cpp
@@ -263,12 +263,7 @@ static BOOL daBridge_Draw(bridge_class* i_this) {
                 }
             }
 
-#ifdef __MWERKS__
             pBr->mLineMat1.update(5, (GXColor){150, 150, 150, 255}, &i_this->actor.tevStr);
-#else
-            GXColor color = (GXColor){150, 150, 150, 255};
-            pBr->mLineMat1.update(5, color, &i_this->actor.tevStr);
-#endif
             dComIfGd_set3DlineMat(&pBr->mLineMat1);
             continue;
         }
@@ -373,12 +368,7 @@ static BOOL daBridge_Draw(bridge_class* i_this) {
             tmp = 4.0f;
         }
 
-#ifdef __MWERKS__
         i_this->mLineMat.update(i_this->m030C + 2, tmp, (GXColor){150, 150, 150, 255}, 0, &i_this->actor.tevStr);
-#else
-        GXColor color = (GXColor){150, 150, 150, 255};
-        i_this->mLineMat.update(i_this->m030C + 2, tmp, color, 0, &i_this->actor.tevStr);
-#endif
         dComIfGd_set3DlineMat(&i_this->mLineMat);
     }
 
diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp
index 51083f73..962b1045 100644
--- a/src/d/actor/d_a_himo2.cpp
+++ b/src/d/actor/d_a_himo2.cpp
@@ -404,12 +404,7 @@ static BOOL daHimo2_Draw(himo2_class* i_this) {
                 r19--;
                 *r19 = local_a10[i];
             }
-#ifdef __MWERKS__
             i_this->m1F30.update((u16)i_this->m1F6C, rope_scale, (GXColor){200, 0x96, 50, 0xFF}, 0, &actor->tevStr);
-#else
-            GXColor local_a50 = {200, 0x96, 50, 0xFF};
-            i_this->m1F30.update((u16)i_this->m1F6C, rope_scale, local_a50, 0, &actor->tevStr);
-#endif
             dComIfGd_set3DlineMat(&i_this->m1F30);
             daPy_py_c* apdVar2 = (daPy_py_c*)dComIfGp_getPlayer(0);
             cMtx_YrotS(*calc_mtx, -apdVar2->shape_angle.y);
@@ -462,12 +457,7 @@ static BOOL daHimo2_Draw(himo2_class* i_this) {
                     *r19 += i_this->m02EC[1];
                 }
             }
-#if __MWERKS__
             i_this->m1F98.update(0x20, rope_scale, (GXColor){200, 0x96, 50, 0xFF}, 0, &actor->tevStr);
-#else
-            GXColor local_a54 = {200, 0x96, 50, 0xFF};
-            i_this->m1F98.update(0x20, rope_scale, local_a54, 0, &actor->tevStr);
-#endif
             dComIfGd_set3DlineMat(&i_this->m1F98);
             r19 = i_this->m1FD8.getPos(0);
             f32 f1_2;
@@ -497,12 +487,7 @@ static BOOL daHimo2_Draw(himo2_class* i_this) {
                 r19->z = i_this->m02EC[1].z + sp2C.z * i + sp38.z * fVar1;
                 r19++;
             }
-#ifdef __MWERKS__
             i_this->m1FD8.update(16, rope_scale, (GXColor){200, 0x96, 50, 0xFF}, 0, &actor->tevStr);
-#else
-            GXColor local_a58 = {200, 0x96, 50, 0xFF};
-            i_this->m1FD8.update(16, rope_scale, local_a58, 0, &actor->tevStr);
-#endif
             dComIfGd_set3DlineMat(&i_this->m1FD8);
             dComIfGd_setList();
         }
diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp
index 1c22ac89..4f9437c8 100644
--- a/src/d/actor/d_a_himo3.cpp
+++ b/src/d/actor/d_a_himo3.cpp
@@ -305,12 +305,7 @@ static BOOL daHimo3_Draw(himo3_class* i_this) {
         fVar1 = DEMO_SELECT(REG0_F(0) + 3.75f, 3.75f);
     }
 
-#ifdef __MWERKS__
     i_this->mLineMat.update(i_this->m15C0, fVar1, (GXColor){200, 150, 50, 255}, 0, &actor->tevStr);
-#else
-    GXColor color = (GXColor){200, 150, 50, 255};
-    i_this->mLineMat.update(i_this->m15C0, fVar1, color, 0, &actor->tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->mLineMat);
 
     if (i_this->m0298 != 0xf) {
diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp
index 03c79acb..36288993 100644
--- a/src/d/actor/d_a_mflft.cpp
+++ b/src/d/actor/d_a_mflft.cpp
@@ -75,12 +75,7 @@ void ride_call_back(dBgW*, fopAc_ac_c* arg1, fopAc_ac_c* arg2) {
 
 /* 00000408-00000488       .text himo_Draw__FP11mflft_class */
 void himo_Draw(mflft_class* i_this) {
-#ifdef __MWERKS__
     i_this->mLineMat.update(10, (GXColor){150, 150, 150, 255}, &i_this->actor.tevStr);
-    #else
-    GXColor color = {150, 150, 150, 255};
-    i_this->mLineMat.update(10, color, &i_this->actor.tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->mLineMat);
 }
 
diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp
index 77769717..858e1e0a 100644
--- a/src/d/actor/d_a_mo2.cpp
+++ b/src/d/actor/d_a_mo2.cpp
@@ -594,12 +594,7 @@ static void ke_disp(mo2_class* i_this) {
         ke_control(i_this, pkVar2, i);
         ke_draw(i_this, pkVar2, i);
     }
-#ifdef __MWERKS__
     i_this->m3Dline.update(10, 1.25f, (GXColor){0xFF, 0x64, 0, 0xFF}, 2, &actor->tevStr);
-#else
-    GXColor local_18 = (GXColor){0xFF, 0x64, 0, 0xFF};
-    i_this->m3Dline.update(10, 1.25f, local_18, 2, &actor->tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->m3Dline);
 }
 
diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp
index 52d7d03f..0f4d6cff 100644
--- a/src/d/actor/d_a_npc_tt.cpp
+++ b/src/d/actor/d_a_npc_tt.cpp
@@ -782,12 +782,7 @@ BOOL daNpc_Tt_c::_draw() {
         current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr
     );
 
-#ifdef __MWERKS__
     mLineKe.mLineMat.update(10, 0.8f, (GXColor){0xC9, 0xCA, 0xE4, 0xFF}, 0, &tevStr);
-#else
-    GXColor color = (GXColor){0xC9, 0xCA, 0xE4, 0xFF};
-    mLineKe.mLineMat.update(10, 0.8f, color, 0, &tevStr);
-#endif
     dComIfGd_set3DlineMat(&mLineKe.mLineMat);
 
     dSnap_RegistFig(DSNAP_TYPE_NPC_TT, this, 1.0f, 1.0f, 1.0f);
diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp
index f910e773..ec936be0 100644
--- a/src/d/actor/d_a_st.cpp
+++ b/src/d/actor/d_a_st.cpp
@@ -222,12 +222,7 @@ static void ke_pos_set(st_class* i_this, st_ke_s* param_2, int param_3) {
 static void ke_disp(st_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
-#ifdef __MWERKS__
     i_this->mLineMat.update(10, 1.2f, (GXColor){0xFF, 0x64, 0, 0xFF}, 2, &actor->tevStr);
-#else
-    GXColor color = (GXColor){0xFF, 0x64, 0, 0xFF};
-    i_this->mLineMat.update(10, 1.2f, color, 2, &actor->tevStr);
-#endif
     dComIfGd_set3DlineMat(&i_this->mLineMat);
 }
 
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 5e191980..46e9ade4 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -2008,7 +2008,7 @@ void mDoExt_3DlineMat0_c::draw() {
 }
 
 /* 800148B4-80014E04       .text update__19mDoExt_3DlineMat0_cFUsfR8_GXColorUsP12dKy_tevstr_c */
-void mDoExt_3DlineMat0_c::update(u16 segs, f32 size, GXColor& newColor, u16 space, dKy_tevstr_c* pTevStr) {
+void mDoExt_3DlineMat0_c::update(u16 i_segs, f32 i_size, GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr) {
     cXyz eyeDelta;
     cXyz delta;
     cXyz nextP0;
@@ -2020,9 +2020,9 @@ void mDoExt_3DlineMat0_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
     cXyz* r_dstPos;
     cXyz* dstPos;
 
-    mColor = newColor;
-    mpTevStr = pTevStr;
-    mNumSegments = segs;
+    mColor = i_color;
+    mpTevStr = i_tevStr;
+    mNumSegments = i_segs;
     if (mNumSegments > mMaxSegments)
         mNumSegments = mMaxSegments;
 
@@ -2030,8 +2030,8 @@ void mDoExt_3DlineMat0_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
     line = mpLines;
 
     f32 spacing;
-    if (space != 0) {
-        spacing = size / space;
+    if (i_space != 0) {
+        spacing = i_size / i_space;
     } else {
         spacing = 0.0f;
     }
@@ -2041,7 +2041,7 @@ void mDoExt_3DlineMat0_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
     for (s32 i = 0; i < mNumLines; i++) {
         pos = line->mpSegments;
         dstPos = line->mPosArr[mCurArr];
-        f32 r_size = size;
+        f32 r_size = i_size;
 
         delta = pos[1] - pos[0];
 
@@ -2064,7 +2064,7 @@ void mDoExt_3DlineMat0_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
         nextP1 = pos[0] - delta;
 
         for (s32 j = mNumSegments - 2; j > 0; j--) {
-            if (j < space)
+            if (j < i_space)
                 r_size -= spacing;
 
             delta = pos[1] - pos[0];
@@ -2089,7 +2089,7 @@ void mDoExt_3DlineMat0_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
             nextP1 = pos[0] - delta;
         }
 
-        if (space != 0) {
+        if (i_space != 0) {
             r_dstPos[0] = pos[0];
             r_dstPos[1] = pos[0];
         } else {
@@ -2103,7 +2103,7 @@ void mDoExt_3DlineMat0_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
 }
 
 /* 80014E04-80015328       .text update__19mDoExt_3DlineMat0_cFUsR8_GXColorP12dKy_tevstr_c */
-void mDoExt_3DlineMat0_c::update(u16 segs, GXColor& newColor, dKy_tevstr_c* pTevStr) {
+void mDoExt_3DlineMat0_c::update(u16 i_segs, GXColor& i_color, dKy_tevstr_c* i_tevStr) {
     cXyz eyeDelta;
     cXyz delta;
     cXyz nextP0;
@@ -2116,9 +2116,9 @@ void mDoExt_3DlineMat0_c::update(u16 segs, GXColor& newColor, dKy_tevstr_c* pTev
     cXyz* dstPos;
     u8* size_p;
 
-    mColor = newColor;
-    mpTevStr = pTevStr;
-    mNumSegments = segs;
+    mColor = i_color;
+    mpTevStr = i_tevStr;
+    mNumSegments = i_segs;
     if (mNumSegments > mMaxSegments)
         mNumSegments = mMaxSegments;
 
@@ -2284,7 +2284,7 @@ void mDoExt_3DlineMat1_c::draw() {
 }
 
 /* 80015764-80015E54       .text update__19mDoExt_3DlineMat1_cFUsfR8_GXColorUsP12dKy_tevstr_c */
-void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 space, dKy_tevstr_c* pTevStr) {
+void mDoExt_3DlineMat1_c::update(u16 i_segs, f32 i_size, GXColor& i_color, u16 i_space, dKy_tevstr_c* i_tevStr) {
     cXyz eyeDelta;
     cXyz delta;
     cXyz nextP0;
@@ -2299,9 +2299,9 @@ void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
     cXy* r_dstTex;
     cXy* dstTex;
 
-    mColor = newColor;
-    mpTevStr = pTevStr;
-    mNumSegments = segs;
+    mColor = i_color;
+    mpTevStr = i_tevStr;
+    mNumSegments = i_segs;
     if (mNumSegments > mMaxSegments)
         mNumSegments = mMaxSegments;
 
@@ -2309,8 +2309,8 @@ void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
     line = mpLines;
 
     f32 spacing;
-    if (space != 0) {
-        spacing = size / space;
+    if (i_space != 0) {
+        spacing = i_size / i_space;
     } else {
         spacing = 0.0f;
     }
@@ -2325,7 +2325,7 @@ void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
 
         dstPos = line->mPosArr[mCurArr];
         dstTex = line->mTexArr[mCurArr];
-        r_size = size;
+        r_size = i_size;
 
         dstTex[0].y = dist;
         dstTex[1].y = dist;
@@ -2341,7 +2341,7 @@ void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
         delta = delta.outprod(eyeDelta);
         f32 scale = delta.abs();
         if (scale != 0.0f) {
-            scale = size / scale;
+            scale = i_size / scale;
             delta *= scale;
         }
 
@@ -2356,7 +2356,7 @@ void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
         nextP1 = pos[0] - delta;
 
         for (s32 j = mNumSegments - 2; j > 0; j--) {
-            if (j < space)
+            if (j < i_space)
                 r_size -= spacing;
 
             r_dstTex[0].y = dist;
@@ -2390,7 +2390,7 @@ void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
         r_dstTex[0].y = dist;
         r_dstTex[1].y = dist;
 
-        if (space != 0) {
+        if (i_space != 0) {
             r_dstPos[0] = pos[0];
             r_dstPos[1] = pos[0];
         } else {
@@ -2405,7 +2405,7 @@ void mDoExt_3DlineMat1_c::update(u16 segs, f32 size, GXColor& newColor, u16 spac
 }
 
 /* 80015E54-80016518       .text update__19mDoExt_3DlineMat1_cFUsR8_GXColorP12dKy_tevstr_c */
-void mDoExt_3DlineMat1_c::update(u16 segs, GXColor& newColor, dKy_tevstr_c* pTevStr) {
+void mDoExt_3DlineMat1_c::update(u16 i_segs, GXColor& i_color, dKy_tevstr_c* i_tevStr) {
     cXyz eyeDelta;
     cXyz delta;
     cXyz nextP0;
@@ -2421,9 +2421,9 @@ void mDoExt_3DlineMat1_c::update(u16 segs, GXColor& newColor, dKy_tevstr_c* pTev
     cXy* dstTex;
     u8* size_p;
 
-    mColor = newColor;
-    mpTevStr = pTevStr;
-    mNumSegments = segs;
+    mColor = i_color;
+    mpTevStr = i_tevStr;
+    mNumSegments = i_segs;
     if (mNumSegments > mMaxSegments)
         mNumSegments = mMaxSegments;
 
@@ -2515,12 +2515,12 @@ void mDoExt_3DlineMat1_c::update(u16 segs, GXColor& newColor, dKy_tevstr_c* pTev
 }
 
 /* 80016518-8001657C       .text setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c */
-void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c* pMat) {
+void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c* i_3DlineMat) {
     if (mp3DlineMat == NULL) {
         j3dSys.getDrawBuffer(0)->entryImm(this, 0);
     }
-    pMat->mpNextLineMat = mp3DlineMat;
-    mp3DlineMat = pMat;
+    i_3DlineMat->mpNextLineMat = mp3DlineMat;
+    mp3DlineMat = i_3DlineMat;
 }
 
 /* 8001657C-800165E4       .text draw__26mDoExt_3DlineMatSortPacketFv */
@@ -2728,31 +2728,3 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3
     }
     return NULL;
 }
-
-/* 80016C98-80016CC4       .text setGX__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor */
-void JUTFont::setGX(JUtility::TColor col1, JUtility::TColor col2) {
-    setGX();
-}
-
-/* 80016CC4-80016CF0       .text getCellWidth__7JUTFontCFv */
-int JUTFont::getCellWidth() const {
-    return getWidth();
-}
-
-/* 80016CF0-80016D1C       .text getCellHeight__7JUTFontCFv */
-s32 JUTFont::getCellHeight() const {
-    return getHeight();
-}
-
-/* 80016D1C-80016D78       .text __dt__26mDoExt_3DlineMatSortPacketFv */
-mDoExt_3DlineMatSortPacket::~mDoExt_3DlineMatSortPacket() {}
-
-/* 80016D78-80016D80       .text getMaterialID__19mDoExt_3DlineMat1_cFv */
-int mDoExt_3DlineMat1_c::getMaterialID() {
-    return 1;
-}
-
-/* 80016D80-80016D88       .text getMaterialID__19mDoExt_3DlineMat0_cFv */
-int mDoExt_3DlineMat0_c::getMaterialID() {
-    return 0;
-}