From bb203d5fe619c83deb20db8e338c654e21697237 Mon Sep 17 00:00:00 2001 From: Franklyn Tackitt Date: Wed, 21 Feb 2024 18:38:32 -0700 Subject: [PATCH] retype _createHeap and createHeap_CB Fixes the return on createHeap_CB Matching! --- include/d/actor/d_a_ikari.h | 2 +- src/d/actor/d_a_ikari.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/d/actor/d_a_ikari.h b/include/d/actor/d_a_ikari.h index ab1cba39a..924cce45d 100644 --- a/include/d/actor/d_a_ikari.h +++ b/include/d/actor/d_a_ikari.h @@ -22,7 +22,7 @@ public: class daIkari_c : public fopAc_ac_c { public: void setMtx(); - bool _createHeap(); + BOOL _createHeap(); void getArg(); bool _execute(); bool _draw(); diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index aadef8cea..aa110df62 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -14,9 +14,8 @@ daObjIkariHIO_c l_HIO; const char daIkari_c::M_arcname[6] = "Ikari"; /* 000000EC-0000010C .text createHeap_CB__FP10fopAc_ac_c */ -static BOOL createHeap_CB(fopAc_ac_c* i_this) { - ((daIkari_c*)i_this)->_createHeap(); - return; +static int createHeap_CB(fopAc_ac_c* i_this) { + return ((daIkari_c*)i_this)->_createHeap(); } /* 0000010C-000001C4 .text setMtx__9daIkari_cFv */ @@ -33,7 +32,7 @@ void daIkari_c::setMtx() { } /* 000001C4-00000290 .text _createHeap__9daIkari_cFv */ -bool daIkari_c::_createHeap() { +BOOL daIkari_c::_createHeap() { static int ikari_bdl[5] = {0x03, 0x03, 0x03, 0x04, 0x05}; J3DModelData* modelData =