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, 3 insertions, 3 deletions

diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp
index f3555cdff7..d812cc0040 100644
--- a/src/d/actor/d_a_obj_wchain.cpp
+++ b/src/d/actor/d_a_obj_wchain.cpp
@@ -30,10 +30,10 @@ static int daObjWchain_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjWchain_c*>(i_this)->createHeap();
 }
 
-cPhs__Step daObjWchain_c::create() {
+cPhs_Step daObjWchain_c::create() {
     fopAcM_ct(this, daObjWchain_c);
     mSw = fopAcM_GetParam(this) & 0xff;
-    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
+    cPhs_Step step = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (step == cPhs_COMPLEATE_e) {
         mRepeatable = (fopAcM_GetParam(this) >> 8) & 0xf;
         if (mRepeatable == 0xf) {
@@ -82,7 +82,7 @@ cPhs__Step daObjWchain_c::create() {
     return step;
 }
 
-static cPhs__Step daObjWchain_Create(fopAc_ac_c* i_this) {
+static cPhs_Step daObjWchain_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjWchain_c*>(i_this)->create();
 }