diff options
| author | Max Roncace <me@caseif.net> | 2025-12-21 13:52:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-21 10:52:34 -0800 |
| commit | ee32f5db5596a08240e065a81cf361b8718dc533 (patch) | |
| tree | 92e39871f1d9a65269d682512f37ffabffa13d89 | |
| parent | 16a2980f5a2e6a9c00a05077eeab513f74fcff72 (diff) | |
d_a_vrbox2 matching (#2981)
| -rwxr-xr-x | configure.py | 2 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 2 | ||||
| -rw-r--r-- | include/d/d_stage.h | 2 | ||||
| -rw-r--r-- | src/d/actor/d_a_vrbox2.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 90480d1fed..fac13cd35e 100755 --- a/configure.py +++ b/configure.py @@ -1993,7 +1993,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tbox"), ActorRel(MatchingFor(ALL_GCN), "d_a_tbox2"), ActorRel(MatchingFor(ALL_GCN), "d_a_vrbox"), - ActorRel(NonMatching, "d_a_vrbox2"), + ActorRel(MatchingFor(ALL_GCN), "d_a_vrbox2"), ActorRel(MatchingFor(ALL_GCN), "d_a_arrow"), ActorRel(MatchingFor(ALL_GCN), "d_a_boomerang"), ActorRel(MatchingFor(ALL_GCN), "d_a_crod"), diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 256e95deb5..b403528a3c 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -1493,7 +1493,7 @@ struct J3DBlend : public J3DBlendInfo { struct J3DFog : public J3DFogInfo { J3DFog() { *(J3DFogInfo*)this = j3dDefaultFogInfo; } ~J3DFog() {} - J3DFogInfo* getFogInfo() { return this; } + J3DFog* getFogInfo() { return this; } void setFogInfo(J3DFogInfo info) { *(J3DFogInfo*)this = info; } void setFogInfo(const J3DFogInfo* info) { *(J3DFogInfo*)this = *info; } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 292f090e26..848e7bd21e 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1107,7 +1107,7 @@ public: } static BOOL GetTimePass() { return m_time_pass; } - static s8 getStayNo() { return mStayNo; } + static int getStayNo() { return mStayNo; } static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; } static s8 getMemoryBlockID(int i_roomNo) { return mStatus[i_roomNo].mMemBlockID; } dKy_tevstr_c* getTevStr(int i_roomNo) { diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 346ce45c97..815a33dd63 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -39,7 +39,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { s16 temp_r19; s16 temp_r18; - camera_p = dComIfGp_getCamera(0); + camera_p = (camera_class*)dComIfGp_getCamera(0); lenz_p = g_env_light.mpSunLenzPacket; kumo_model_p = i_this->mpKumoModel; sun_model_p = i_this->model2; |