mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-02 16:47:59 -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_the.cpp
+4 -4
View File
@@ -924,11 +924,11 @@ BOOL daNpcThe_c::EvCut_Introduction(int i_staffID) {
return false;
}
static cPhs__Step daNpcThe_Create(void* i_this) {
static cPhs_Step daNpcThe_Create(void* i_this) {
return static_cast<daNpcThe_c*>(i_this)->create();
}
cPhs__Step daNpcThe_c::create() {
cPhs_Step daNpcThe_c::create() {
fopAcM_ct(this, daNpcThe_c);
mType = getTypeFromParam();
@@ -949,11 +949,11 @@ cPhs__Step daNpcThe_c::create() {
return cPhs_ERROR_e;
}
cPhs__Step step;
cPhs_Step step;
int resources_loaded = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
step = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
step = dComIfG_resLoad(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
if (step == cPhs_ERROR_e || step == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}