d_demo work

1 files changed, 24 insertions, 31 deletions

diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp
index 87e8711f..d6c8b902 100644
--- a/src/d/d_event_data.cpp
+++ b/src/d/d_event_data.cpp
@@ -16,12 +16,6 @@ BOOL dEvDt_Next_Stage(int staffIdx, int wipePrm) {
     u32 mode;
     u32 wipe;
     const char * pStageName;
-    u32 * pStartCode;
-    u32 * pRoomNo;
-    u32 * pLayer;
-    f32 * pHour;
-    u32 * pMode;
-    u32 * pWipe;
 
     roomNo = 0;
     layerNo = -1;
@@ -31,19 +25,18 @@ BOOL dEvDt_Next_Stage(int staffIdx, int wipePrm) {
     pStageName = dComIfGp_evmng_getMyStringP(staffIdx, "Stage");
     if (pStageName == NULL)
         return FALSE;
-
-    pStartCode = dComIfGp_evmng_getMyIntegerP(staffIdx, "StartCode");
-    pRoomNo = dComIfGp_evmng_getMyIntegerP(staffIdx, "RoomNo");
+    int* pStartCode = dComIfGp_evmng_getMyIntegerP(staffIdx, "StartCode");
+    int* pRoomNo = dComIfGp_evmng_getMyIntegerP(staffIdx, "RoomNo");
     if (pRoomNo != NULL)
         roomNo = *pRoomNo;
-    pLayer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Layer");
+    int* pLayer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Layer");
     if (pLayer != NULL)
         layerNo = *pLayer;
-    pHour = dComIfGp_evmng_getMyFloatP(staffIdx, "Hour");
-    pMode = dComIfGp_evmng_getMyIntegerP(staffIdx, "Mode");
+    f32* pHour = dComIfGp_evmng_getMyFloatP(staffIdx, "Hour");
+    int* pMode = dComIfGp_evmng_getMyIntegerP(staffIdx, "Mode");
     if (pMode != NULL)
         mode = *pMode;
-    pWipe = dComIfGp_evmng_getMyIntegerP(staffIdx, "Wipe");
+    int* pWipe = dComIfGp_evmng_getMyIntegerP(staffIdx, "Wipe");
     if (pWipe != NULL)
         wipe = *pWipe;
 
@@ -128,7 +121,7 @@ void dEvDtEvent_c::specialStaffProc(dEvDtStaff_c* staff) {
 
 /* 80071BB4-80071C18       .text specialProc_WaitStart__12dEvDtStaff_cFi */
 void dEvDtStaff_c::specialProc_WaitStart(int staffIdx) {
-    u32 * pTimer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
+    int* pTimer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
     if (pTimer == NULL)
         mTimer = 0;
     else
@@ -229,7 +222,7 @@ void dEvDtStaff_c::specialProcLight() {
                     dKy_instant_timechg(*pHour * 15.0f);
                 }
 
-                s32 * pWeather = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "Weather");
+                int* pWeather = dComIfGp_evmng_getMyIntegerP(staffIdx, "Weather");
                 if (pWeather != NULL) {
                     switch (*pWeather) {
                     case 0:
@@ -300,7 +293,7 @@ void dEvDtStaff_c::specialProcMessage() {
         {
             l_msgId = fpcM_ERROR_PROCESS_ID_e;
             l_msg = NULL;
-            u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
+            int* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
             JUT_ASSERT(0x1D2, idata);
             l_msgNo = *idata;
             mWipeDirection = 0;
@@ -315,7 +308,7 @@ void dEvDtStaff_c::specialProcMessage() {
         {
             JUT_ASSERT(0x1DC, l_msg);
             l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e;
-            u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
+            int* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
             JUT_ASSERT(0x1DF, idata);
             l_msgNo = *idata;
             fopMsgM_messageSet(l_msgNo);
@@ -323,7 +316,7 @@ void dEvDtStaff_c::specialProcMessage() {
         }
         case ACT_TELOP_ON:
         {
-            u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "tlpNo");
+            int* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "tlpNo");
             JUT_ASSERT(0x1E5, idata);
             dComIfGp_setStageNameOn(*idata);
             specialProc_WaitStart(staffIdx);
@@ -450,7 +443,7 @@ void dEvDtStaff_c::specialProcSound() {
                 break;
             case ACT_LANDING_DEMO:
                 {
-                    s32* pPrepare = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "PREPARE");
+                    int* pPrepare = dComIfGp_evmng_getMyIntegerP(staffIdx, "PREPARE");
                     if (pPrepare != NULL) {
                         static u32 landing_table[] = {
                             2, 3, 4, 5, 6, 1, 7,
@@ -460,18 +453,18 @@ void dEvDtStaff_c::specialProcSound() {
                         mDoAud_prepareLandingDemo(landing_table[*pPrepare]);
                     }
 
-                    u32 * pStart = dComIfGp_evmng_getMyIntegerP(staffIdx, "START");
+                    int* pStart = dComIfGp_evmng_getMyIntegerP(staffIdx, "START");
                     if (pStart != NULL)
                         mDoAud_startLandingDemo();
 
-                    u32 * pEnd = dComIfGp_evmng_getMyIntegerP(staffIdx, "END");
+                    int* pEnd = dComIfGp_evmng_getMyIntegerP(staffIdx, "END");
                     if (pEnd != NULL)
                         mDoAud_endLandingDemo();
                 }
                 break;
             case ACT_BGMSTOP:
                 {
-                    u32* pTimer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
+                    int* pTimer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
                     if (pTimer != NULL)
                         mDoAud_bgmStop(*pTimer);
                 }
@@ -523,7 +516,7 @@ void dEvDtStaff_c::specialProcCreate() {
                 dStage_objectNameInf * objectName = dStage_searchName(name);
                 JUT_ASSERT(0x2e5, objectName);
 
-                u32* pArg = dComIfGp_evmng_getMyIntegerP(staffIdx, "ARG");
+                int* pArg = dComIfGp_evmng_getMyIntegerP(staffIdx, "ARG");
                 u32 arg;
                 if (pArg == NULL) {
                     arg = 0xFFFFFFFF;
@@ -539,7 +532,7 @@ void dEvDtStaff_c::specialProcCreate() {
                     pos = *pPos;
                 }
 
-                s32* pAngle = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "ANGLE");
+                int* pAngle = dComIfGp_evmng_getMyIntegerP(staffIdx, "ANGLE");
                 csXyz angle;
                 if (pAngle == NULL) {
                     angle.setall(0);
@@ -611,7 +604,7 @@ void dEvDtStaff_c::specialProcDirector() {
             case ACT_FADE:
                 {
                     f32* rate = dComIfGp_evmng_getMyFloatP(staffIdx, "Rate");
-                    u32* color = dComIfGp_evmng_getMyIntegerP(staffIdx, "Color");
+                    int* color = dComIfGp_evmng_getMyIntegerP(staffIdx, "Color");
                     JUT_ASSERT(0x343, rate);
                     if (*rate > 0.0f) {
                         mDoGph_gInf_c::setFadeRate(0.0f);
@@ -631,7 +624,7 @@ void dEvDtStaff_c::specialProcDirector() {
                 break;
             case ACT_BGM_START:
                 {
-                    u32* pBGM = dComIfGp_evmng_getMyIntegerP(staffIdx, "BGM_ID");
+                    int* pBGM = dComIfGp_evmng_getMyIntegerP(staffIdx, "BGM_ID");
                     u32 bgm;
                     static u32 bgm_table[] = {
                         JA_BGM_I_MAJU,
@@ -655,7 +648,7 @@ void dEvDtStaff_c::specialProcDirector() {
                         JUT_ASSERT(0x36b, FALSE);
 
                     const u8* pattern = (const u8*)dComIfGp_evmng_getMyIntegerP(staffIdx, "Pattern");
-                    const u32* type = dComIfGp_evmng_getMyIntegerP(staffIdx, "Type");
+                    const int* type = dComIfGp_evmng_getMyIntegerP(staffIdx, "Type");
                     if (pattern == NULL || type == NULL)
                         JUT_ASSERT(0x36f, FALSE);
 
@@ -668,7 +661,7 @@ void dEvDtStaff_c::specialProcDirector() {
                 break;
             case ACT_SE_START:
                 {
-                    s32* pSE = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "SENUM");
+                    int* pSE = dComIfGp_evmng_getMyIntegerP(staffIdx, "SENUM");
                     if (pSE != NULL) {
                         static u32 se_table[] = {
                             JA_SE_CM_ZL_FDEMO_JIMEN,
@@ -689,7 +682,7 @@ void dEvDtStaff_c::specialProcDirector() {
                         mWipeDirection = 0;
                     else
                         mWipeDirection = 1;
-                    u32* sound = dComIfGp_evmng_getMyIntegerP(staffIdx, "SOUND");
+                    int* sound = dComIfGp_evmng_getMyIntegerP(staffIdx, "SOUND");
                     if (sound != NULL) {
                         switch (*sound) {
                         case 0:
@@ -801,7 +794,7 @@ void dEvDtStaff_c::specialProcPackage() {
                 JUT_ASSERT(0x42e, demo_data);
                 dComIfGp_demo_create((const u8*)demo_data, pOffsetPos, offsetAngY);
                 dComIfGp_event_setCullRate(10.0f);
-                u32* eventFlag = dComIfGp_evmng_getMyIntegerP(staffIdx, "EventFlag");
+                int* eventFlag = dComIfGp_evmng_getMyIntegerP(staffIdx, "EventFlag");
                 if (eventFlag != NULL)
                     dComIfGs_onEventBit(*eventFlag);
             }
@@ -859,7 +852,7 @@ void dEvDtStaff_c::specialProcTimekeeper() {
         switch (actIdx) {
         case ACT_COUNTDOWN:
             {
-                u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
+                int* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
                 JUT_ASSERT(0x482, idata);
                 mTimer = *idata;
             }