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

diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp
index a00d3a2f62..9814a6021a 100644
--- a/src/d/actor/d_a_e_sm.cpp
+++ b/src/d/actor/d_a_e_sm.cpp
@@ -1895,10 +1895,10 @@ void daE_SM_c::initCoSph() {
     mCoCore.OnTgNoHitMark();
 }
 
-cPhs__Step daE_SM_c::Create() {
+cPhs_Step daE_SM_c::Create() {
     fopAcM_ct(this, daE_SM_c);
 
-    cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_SM");
+    cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_SM");
     if (phase == cPhs_COMPLEATE_e) {
         OS_REPORT("E_SM PARAM %x\n", fopAcM_GetParam(this));