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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp
index 13a0c64eb5..eafd4740e2 100644
--- a/src/d/actor/d_a_obj_mirror_screw.cpp
+++ b/src/d/actor/d_a_obj_mirror_screw.cpp
@@ -142,7 +142,7 @@ static int daObjMirrorScrew_Delete(daObjMirrorScrew_c* i_this) {
     return 1;
 }
 
-cPhs__Step daObjMirrorScrew_c::create() {
+cPhs_Step daObjMirrorScrew_c::create() {
     fopAcM_ct(this, daObjMirrorScrew_c);
     if (fopAcM_isSwitch(this, getSwitchNo()) ||
         /* dSv_event_flag_c::F_0361 - Arbiter's Grounds - Spun the spinning pillars */
@@ -153,9 +153,9 @@ cPhs__Step daObjMirrorScrew_c::create() {
         return cPhs_ERROR_e;
     }
 
-    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
+    cPhs_Step step = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (step == cPhs_COMPLEATE_e) {
-        step = (cPhs__Step)MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0xc760, NULL);
+        step = MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0xc760, NULL);
         if (step == cPhs_ERROR_e) {
             return step;
         }
@@ -164,7 +164,7 @@ cPhs__Step daObjMirrorScrew_c::create() {
     return step;
 }
 
-static cPhs__Step daObjMirrorScrew_Create(fopAc_ac_c* i_this) {
+static cPhs_Step daObjMirrorScrew_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjMirrorScrew_c*>(i_this)->create();
 }