mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 20:27:36 -04:00
general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)
* 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:
@@ -218,8 +218,8 @@ daNpcAsh_c::~daNpcAsh_c() {
|
||||
}
|
||||
}
|
||||
|
||||
cPhs__Step daNpcAsh_c::Create() {
|
||||
cPhs__Step step;
|
||||
cPhs_Step daNpcAsh_c::Create() {
|
||||
cPhs_Step step;
|
||||
|
||||
fopAcM_ct(this, daNpcAsh_c);
|
||||
|
||||
@@ -249,7 +249,7 @@ cPhs__Step daNpcAsh_c::Create() {
|
||||
u32 i = 0;
|
||||
int arcIndex;
|
||||
while (arcIndex = l_loadRes_list[mType][i], arcIndex >= 0) {
|
||||
step = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_arcNames[arcIndex]);
|
||||
step = dComIfG_resLoad(&mPhase[i], l_arcNames[arcIndex]);
|
||||
if (step != cPhs_COMPLEATE_e) {
|
||||
return step;
|
||||
}
|
||||
@@ -1195,7 +1195,7 @@ BOOL daNpcAsh_c::EvCut_WiretapEntrant(int i_staffID) {
|
||||
return true;
|
||||
}
|
||||
|
||||
static cPhs__Step daNpcAsh_Create(void* i_this) {
|
||||
static cPhs_Step daNpcAsh_Create(void* i_this) {
|
||||
return static_cast<daNpcAsh_c*>(i_this)->Create();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user