mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-12 03:28:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

Browse Source 
* typedef for cPhs_Step

* make sdk includes consistent

* d_menu_quit / d_msg_scrn_explain debug

* d_a_obj_testcube mostly done

* d_debug_pad mostly done

* jstudio tool library headers

* some JStudioCameraEditor headers

* d_jcam_editor mostly done

* try fixing some shield regressions

* d_bg_parts mostly done

* fix merge errors

* debug fix
This commit is contained in:
TakaRikka
2026-01-24 23:36:23 -08:00
committed by GitHub
parent 6f73e18bd2
commit c9e2a73dda
612 changed files with 4052 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_zrc.cpp
+3 -3
View File
@@ -218,7 +218,7 @@ daNpc_zrC_c::~daNpc_zrC_c() {
#endif
}
cPhs__Step daNpc_zrC_c::create() {
cPhs_Step daNpc_zrC_c::create() {
fopAcM_ct(this, daNpc_zrC_c);
mType = getTypeFromParam();
@@ -240,7 +240,7 @@ cPhs__Step daNpc_zrC_c::create() {
if (res_idx == 3 && mTwilight) {
res_idx = 4;
}
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_resNames[res_idx]);
cPhs_Step step = dComIfG_resLoad(&mPhase[i], l_resNames[res_idx]);
if (step == cPhs_ERROR_e || step == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
@@ -1766,7 +1766,7 @@ BOOL daNpc_zrC_c::ECut_earringGet(int i_staffID) {
return ret;
}
static cPhs__Step daNpc_zrC_Create(void* i_this) {
static cPhs_Step daNpc_zrC_Create(void* i_this) {
return static_cast<daNpc_zrC_c*>(i_this)->create();
}