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_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp
index 93271a80cc..a01093ccb6 100644
--- a/src/d/actor/d_a_npc_grr.cpp
+++ b/src/d/actor/d_a_npc_grr.cpp
@@ -258,7 +258,7 @@ daNpc_grR_c::~daNpc_grR_c() {
 #endif
 }
 
-cPhs__Step daNpc_grR_c::create() {
+cPhs_Step daNpc_grR_c::create() {
     fopAcM_ct(this, daNpc_grR_c);
 
     mType = getTypeFromParam();
@@ -276,7 +276,7 @@ cPhs__Step daNpc_grR_c::create() {
     int res_count = 0;
     int i = 0;
     for (; l_loadRes_list[mType][i] >= 0; i++) {
-        cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
+        cPhs_Step phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
         if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
             return cPhs_ERROR_e;
         }