From 9d09564a5e5f415245c794143233af81d6f6b651 Mon Sep 17 00:00:00 2001 From: StuckInLimbo Date: Tue, 29 Jul 2025 21:58:27 -0400 Subject: [PATCH] Revert change that made useHeapInit non-matching --- include/d/actor/d_a_obj_crvhahen.h | 2 +- src/d/actor/d_a_obj_crvhahen.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d/actor/d_a_obj_crvhahen.h b/include/d/actor/d_a_obj_crvhahen.h index 330a98440d9..937966feb84 100644 --- a/include/d/actor/d_a_obj_crvhahen.h +++ b/include/d/actor/d_a_obj_crvhahen.h @@ -25,7 +25,7 @@ public: /* 80BD3C0C */ void setBaseMtx(); /* 80BD3DBC */ int create(); - /* 80BD3338 */ inline bool CreateHeap(); + /* 80BD3338 */ inline int CreateHeap(); /* 0x568 */ cXyz field1_0x568[10]; /* 0x5e0 */ cXyz field2_0x5e0[10]; diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index 8a25a6e7686..ed4fe733bc3 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -89,7 +89,7 @@ SECTION_DEAD static char const* const stringBase_80BD4051 = "CaravanPiece.bmd"; /* 80BD4064-80BD4068 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static const char* l_arcName = "SrvFence"; -bool daObjCRVHAHEN_c::CreateHeap() { +int daObjCRVHAHEN_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName,"CaravanPiece.bmd"); for (int i = 0; i < 10; i++) {