Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

This commit is contained in:
gymnast86
2026-05-28 20:21:14 -07:00
981 changed files with 5306 additions and 4931 deletions
+1 -1
View File
@@ -530,7 +530,7 @@ void MtxScale(f32 x_trans, f32 y_trans, f32 z_trans, u8 param_3) {
* @param src The src position to be multiplied
* @param dest The resulting multiplied position
*/
void MtxPosition(cXyz* src, cXyz* dest) {
void MtxPosition(cXyz DUSK_CONST* src, cXyz* dest) {
MTXMultVec(*calc_mtx, src, dest);
}
+1 -1
View File
@@ -91,7 +91,7 @@ bool Z2StatusMgr::isMovieDemo() {
return mDemoStatus == 2 || mDemoStatus == 8 || mDemoStatus == 9;
}
void Z2StatusMgr::setDemoName(char* demoName) {
void Z2StatusMgr::setDemoName(DUSK_CONST char* demoName) {
if (mDemoStatus == 11) {
mDemoStatus = 0;
if (Z2GetSceneMgr()->isInGame()) {
+2 -2
View File
@@ -399,7 +399,7 @@ static int daDr_Create(daDr_c* i_this) {
return i_this->create();
}
static actor_method_class l_daDr_Method = {
static DUSK_CONST actor_method_class l_daDr_Method = {
(process_method_func)daDr_Create,
(process_method_func)daDr_Delete,
(process_method_func)daDr_Execute,
@@ -407,7 +407,7 @@ static actor_method_class l_daDr_Method = {
(process_method_func)daDr_Draw,
};
actor_process_profile_definition g_profile_DR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -189,7 +189,7 @@ static int daL7lowDr_IsDelete(daL7lowDr_c* i_this) {
return 1;
}
static actor_method_class l_daL7lowDr_Method = {
static DUSK_CONST actor_method_class l_daL7lowDr_Method = {
(process_method_func)daL7lowDr_Create,
(process_method_func)daL7lowDr_Delete,
(process_method_func)daL7lowDr_Execute,
@@ -197,7 +197,7 @@ static actor_method_class l_daL7lowDr_Method = {
(process_method_func)daL7lowDr_Draw,
};
actor_process_profile_definition g_profile_L7lowDr = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L7lowDr = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -835,7 +835,7 @@ static int daL7ODR_Create(daL7ODR_c* i_this) {
return i_this->create();
}
static actor_method_class l_daL7ODR_Method = {
static DUSK_CONST actor_method_class l_daL7ODR_Method = {
(process_method_func)daL7ODR_Create,
(process_method_func)daL7ODR_Delete,
(process_method_func)daL7ODR_Execute,
@@ -843,7 +843,7 @@ static actor_method_class l_daL7ODR_Method = {
(process_method_func)daL7ODR_Draw,
};
actor_process_profile_definition g_profile_L7ODR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L7ODR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+15 -15
View File
@@ -120,31 +120,31 @@ static void daAlink_coHitCallback(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjI
static_cast<daAlink_c*>(i_coActorA)->coHitCallback(i_coActorB, i_coObjInfA);
}
static cXyz l_waitBaseAnime(1.24279f, 102.00054f, 5.0f);
static DUSK_CONSTEXPR cXyz l_waitBaseAnime(1.24279f, 102.00054f, 5.0f);
static cXyz l_ironBallBaseAnime(-4.248938f, 89.0f, -5.267045f);
static DUSK_CONSTEXPR cXyz l_ironBallBaseAnime(-4.248938f, 89.0f, -5.267045f);
static cXyz l_halfAtnWaitBaseAnime(3.5f, 97.0f, -7.0f);
static DUSK_CONSTEXPR cXyz l_halfAtnWaitBaseAnime(3.5f, 97.0f, -7.0f);
static cXyz l_rWaitBaseAnime(4.313951f, 93.94436f, -5.207283f);
static DUSK_CONSTEXPR cXyz l_rWaitBaseAnime(4.313951f, 93.94436f, -5.207283f);
static cXyz l_lWaitBaseAnime(-4.300988f, 93.95595f, -5.218504f);
static DUSK_CONSTEXPR cXyz l_lWaitBaseAnime(-4.300988f, 93.95595f, -5.218504f);
static cXyz l_horseBaseAnime(-l_waitBaseAnime.x, 225.7f, 1.81f - l_waitBaseAnime.z);
static DUSK_CONSTEXPR cXyz l_horseBaseAnime(-l_waitBaseAnime.x, 225.7f, 1.81f - l_waitBaseAnime.z);
static cXyz l_boarBaseAnime(-l_waitBaseAnime.x, 186.17f, -20.29f - l_waitBaseAnime.z);
static DUSK_CONSTEXPR cXyz l_boarBaseAnime(-l_waitBaseAnime.x, 186.17f, -20.29f - l_waitBaseAnime.z);
static cXyz l_localHorseRidePos(-68.208984f, 41.609924f, 0.883789f);
static DUSK_CONSTEXPR cXyz l_localHorseRidePos(-68.208984f, 41.609924f, 0.883789f);
static cXyz l_localBoarRidePos(0.0f, 15.0f, 0.0f);
static DUSK_CONSTEXPR cXyz l_localBoarRidePos(0.0f, 15.0f, 0.0f);
static cXyz l_canoeBaseAnime(1.24279f - l_waitBaseAnime.x, 56.0f, -72.0f - l_waitBaseAnime.z);
static DUSK_CONSTEXPR cXyz l_canoeBaseAnime(1.24279f - l_waitBaseAnime.x, 56.0f, -72.0f - l_waitBaseAnime.z);
static cXyz l_sumouBaseAnimeSp(0.0f, 0.0f, 32.0f - l_waitBaseAnime.z);
static DUSK_CONSTEXPR cXyz l_sumouBaseAnimeSp(0.0f, 0.0f, 32.0f - l_waitBaseAnime.z);
static cXyz l_wolfBaseAnime(1.0f, 88.63934f, -28.497932f);
static cXyz DUSK_CONST l_wolfBaseAnime(1.0f, 88.63934f, -28.497932f);
static cXyz l_wolfRopeBaseAnime(0.115164f, 68.336296f, -7.667817f);
static cXyz DUSK_CONST l_wolfRopeBaseAnime(0.115164f, 68.336296f, -7.667817f);
static void dummy_lit_3757() {
Vec temp = { 0.0f, 0.0f, 0.0f };
@@ -19920,13 +19920,13 @@ static int daAlink_Delete(daAlink_c* i_this) {
}
}
static actor_method_class l_daAlink_Method = {
static DUSK_CONST actor_method_class l_daAlink_Method = {
(process_method_func)daAlink_Create, (process_method_func)daAlink_Delete,
(process_method_func)daAlink_Execute, (process_method_func)NULL,
(process_method_func)daAlink_Draw,
};
actor_process_profile_definition g_profile_ALINK = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ALINK = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 5,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -72,7 +72,7 @@ void daAlink_c::handleQuickTransform() {
}
// Check to see if Link has the ability to transform.
if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077) && !dusk::getSettings().game.transformWithoutShadowCrystal) {
return;
}
@@ -102,7 +102,7 @@ void daAlink_c::handleQuickTransform() {
}
// Ensure that the Z Button is not dimmed
if (meterDrawPtr->getButtonZAlpha() != 1.f) {
if (meterDrawPtr->getButtonZAlpha() != 1.f && !dusk::getSettings().game.transformWithoutShadowCrystal) {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
return;
}
@@ -122,7 +122,7 @@ void daAlink_c::handleQuickTransform() {
bool canTransform = false;
if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn()) {
if (checkMidnaRide()) {
if (checkMidnaRide() || dusk::getSettings().game.transformWithoutShadowCrystal) {
if ((checkWolf() &&
(checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
(!checkWolf() &&
+1 -1
View File
@@ -1270,7 +1270,7 @@ int daAlink_c::procHorseRideInit() {
daAlink_ANM anm;
MtxP rideMtx;
Vec* localRidePos_p;
Vec DUSK_CONST* localRidePos_p;
u32 mode;
if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) {
daHorse_c* horse = (daHorse_c*)field_0x27f4;
+2 -2
View File
@@ -65,8 +65,8 @@ extern Vec const l_crawlSideOffset;
extern Vec const l_wolfLieSideOffset;
extern Vec const l_crawlMinSideOffset;
extern f32 const l_wolfFootOnFrame[][4];
extern cXyz l_wolfBaseAnime;
extern cXyz l_wolfRopeBaseAnime;
extern cXyz DUSK_CONST l_wolfBaseAnime;
extern cXyz DUSK_CONST l_wolfRopeBaseAnime;
void daAlink_c::changeCommon() {
+2 -2
View File
@@ -179,7 +179,7 @@ static int daAlldie_Create(fopAc_ac_c* i_this) {
return static_cast<daAlldie_c*>(i_this)->create();
}
static actor_method_class l_daAlldie_Method = {
static DUSK_CONST actor_method_class l_daAlldie_Method = {
(process_method_func)daAlldie_Create,
(process_method_func)daAlldie_Delete,
(process_method_func)daAlldie_Execute,
@@ -187,7 +187,7 @@ static actor_method_class l_daAlldie_Method = {
(process_method_func)daAlldie_Draw,
};
actor_process_profile_definition g_profile_ALLDIE = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ALLDIE = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 2,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -104,7 +104,7 @@ static int daAndsw_Create(fopAc_ac_c* i_this) {
return a_this->create();
}
static actor_method_class l_daAndsw_Method = {
static DUSK_CONST actor_method_class l_daAndsw_Method = {
(process_method_func)daAndsw_Create,
(process_method_func)daAndsw_Delete,
(process_method_func)daAndsw_Execute,
@@ -112,7 +112,7 @@ static actor_method_class l_daAndsw_Method = {
(process_method_func)NULL,
};
actor_process_profile_definition g_profile_ANDSW = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ANDSW = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -336,13 +336,13 @@ static int daAndsw2_Create(fopAc_ac_c* i_this) {
return static_cast<daAndsw2_c*>(i_this)->create();
}
static actor_method_class l_daAndsw2_Method = {
static DUSK_CONST actor_method_class l_daAndsw2_Method = {
(process_method_func)daAndsw2_Create,
(process_method_func)daAndsw2_Delete,
(process_method_func)daAndsw2_Execute,
};
actor_process_profile_definition g_profile_ANDSW2 = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ANDSW2 = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1220,7 +1220,7 @@ AUDIO_INSTANCES;
template<>
JAUSectionHeap* JASGlobalInstance<JAUSectionHeap>::sInstance;
static actor_method_class l_daArrowMethodTable = {
static DUSK_CONST actor_method_class l_daArrowMethodTable = {
(process_method_func)daArrow_create,
(process_method_func)daArrow_delete,
(process_method_func)daArrow_execute,
@@ -1228,7 +1228,7 @@ static actor_method_class l_daArrowMethodTable = {
(process_method_func)daArrow_draw,
};
actor_process_profile_definition g_profile_ARROW = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ARROW = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 9,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1568,7 +1568,7 @@ static int daB_BH_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daB_BH_Method = {
static DUSK_CONST actor_method_class l_daB_BH_Method = {
(process_method_func)daB_BH_Create,
(process_method_func)daB_BH_Delete,
(process_method_func)daB_BH_Execute,
@@ -1576,7 +1576,7 @@ static actor_method_class l_daB_BH_Method = {
(process_method_func)daB_BH_Draw,
};
actor_process_profile_definition g_profile_B_BH = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_BH = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -2683,13 +2683,13 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) {
b_bq_class::b_bq_class() {}
static actor_method_class l_daB_BQ_Method = {
static DUSK_CONST actor_method_class l_daB_BQ_Method = {
(process_method_func)daB_BQ_Create, (process_method_func)daB_BQ_Delete,
(process_method_func)daB_BQ_Execute, (process_method_func)daB_BQ_IsDelete,
(process_method_func)daB_BQ_Draw,
};
actor_process_profile_definition g_profile_B_BQ = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_BQ = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -4285,7 +4285,7 @@ static int daB_DR_Create(daB_DR_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_DR_Method = {
static DUSK_CONST actor_method_class l_daB_DR_Method = {
(process_method_func)daB_DR_Create,
(process_method_func)daB_DR_Delete,
(process_method_func)daB_DR_Execute,
@@ -4293,7 +4293,7 @@ static actor_method_class l_daB_DR_Method = {
(process_method_func)daB_DR_Draw,
};
actor_process_profile_definition g_profile_B_DR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_DR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -937,13 +937,13 @@ static int daB_DRE_IsDelete(daB_DRE_c* i_this) {
return 1;
}
static actor_method_class l_daB_DRE_Method = {
static DUSK_CONST actor_method_class l_daB_DRE_Method = {
(process_method_func)daB_DRE_Create, (process_method_func)daB_DRE_Delete,
(process_method_func)daB_DRE_Execute, (process_method_func)daB_DRE_IsDelete,
(process_method_func)daB_DRE_Draw,
};
actor_process_profile_definition g_profile_B_DRE = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_DRE = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -5689,13 +5689,13 @@ static cPhs_Step daB_DS_Create(daB_DS_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_DS_Method = {
static DUSK_CONST actor_method_class l_daB_DS_Method = {
(process_method_func)daB_DS_Create, (process_method_func)daB_DS_Delete,
(process_method_func)daB_DS_Execute, (process_method_func)daB_DS_IsDelete,
(process_method_func)daB_DS_Draw,
};
actor_process_profile_definition g_profile_B_DS = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_DS = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -4456,7 +4456,7 @@ static int daB_GG_Create(fopAc_ac_c* i_this) {
return ((daB_GG_c*)i_this)->Create();
}
static actor_method_class l_daB_GG_Method = {
static DUSK_CONST actor_method_class l_daB_GG_Method = {
(process_method_func)daB_GG_Create,
(process_method_func)daB_GG_Delete,
(process_method_func)daB_GG_Execute,
@@ -4464,7 +4464,7 @@ static actor_method_class l_daB_GG_Method = {
(process_method_func)daB_GG_Draw,
};
actor_process_profile_definition g_profile_B_GG = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GG = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -2223,7 +2223,7 @@ static int daB_GM_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daB_GM_Method = {
static DUSK_CONST actor_method_class l_daB_GM_Method = {
(process_method_func)daB_GM_Create,
(process_method_func)daB_GM_Delete,
(process_method_func)daB_GM_Execute,
@@ -2231,7 +2231,7 @@ static actor_method_class l_daB_GM_Method = {
(process_method_func)daB_GM_Draw,
};
actor_process_profile_definition g_profile_B_GM = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GM = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -4937,7 +4937,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) {
} // mSphAttr
};
static dCcD_SrcCyl co_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl co_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -5018,7 +5018,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) {
b_gnd_class::b_gnd_class() {}
static actor_method_class l_daB_GND_Method = {
static DUSK_CONST actor_method_class l_daB_GND_Method = {
(process_method_func)daB_GND_Create,
(process_method_func)daB_GND_Delete,
(process_method_func)daB_GND_Execute,
@@ -5026,7 +5026,7 @@ static actor_method_class l_daB_GND_Method = {
(process_method_func)daB_GND_Draw,
};
actor_process_profile_definition g_profile_B_GND = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GND = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -284,13 +284,13 @@ static int daB_GO_Create(fopAc_ac_c* i_this) {
b_go_class::b_go_class() {}
static actor_method_class l_daB_GO_Method = {
static DUSK_CONST actor_method_class l_daB_GO_Method = {
(process_method_func)daB_GO_Create, (process_method_func)daB_GO_Delete,
(process_method_func)daB_GO_Execute, (process_method_func)daB_GO_IsDelete,
(process_method_func)daB_GO_Draw,
};
actor_process_profile_definition g_profile_B_GO = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GO = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -383,7 +383,7 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) {
a_this->gravity = -7.0f;
a_this->mAction = ACTION_WAIT;
static dCcD_SrcCyl cc_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -411,13 +411,13 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) {
b_gos_class::b_gos_class() {}
static actor_method_class l_daB_GOS_Method = {
static DUSK_CONST actor_method_class l_daB_GOS_Method = {
(process_method_func)daB_GOS_Create, (process_method_func)daB_GOS_Delete,
(process_method_func)daB_GOS_Execute, (process_method_func)daB_GOS_IsDelete,
(process_method_func)daB_GOS_Draw,
};
actor_process_profile_definition g_profile_B_GOS = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GOS = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -3576,13 +3576,13 @@ static int daB_MGN_Create(daB_MGN_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_MGN_Method = {
static DUSK_CONST actor_method_class l_daB_MGN_Method = {
(process_method_func)daB_MGN_Create, (process_method_func)daB_MGN_Delete,
(process_method_func)daB_MGN_Execute, (process_method_func)daB_MGN_IsDelete,
(process_method_func)daB_MGN_Draw,
};
actor_process_profile_definition g_profile_B_MGN = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_MGN = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -3649,7 +3649,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) {
AUDIO_INSTANCES;
static actor_method_class l_daB_OB_Method = {
static DUSK_CONST actor_method_class l_daB_OB_Method = {
(process_method_func)daB_OB_Create,
(process_method_func)daB_OB_Delete,
(process_method_func)daB_OB_Execute,
@@ -3657,7 +3657,7 @@ static actor_method_class l_daB_OB_Method = {
(process_method_func)daB_OB_Draw,
};
actor_process_profile_definition g_profile_B_OB = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_OB = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -822,7 +822,7 @@ static int daB_OH_Create(fopAc_ac_c* i_this) {
AUDIO_INSTANCES;
static actor_method_class l_daB_OH_Method = {
static DUSK_CONST actor_method_class l_daB_OH_Method = {
(process_method_func)daB_OH_Create,
(process_method_func)daB_OH_Delete,
(process_method_func)daB_OH_Execute,
@@ -830,7 +830,7 @@ static actor_method_class l_daB_OH_Method = {
(process_method_func)daB_OH_Draw,
};
actor_process_profile_definition g_profile_B_OH = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_OH = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -293,13 +293,13 @@ static int daB_OH2_Create(fopAc_ac_c* i_this) {
return phase;
}
static actor_method_class l_daB_OH2_Method = {
static DUSK_CONST actor_method_class l_daB_OH2_Method = {
(process_method_func)daB_OH2_Create, (process_method_func)daB_OH2_Delete,
(process_method_func)daB_OH2_Execute, (process_method_func)daB_OH2_IsDelete,
(process_method_func)daB_OH2_Draw,
};
actor_process_profile_definition g_profile_B_OH2 = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_OH2 = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -5168,13 +5168,13 @@ static int daB_TN_Create(daB_TN_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_TN_Method = {
static DUSK_CONST actor_method_class l_daB_TN_Method = {
(process_method_func)daB_TN_Create, (process_method_func)daB_TN_Delete,
(process_method_func)daB_TN_Execute, (process_method_func)daB_TN_IsDelete,
(process_method_func)daB_TN_Draw,
};
actor_process_profile_definition g_profile_B_TN = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_TN = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -3426,7 +3426,7 @@ static u32 m_common_count;
} // namespace
static actor_method_class l_daB_YO_Method = {
static DUSK_CONST actor_method_class l_daB_YO_Method = {
(process_method_func)daB_YO_Create,
(process_method_func)daB_YO_Delete,
(process_method_func)daB_YO_Execute,
@@ -3434,7 +3434,7 @@ static actor_method_class l_daB_YO_Method = {
(process_method_func)daB_YO_Draw,
};
actor_process_profile_definition g_profile_B_YO = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_YO = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1091,7 +1091,7 @@ static cPhs_Step daB_YOI_Create(daB_YOI_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_YOI_Method = {
static DUSK_CONST actor_method_class l_daB_YOI_Method = {
(process_method_func)daB_YOI_Create,
(process_method_func)daB_YOI_Delete,
(process_method_func)daB_YOI_Execute,
@@ -1099,7 +1099,7 @@ static actor_method_class l_daB_YOI_Method = {
(process_method_func)daB_YOI_Draw,
};
actor_process_profile_definition g_profile_B_YOI = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_YOI = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -5591,7 +5591,7 @@ static int daB_ZANT_Create(daB_ZANT_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_ZANT_Method = {
static DUSK_CONST actor_method_class l_daB_ZANT_Method = {
(process_method_func)daB_ZANT_Create,
(process_method_func)daB_ZANT_Delete,
(process_method_func)daB_ZANT_Execute,
@@ -5599,7 +5599,7 @@ static actor_method_class l_daB_ZANT_Method = {
(process_method_func)daB_ZANT_Draw,
};
actor_process_profile_definition g_profile_B_ZANT = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANT = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -268,7 +268,7 @@ static int daB_ZANTM_Create(daB_ZANTM_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_ZANTM_Method = {
static DUSK_CONST actor_method_class l_daB_ZANTM_Method = {
(process_method_func)daB_ZANTM_Create,
(process_method_func)daB_ZANTM_Delete,
(process_method_func)daB_ZANTM_Execute,
@@ -276,7 +276,7 @@ static actor_method_class l_daB_ZANTM_Method = {
(process_method_func)daB_ZANTM_Draw,
};
actor_process_profile_definition g_profile_B_ZANTM = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANTM = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -500,7 +500,7 @@ static int daB_ZANTZ_Create(daB_ZANTZ_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_ZANTZ_Method = {
static DUSK_CONST actor_method_class l_daB_ZANTZ_Method = {
(process_method_func)daB_ZANTZ_Create,
(process_method_func)daB_ZANTZ_Delete,
(process_method_func)daB_ZANTZ_Execute,
@@ -508,7 +508,7 @@ static actor_method_class l_daB_ZANTZ_Method = {
(process_method_func)daB_ZANTZ_Draw,
};
actor_process_profile_definition g_profile_B_ZANTZ = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANTZ = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -221,13 +221,13 @@ static int daB_ZANTS_Create(daB_ZANTS_c* i_this) {
return i_this->create();
}
static actor_method_class l_daB_ZANTS_Method = {
static DUSK_CONST actor_method_class l_daB_ZANTS_Method = {
(process_method_func)daB_ZANTS_Create, (process_method_func)daB_ZANTS_Delete,
(process_method_func)daB_ZANTS_Execute, (process_method_func)daB_ZANTS_IsDelete,
(process_method_func)daB_ZANTS_Draw,
};
actor_process_profile_definition g_profile_B_ZANTS = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANTS = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -154,7 +154,7 @@ static int daBalloon2D_createHeap(fopAc_ac_c* i_this) {
return static_cast<daBalloon2D_c*>(i_this)->createHeap();
}
static char* l_arcName = "Balloon2D";
static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Balloon2D";
int daBalloon2D_c::createHeap() {
mScreen = JKR_NEW J2DScreen();
@@ -687,7 +687,7 @@ void daBalloon2D_HIO_c::genMessage(JORMContext* ctx) {
}
#endif
static actor_method_class daBalloon2D_METHODS = {
static DUSK_CONST actor_method_class daBalloon2D_METHODS = {
(process_method_func)daBalloon2D_create,
(process_method_func)daBalloon2D_destroy,
(process_method_func)daBalloon2D_execute,
@@ -695,7 +695,7 @@ static actor_method_class daBalloon2D_METHODS = {
(process_method_func)daBalloon2D_draw,
};
actor_process_profile_definition g_profile_BALLOON2D = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BALLOON2D = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1048,13 +1048,13 @@ static int daBd_Create(fopAc_ac_c* i_act_this) {
return phase_state;
}
static actor_method_class l_daBd_Method = {
static DUSK_CONST actor_method_class l_daBd_Method = {
(process_method_func)daBd_Create, (process_method_func)daBd_Delete,
(process_method_func)daBd_Execute, (process_method_func)daBd_IsDelete,
(process_method_func)daBd_Draw,
};
actor_process_profile_definition g_profile_BD = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BD = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -631,7 +631,7 @@ int daBg_c::create() {
return cPhs_COMPLEATE_e;
}
static actor_method_class l_daBg_Method = {
static DUSK_CONST actor_method_class l_daBg_Method = {
(process_method_func)daBg_Create,
(process_method_func)daBg_Delete,
(process_method_func)daBg_Execute,
@@ -639,7 +639,7 @@ static actor_method_class l_daBg_Method = {
(process_method_func)daBg_Draw,
};
actor_process_profile_definition2 g_profile_BG = {
DUSK_PROFILE actor_process_profile_definition2 DUSK_CONST g_profile_BG = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -499,7 +499,7 @@ static dCcD_SrcTri l_tri_src = {
},
};
static char* l_specName = "spec.dat";
static DUSK_CONST char* l_specName = "spec.dat";
createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
&daBgObj_c::CreateHeapType0,
@@ -1355,7 +1355,7 @@ static int daBgObj_MoveBGDraw(daBgObj_c* i_this) {
return i_this->MoveBGDraw();
}
static actor_method_class daBgObj_METHODS = {
static DUSK_CONST actor_method_class daBgObj_METHODS = {
(process_method_func)daBgObj_create1st,
(process_method_func)daBgObj_MoveBGDelete,
(process_method_func)daBgObj_MoveBGExecute,
@@ -1363,7 +1363,7 @@ static actor_method_class daBgObj_METHODS = {
(process_method_func)daBgObj_MoveBGDraw,
};
actor_process_profile_definition g_profile_BG_OBJ = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BG_OBJ = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1489,7 +1489,7 @@ static int daBoomerang_Create(fopAc_ac_c* i_this) {
return ((daBoomerang_c*)i_this)->create();
}
static actor_method_class l_daBoomerang_Method = {
static DUSK_CONST actor_method_class l_daBoomerang_Method = {
(process_method_func)daBoomerang_Create,
(process_method_func)daBoomerang_Delete,
(process_method_func)daBoomerang_Execute,
@@ -1497,7 +1497,7 @@ static actor_method_class l_daBoomerang_Method = {
(process_method_func)daBoomerang_Draw,
};
actor_process_profile_definition g_profile_BOOMERANG = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BOOMERANG = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 6,
/* List Prio */ fpcPi_CURRENT_e,
+4 -4
View File
@@ -8,9 +8,9 @@
#include "d/actor/d_a_bullet.h"
#include "d/d_com_inf_game.h"
static char* l_resFileNameList[] = {"Hanjo1"};
static DUSK_CONST char* l_resFileNameList[] = {"Hanjo1"};
static char* l_bmdFileNameList[] = {"hanjo_stone.bmd"};
static DUSK_CONST char* l_bmdFileNameList[] = {"hanjo_stone.bmd"};
static BULLET_HIO_CLASS l_HIO;
@@ -267,7 +267,7 @@ static int daBullet_IsDelete(void* i_this) {
return 1;
}
static actor_method_class daBullet_MethodTable = {
static DUSK_CONST actor_method_class daBullet_MethodTable = {
(process_method_func)daBullet_Create,
(process_method_func)daBullet_Delete,
(process_method_func)daBullet_Execute,
@@ -275,7 +275,7 @@ static actor_method_class daBullet_MethodTable = {
(process_method_func)daBullet_Draw,
};
actor_process_profile_definition g_profile_BULLET = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BULLET = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -909,7 +909,7 @@ static int daCanoe_Draw(daCanoe_c* i_this) {
return i_this->draw();
}
static actor_method_class l_daCanoe_Method = {
static DUSK_CONST actor_method_class l_daCanoe_Method = {
(process_method_func)daCanoe_Create,
(process_method_func)daCanoe_Delete,
(process_method_func)daCanoe_Execute,
@@ -917,7 +917,7 @@ static actor_method_class l_daCanoe_Method = {
(process_method_func)daCanoe_Draw,
};
actor_process_profile_definition g_profile_CANOE = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CANOE = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -105,7 +105,7 @@ static int daCoach2D_createHeap(fopAc_ac_c* i_this) {
return ((daCoach2D_c*)i_this)->createHeap();
}
static char* l_arcName = "Coach2D";
static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Coach2D";
static daCoach2D_HIO_c l_HOSTIO;
@@ -349,7 +349,7 @@ static int daCoach2D_draw(daCoach2D_c* i_this) {
return i_this->draw();
}
static actor_method_class daCoach2D_METHODS = {
static DUSK_CONST actor_method_class daCoach2D_METHODS = {
(process_method_func)daCoach2D_create,
(process_method_func)daCoach2D_destroy,
(process_method_func)daCoach2D_execute,
@@ -357,7 +357,7 @@ static actor_method_class daCoach2D_METHODS = {
(process_method_func)daCoach2D_draw,
};
actor_process_profile_definition g_profile_COACH2D = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_COACH2D = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -155,15 +155,15 @@ static int daCoachFire_Create(fopAc_ac_c* i_this) {
return cPhs_COMPLEATE_e;
}
static char* stringBase_80658454 = "Coach";
static DUSK_CONST char* stringBase_80658454 = "Coach";
static actor_method_class l_daCoachFire_Method = {
static DUSK_CONST actor_method_class l_daCoachFire_Method = {
(process_method_func)daCoachFire_Create, (process_method_func)daCoachFire_Delete,
(process_method_func)daCoachFire_Execute, (process_method_func)daCoachFire_IsDelete,
(process_method_func)daCoachFire_Draw,
};
actor_process_profile_definition g_profile_COACH_FIRE = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_COACH_FIRE = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -3283,11 +3283,11 @@ static int daCow_IsDelete(void* actor) {
return true;
}
static actor_method_class daCow_MethodTable = {
static DUSK_CONST actor_method_class daCow_MethodTable = {
daCow_Create, daCow_Delete, daCow_Execute, daCow_IsDelete, daCow_Draw,
};
actor_process_profile_definition g_profile_COW = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_COW = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -376,13 +376,13 @@ static int daCrod_Draw(daCrod_c* i_this) {
return i_this->draw();
}
static actor_method_class l_daCrod_Method = {
static DUSK_CONST actor_method_class l_daCrod_Method = {
(process_method_func)daCrod_Create, (process_method_func)daCrod_Delete,
(process_method_func)daCrod_Execute, (process_method_func)NULL,
(process_method_func)daCrod_Draw,
};
actor_process_profile_definition g_profile_CROD = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CROD = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -571,7 +571,7 @@ static int daCstaF_Draw(daCstaF_c* a_this) {
return a_this->MoveBGDraw();
}
static actor_method_class l_daCstaF_Method = {
static DUSK_CONST actor_method_class l_daCstaF_Method = {
(process_method_func)daCstaF_Create,
(process_method_func)daCstaF_Delete,
(process_method_func)daCstaF_Execute,
@@ -579,7 +579,7 @@ static actor_method_class l_daCstaF_Method = {
(process_method_func)daCstaF_Draw,
};
actor_process_profile_definition g_profile_CSTAF = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CSTAF = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1206,7 +1206,7 @@ static int daCstatue_Draw(daCstatue_c* actor) {
return static_cast<daCstatue_c*>(actor)->draw();
}
static actor_method_class l_daCstatue_Method = {
static DUSK_CONST actor_method_class l_daCstatue_Method = {
(process_method_func)daCstatue_Create,
(process_method_func)daCstatue_Delete,
(process_method_func)daCstatue_Execute,
@@ -1214,7 +1214,7 @@ static actor_method_class l_daCstatue_Method = {
(process_method_func)daCstatue_Draw,
};
actor_process_profile_definition g_profile_CSTATUE = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CSTATUE = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1893,7 +1893,7 @@ class JAUSectionHeap;
template<>
JAUSectionHeap* JASGlobalInstance<JAUSectionHeap>::sInstance;
static actor_method_class l_daDemo00_Method = {
static DUSK_CONST actor_method_class l_daDemo00_Method = {
(process_method_func)daDemo00_Create,
(process_method_func)daDemo00_Delete,
(process_method_func)daDemo00_Execute,
@@ -1901,7 +1901,7 @@ static actor_method_class l_daDemo00_Method = {
(process_method_func)daDemo00_Draw,
};
actor_process_profile_definition g_profile_DEMO00 = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DEMO00 = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -579,7 +579,7 @@ static int daDitem_Draw(daDitem_c* i_this) {
return i_this->draw();
}
static actor_method_class l_daDitem_Method = {
static DUSK_CONST actor_method_class l_daDitem_Method = {
(process_method_func)daDitem_Create,
(process_method_func)daDitem_Delete,
(process_method_func)daDitem_Execute,
@@ -587,7 +587,7 @@ static actor_method_class l_daDitem_Method = {
(process_method_func)daDitem_Draw,
};
actor_process_profile_definition g_profile_Demo_Item = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Demo_Item = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -116,13 +116,13 @@ static int daDisappear_Create(fopAc_ac_c* i_this) {
return cPhs_COMPLEATE_e;
}
static actor_method_class l_daDisappear_Method = {
static DUSK_CONST actor_method_class l_daDisappear_Method = {
(process_method_func)daDisappear_Create, (process_method_func)daDisappear_Delete,
(process_method_func)daDisappear_Execute, (process_method_func)daDisappear_IsDelete,
(process_method_func)daDisappear_Draw,
};
actor_process_profile_definition g_profile_DISAPPEAR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DISAPPEAR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -82,13 +82,13 @@ static int daDmidna_Draw(daDmidna_c* i_this) {
return i_this->draw();
}
static actor_method_class l_daDmidna_Method = {
static DUSK_CONST actor_method_class l_daDmidna_Method = {
(process_method_func)daDmidna_Create, (process_method_func)daDmidna_Delete,
(process_method_func)daDmidna_Execute, (process_method_func)NULL,
(process_method_func)daDmidna_Draw,
};
actor_process_profile_definition g_profile_DMIDNA = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DMIDNA = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -2492,7 +2492,7 @@ static cPhs_Step daDo_Create(fopAc_ac_c* i_this) {
AUDIO_INSTANCES;
static actor_method_class l_daDo_Method = {
static DUSK_CONST actor_method_class l_daDo_Method = {
(process_method_func)daDo_Create,
(process_method_func)daDo_Delete,
(process_method_func)daDo_Execute,
@@ -2500,7 +2500,7 @@ static actor_method_class l_daDo_Method = {
(process_method_func)daDo_Draw,
};
actor_process_profile_definition g_profile_DO = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DO = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+7 -7
View File
@@ -12,19 +12,19 @@
#include "d/d_door_param2.h"
#include "SSystem/SComponent/c_math.h"
char* daBdoor_c::getArcName() {
DUSK_CONST char* daBdoor_c::getArcName() {
return "Z_bdor00";
}
char* daBdoor_c::getBmd() {
DUSK_CONST char* daBdoor_c::getBmd() {
return "Z_bdor00.bmd";
}
char* daBdoor_c::getDzb() {
DUSK_CONST char* daBdoor_c::getDzb() {
return "door30.dzb";
}
char* daBdoor_c::getBmd2() {
DUSK_CONST char* daBdoor_c::getBmd2() {
return "door_shutterBoss.bmd";
}
@@ -119,7 +119,7 @@ cPhs_Step daBdoor_c::create() {
}
int daBdoor_c::getDemoAction() {
static char* action_table[11] = {
static DUSK_CONST char* action_table[11] = {
"WAIT",
"UNLOCK",
"OPEN",
@@ -412,7 +412,7 @@ static cPhs_Step daBdoor_Create(fopAc_ac_c* i_this) {
return static_cast<daBdoor_c*>(i_this)->create();
}
static actor_method_class l_daBdoor_Method = {
static DUSK_CONST actor_method_class l_daBdoor_Method = {
(process_method_func)daBdoor_Create,
(process_method_func)daBdoor_Delete,
(process_method_func)daBdoor_Execute,
@@ -420,7 +420,7 @@ static actor_method_class l_daBdoor_Method = {
(process_method_func)daBdoor_Draw,
};
actor_process_profile_definition g_profile_BOSS_DOOR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BOSS_DOOR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+6 -6
View File
@@ -15,7 +15,7 @@
#include "f_op/f_op_actor_mng.h"
#include <cstring>
static char* l_stageName[20] = {
static DUSK_CONST char* l_stageName[20] = {
"D_MN05",
"D_MN05A",
"D_MN04",
@@ -50,7 +50,7 @@ static int getNowLevel() {
return -1;
}
char* daBdoorL1_c::getDoorEventName() {
DUSK_CONST char* daBdoorL1_c::getDoorEventName() {
switch (getNowLevel()) {
case 1:
return "DEFAULT_BS_SHUTTER_L1_F";
@@ -71,7 +71,7 @@ char* daBdoorL1_c::getDoorEventName() {
}
}
char* daBdoorL1_c::getDoorEventName2() {
DUSK_CONST char* daBdoorL1_c::getDoorEventName2() {
switch (getNowLevel()) {
case 1:
return "DEFAULT_BS_SHUTTER_L1_F_2";
@@ -230,7 +230,7 @@ int daBdoorL1_c::CreateHeap() {
return 1;
}
static char* action_table[18] = {
static DUSK_CONST char* action_table[18] = {
"WAIT",
"SETANGLE",
"UNLOCK",
@@ -972,7 +972,7 @@ static int daBdoorL1_Create(fopAc_ac_c* i_this) {
return static_cast<daBdoorL1_c*>(i_this)->create();
}
static actor_method_class l_daBdoorL1_Method = {
static DUSK_CONST actor_method_class l_daBdoorL1_Method = {
(process_method_func)daBdoorL1_Create,
(process_method_func)daBdoorL1_Delete,
(process_method_func)daBdoorL1_Execute,
@@ -980,7 +980,7 @@ static actor_method_class l_daBdoorL1_Method = {
(process_method_func)daBdoorL1_Draw,
};
actor_process_profile_definition g_profile_L1BOSS_DOOR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L1BOSS_DOOR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -54,7 +54,7 @@ static char const l_door_open_demo_1st[26] = "DEFAULT_BS_SHUTTER_L5_1ST";
static char const l_staff_name[13] = "SHUTTER_DOOR";
static char* action_table[14] = {
static DUSK_CONSTEXPR char DUSK_CONST* action_table[14] = {
"WAIT",
"UNLOCK",
"OPEN",
@@ -498,7 +498,7 @@ static int daBdoorL5_Create(fopAc_ac_c* i_this) {
}
static actor_method_class l_daBdoorL5_Method = {
static DUSK_CONST actor_method_class l_daBdoorL5_Method = {
(process_method_func)daBdoorL5_Create,
(process_method_func)daBdoorL5_Delete,
(process_method_func)daBdoorL5_Execute,
@@ -506,7 +506,7 @@ static actor_method_class l_daBdoorL5_Method = {
(process_method_func)daBdoorL5_Draw,
};
actor_process_profile_definition g_profile_L5BOSS_DOOR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L5BOSS_DOOR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+10 -10
View File
@@ -27,29 +27,29 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
return 1;
}
static char* dummyStringFunc() {
static DUSK_CONST char* dummyStringFunc() {
return "door-pushDouble_";
}
char* daDbDoor00_c::getAlwaysArcName() {
DUSK_CONST char* daDbDoor00_c::getAlwaysArcName() {
return "static";
}
char* daDbDoor00_c::getDzb() {
DUSK_CONST char* daDbDoor00_c::getDzb() {
return "door-pushDouble.dzb";
}
char* daDbDoor00_c::getDummyBmdName() {
DUSK_CONST char* daDbDoor00_c::getDummyBmdName() {
return "door-pushDoubleDummy.bmd";
}
char* daDbDoor00_c::getBmdArcName() {
DUSK_CONST char* daDbDoor00_c::getBmdArcName() {
return "DbDoor0";
}
static char* l_bmd_base_name = "door-pushDouble_";
static DUSK_CONST char* l_bmd_base_name = "door-pushDouble_";
char* daDbDoor00_c::getBmdName() {
DUSK_CONST char* daDbDoor00_c::getBmdName() {
static char l_bmdName[32];
SAFE_SPRINTF(l_bmdName, "%s%02d.bmd", l_bmd_base_name, door_param2_c::getDoorModel(this));
return l_bmdName;
@@ -167,7 +167,7 @@ int daDbDoor00_c::create() {
}
int daDbDoor00_c::getDemoAction() {
static char* action_table[9] = {
static DUSK_CONST char* action_table[9] = {
"WAIT", "SET_START", "SET_ANGLE", "END", "OPEN",
"STOP_OPEN", "SET_GOAL", "SET_GOAL2", "ADJUSTMENT",
};
@@ -408,13 +408,13 @@ static int daDbdoor00_Create(fopAc_ac_c* i_this) {
return static_cast<daDbDoor00_c*>(i_this)->create();
}
static actor_method_class l_daDbdoor00_Method = {
static DUSK_CONST actor_method_class l_daDbdoor00_Method = {
(process_method_func)daDbdoor00_Create, (process_method_func)daDbdoor00_Delete,
(process_method_func)daDbdoor00_Execute, (process_method_func)daDbdoor00_IsDelete,
(process_method_func)daDbdoor00_Draw,
};
actor_process_profile_definition g_profile_DBDOOR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DBDOOR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+12 -12
View File
@@ -30,29 +30,29 @@ u8 knob_param_c::getExitNo(fopAc_ac_c* i_this) {
return fopAcM_GetParamBit(i_this, 25, 6);
}
static char* dummyStringFunc() {
static DUSK_CONST char* dummyStringFunc() {
return "door-knob_";
}
char* daKnob20_c::getAlwaysArcName() {
DUSK_CONST char* daKnob20_c::getAlwaysArcName() {
return "static";
}
char* daKnob20_c::getEvArcName() {
DUSK_CONST char* daKnob20_c::getEvArcName() {
return "DoorK10";
}
char* daKnob20_c::getDzb() {
DUSK_CONST char* daKnob20_c::getDzb() {
return "door-knob.dzb";
}
char* daKnob20_c::getDummyBmd() {
DUSK_CONST char* daKnob20_c::getDummyBmd() {
return "door-knobDummy.bmd";
}
static char* l_bmd_base_name = "door-knob_";
static DUSK_CONST char* l_bmd_base_name = "door-knob_";
char* daKnob20_c::getBmd() {
DUSK_CONST char* daKnob20_c::getBmd() {
static char l_bmdName[32];
SAFE_SPRINTF(l_bmdName, "%s%02d.bmd", l_bmd_base_name, knob_param_c::getDoorModel(this));
@@ -194,7 +194,7 @@ void daKnob20_c::setActionFromFlow() {
}
void daKnob20_c::setEventId() {
static char* ev_name_table[7] = {
static DUSK_CONSTEXPR char DUSK_CONST* ev_name_table[7] = {
"DEFAULT_KNOB_DOOR_F_OPEN",
"DEFAULT_KNOB_DOOR_B_OPEN",
"DEFAULT_KNOB_TALK",
@@ -296,7 +296,7 @@ int daKnob20_c::frontCheck() {
}
int daKnob20_c::getDemoAction() {
static char* action_table[16] = {
static DUSK_CONSTEXPR char DUSK_CONST* action_table[16] = {
"WAIT",
"SETSTART",
"SETANGLE",
@@ -463,7 +463,7 @@ int daKnob20_c::adjustmentProc() {
}
int daKnob20_c::openInit(int param_1) {
static char* bck_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* bck_table[4] = {
"FDoorA.bck",
"FDoorB.bck",
"FDoorA.bck",
@@ -694,13 +694,13 @@ static int daKnob20_Create(fopAc_ac_c* i_this) {
return static_cast<daKnob20_c*>(i_this)->create();
}
static actor_method_class l_daKnob20_Method = {
static DUSK_CONST actor_method_class l_daKnob20_Method = {
(process_method_func)daKnob20_Create, (process_method_func)daKnob20_Delete,
(process_method_func)daKnob20_Execute, (process_method_func)NULL,
(process_method_func)daKnob20_Draw,
};
actor_process_profile_definition g_profile_KNOB20 = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KNOB20 = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+15 -15
View File
@@ -57,7 +57,7 @@ static u16 const l_stop_heap_size[12] = {
0x0EA0, 0x0800, 0x0EB0, 0x0800, 0x0800, 0x1BD0,
};
static char* l_door_open_demo[11] = {
static DUSK_CONST char* l_door_open_demo[11] = {
NULL,
"DEFAULT_MBS_SHUTTER_L1_F",
"DEFAULT_MBS_SHUTTER_L1_F",
@@ -71,7 +71,7 @@ static char* l_door_open_demo[11] = {
"DEFAULT_MBS_SHUTTER_L7_F",
};
static char* l_door_open_demoB[11] = {
static DUSK_CONST char* l_door_open_demoB[11] = {
NULL,
"DEFAULT_MBS_SHUTTER_L1_B",
"DEFAULT_MBS_SHUTTER_L1_B",
@@ -85,7 +85,7 @@ static char* l_door_open_demoB[11] = {
"DEFAULT_MBS_SHUTTER_L7_B",
};
static char* l_door_open_demoLv5[4] = {
static DUSK_CONST char* l_door_open_demoLv5[4] = {
"DEFAULT_MBS_KNOB_OPEN_B",
"DEFAULT_MBS_KNOB_OPEN_F",
"DEFAULT_MBS_KNOB_NOTOPEN_B",
@@ -193,7 +193,7 @@ f32 dDoor_stop2_c::getHeight() {
}
char* daMBdoorL1_c::getAnmArcName() {
DUSK_CONST char* daMBdoorL1_c::getAnmArcName() {
switch(getDoorType()) {
case 0:
return "DoorY00";
@@ -205,7 +205,7 @@ char* daMBdoorL1_c::getAnmArcName() {
return "DoorT00";
}
char* daMBdoorL1_c::getArcName() {
DUSK_CONST char* daMBdoorL1_c::getArcName() {
switch (getNowLevel(this)) {
case 0:
case 1:
@@ -228,7 +228,7 @@ char* daMBdoorL1_c::getArcName() {
}
}
char* daMBdoorL1_c::getAlwaysArcName() {
DUSK_CONST char* daMBdoorL1_c::getAlwaysArcName() {
return "static";
}
@@ -245,7 +245,7 @@ int daMBdoorL1_c::getDoorType() {
}
}
char* daMBdoorL1_c::getOpenAnm() {
DUSK_CONST char* daMBdoorL1_c::getOpenAnm() {
if (getDoorType() == DOOR_TYPE_1) {
return "oj_DoorOpD.bck";
}
@@ -255,7 +255,7 @@ char* daMBdoorL1_c::getOpenAnm() {
return NULL;
}
char* daMBdoorL1_c::getCloseAnm() {
DUSK_CONST char* daMBdoorL1_c::getCloseAnm() {
if (getDoorType() == DOOR_TYPE_1) {
return "oj_DoorCloseD.bck";
}
@@ -265,7 +265,7 @@ char* daMBdoorL1_c::getCloseAnm() {
return NULL;
}
char* daMBdoorL1_c::getBmd() {
DUSK_CONST char* daMBdoorL1_c::getBmd() {
switch(getNowLevel(this)) {
case 5:
case 11:
@@ -275,11 +275,11 @@ char* daMBdoorL1_c::getBmd() {
}
}
char* daMBdoorL1_c::getBtk() {
DUSK_CONST char* daMBdoorL1_c::getBtk() {
return "door-shutter_00.btk";
}
char* daMBdoorL1_c::getDzb() {
DUSK_CONST char* daMBdoorL1_c::getDzb() {
if (getNowLevel(this) == 5) {
return "door-shutter.dzb";
}
@@ -529,7 +529,7 @@ int daMBdoorL1_c::create() {
}
int daMBdoorL1_c::getDemoAction() {
static char* action_table[26] = {
static DUSK_CONSTEXPR char DUSK_CONST* action_table[26] = {
"WAIT",
"SETANGLE",
"UNLOCK",
@@ -1066,7 +1066,7 @@ int daMBdoorL1_c::unlock() {
}
int daMBdoorL1_c::openInitKnob(int param_1) {
static char* bck_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* bck_table[4] = {
"FDoorA.bck",
"FDoorB.bck",
"FDoorA.bck",
@@ -1723,7 +1723,7 @@ static int daMBdoorL1_Create(fopAc_ac_c* i_this) {
return static_cast<daMBdoorL1_c*>(i_this)->create();
}
static actor_method_class l_daMBdoorL1_Method = {
static DUSK_CONST actor_method_class l_daMBdoorL1_Method = {
(process_method_func)daMBdoorL1_Create,
(process_method_func)daMBdoorL1_Delete,
(process_method_func)daMBdoorL1_Execute,
@@ -1731,7 +1731,7 @@ static actor_method_class l_daMBdoorL1_Method = {
(process_method_func)daMBdoorL1_Draw,
};
actor_process_profile_definition g_profile_L1MBOSS_DOOR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L1MBOSS_DOOR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+5 -5
View File
@@ -74,9 +74,9 @@ void daDoorPush_c::setBaseMtx() {
}
}
static char* l_arcName = "V_OsuDoor";
static DUSK_CONST char* l_arcName = "V_OsuDoor";
static cull_box l_cull_box = {
static DUSK_CONSTEXPR cull_box l_cull_box = {
{-600.0f, 0.0f, -600.0f},
{600.0f, 1000.0f, 600.0f},
};
@@ -233,7 +233,7 @@ void daDoorPush_c::actionEvent() {
}
int daDoorPush_c::demoProc() {
static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"};
static DUSK_CONST char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"};
daPy_py_c* player = daPy_getPlayerActorClass();
@@ -364,13 +364,13 @@ static int daDoorPush_MoveBGDraw(daDoorPush_c* i_this) {
return i_this->MoveBGDraw();
}
static actor_method_class daDoorPush_METHODS = {
static DUSK_CONST actor_method_class daDoorPush_METHODS = {
(process_method_func)daDoorPush_create1st, (process_method_func)daDoorPush_MoveBGDelete,
(process_method_func)daDoorPush_MoveBGExecute, (process_method_func)NULL,
(process_method_func)daDoorPush_MoveBGDraw,
};
actor_process_profile_definition g_profile_PushDoor = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_PushDoor = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+21 -21
View File
@@ -25,7 +25,7 @@
#include <dusk/autosave.h>
#endif
char* daDoor20_c::getStopBmdName() {
char DUSK_CONST* daDoor20_c::getStopBmdName() {
switch (door_param2_c::getKind(this)) {
case 3:
case 11:
@@ -38,11 +38,11 @@ J3DModelData* daDoor20_c::getStopModelData() {
return (J3DModelData*)dComIfG_getStageRes(getStopBmdName());
}
char* daDoor20_c::getAlwaysArcName() {
char DUSK_CONST* daDoor20_c::getAlwaysArcName() {
return "static";
}
char* daDoor20_c::getArcName() {
char DUSK_CONST* daDoor20_c::getArcName() {
switch (door_param2_c::getKind(this)) {
default:
return "DoorT00";
@@ -59,7 +59,7 @@ char* daDoor20_c::getArcName() {
}
}
char* daDoor20_c::getBmdName() {
char DUSK_CONST* daDoor20_c::getBmdName() {
static char bmdName[32];
switch(door_param2_c::getKind(this)) {
case 0:
@@ -77,11 +77,11 @@ char* daDoor20_c::getBmdName() {
return bmdName;
}
char* daDoor20_c::getBtk() {
char DUSK_CONST* daDoor20_c::getBtk() {
return "door-shutter_00.btk";
}
char* daDoor20_c::getDzbName() {
char DUSK_CONST* daDoor20_c::getDzbName() {
switch(door_param2_c::getKind(this)) {
case 0:
case 1:
@@ -1549,7 +1549,7 @@ void daDoor20_c::startDemoProc() {
}
void daDoor20_c::makeEventId() {
static char* table[19] = {
static DUSK_CONSTEXPR char DUSK_CONST* table[19] = {
"DEFAULT_STOP_OPEN",
"DEFAULT_STOP_OPEN",
NULL,
@@ -1571,49 +1571,49 @@ void daDoor20_c::makeEventId() {
NULL,
};
static char* tate_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* tate_table[4] = {
"DEFAULT_SHUTTER_DOOR_10",
"DEFAULT_SHUTTER_DOOR_10",
"DEFAULT_SHUTTER_DOOR_F_STOP",
"DEFAULT_SHUTTER_DOOR_F_STOP",
};
static char* tate_w_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* tate_w_table[4] = {
"WOLF_SHUTTER_DOOR_10",
"WOLF_SHUTTER_DOOR_10",
"WOLF_SHUTTER_DOOR_F_STOP",
"WOLF_SHUTTER_DOOR_F_STOP",
};
static char* yoko_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* yoko_table[4] = {
"DEFAULT_SHUTTER_DOOR_14",
"DEFAULT_SHUTTER_DOOR_14",
"DEFAULT_SHUTTER_DOOR_F_STOP_14",
"DEFAULT_SHUTTER_DOOR_F_STOP_14",
};
static char* yoko_w_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* yoko_w_table[4] = {
"WOLF_SHUTTER_DOOR_14",
"WOLF_SHUTTER_DOOR_14",
"WOLF_SHUTTER_DOOR_F_STOP_14",
"WOLF_SHUTTER_DOOR_F_STOP_14",
};
static char* lv8_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* lv8_table[4] = {
"DEFAULT_SHUTTER_DOOR_18",
"DEFAULT_SHUTTER_DOOR_18",
"DEFAULT_SHUTTER_DOOR_F_STOP_18",
"DEFAULT_SHUTTER_DOOR_F_STOP_18",
};
static char* lv8_w_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* lv8_w_table[4] = {
"WOLF_SHUTTER_DOOR_18",
"WOLF_SHUTTER_DOOR_18",
"WOLF_SHUTTER_DOOR_F_STOP_18",
"WOLF_SHUTTER_DOOR_F_STOP_18",
};
static char* knob_table[7] = {
static DUSK_CONSTEXPR char DUSK_CONST* knob_table[7] = {
"DEFAULT_KNOB_DOOR_F",
"DEFAULT_KNOB_DOOR_B",
"DEFAULT_KNOB_DOOR_F_STOP",
@@ -1623,28 +1623,28 @@ void daDoor20_c::makeEventId() {
"DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F",
};
static char* lv7_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* lv7_table[4] = {
"DEFAULT_SHUTTER_DOOR_20",
"DEFAULT_SHUTTER_DOOR_20",
"DEFAULT_SHUTTER_DOOR_F_STOP_20",
"DEFAULT_SHUTTER_DOOR_F_STOP_20",
};
static char* lv7_w_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* lv7_w_table[4] = {
"WOLF_SHUTTER_DOOR_20",
"WOLF_SHUTTER_DOOR_20",
"WOLF_SHUTTER_DOOR_F_STOP_20",
"WOLF_SHUTTER_DOOR_F_STOP_20",
};
static char* lv9_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* lv9_table[4] = {
"DEFAULT_SHUTTER_DOOR_22",
"DEFAULT_SHUTTER_DOOR_22",
"DEFAULT_SHUTTER_DOOR_F_STOP_22",
"DEFAULT_SHUTTER_DOOR_F_STOP_22",
};
static char* lv9_w_table[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* lv9_w_table[4] = {
"WOLF_SHUTTER_DOOR_22",
"WOLF_SHUTTER_DOOR_22",
"WOLF_SHUTTER_DOOR_F_STOP_22",
@@ -1855,7 +1855,7 @@ void daDoor20_c::getRestartPos(cXyz* param_1) {
}
int daDoor20_c::getDemoAction() {
static char* action_table[29] = {
static DUSK_CONSTEXPR char DUSK_CONST* action_table[29] = {
"WAIT",
"STOP_OPEN",
"STOP_CLOSE",
@@ -2164,13 +2164,13 @@ static int daDoor20_Create(fopAc_ac_c* i_this) {
return static_cast<daDoor20_c*>(i_this)->create();
}
static actor_method_class l_daDoor20_Method = {
static DUSK_CONST actor_method_class l_daDoor20_Method = {
(process_method_func)daDoor20_Create, (process_method_func)daDoor20_Delete,
(process_method_func)daDoor20_Execute, (process_method_func)NULL,
(process_method_func)daDoor20_Draw,
};
actor_process_profile_definition g_profile_DOOR20 = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DOOR20 = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -432,7 +432,7 @@ void daSpiral_c::initOpenDemo(int param_0) {
}
int daSpiral_c::getDemoAction() {
static char* action_table[] = {
static DUSK_CONSTEXPR char DUSK_CONST* action_table[] = {
"WAIT",
"START",
"SETGOAL",
@@ -1178,7 +1178,7 @@ int daSpiral_Create(fopAc_ac_c* i_this) {
return a_this->create();
}
static actor_method_class l_daSpiral_Method = {
static DUSK_CONST actor_method_class l_daSpiral_Method = {
(process_method_func)daSpiral_Create, (process_method_func)daSpiral_Delete,
(process_method_func)daSpiral_Execute, (process_method_func)NULL,
(process_method_func)daSpiral_Draw,
@@ -1191,7 +1191,7 @@ static actor_method_class l_daSpiral_Method = {
#define DASPIRAL_METHODS NULL
#endif
actor_process_profile_definition g_profile_SPIRAL_DOOR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SPIRAL_DOOR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -9,7 +9,7 @@
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Instances.h"
static char* l_arcName[] = {
static DUSK_CONST char* l_arcName[] = {
"K_tetd",
"S_bsaku00",
"S_lv7saku",
@@ -247,13 +247,13 @@ static int daDsh_Create(fopAc_ac_c* i_this) {
return static_cast<daDsh_c*>(i_this)->create();
}
static actor_method_class l_daDsh_Method = {
static DUSK_CONST actor_method_class l_daDsh_Method = {
(process_method_func)daDsh_Create, (process_method_func)daDsh_Delete,
(process_method_func)daDsh_Execute, (process_method_func)daDsh_IsDelete,
(process_method_func)daDsh_Draw,
};
actor_process_profile_definition2 g_profile_DSHUTTER = {
DUSK_PROFILE actor_process_profile_definition2 DUSK_CONST g_profile_DSHUTTER = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -71,7 +71,7 @@ void e_ai_class::initCcCylinder() {
m_ccShieldSph.SetStts(&m_ccShieldStts);
m_ccShieldSph.OnCoSetBit();
static dCcD_SrcCyl cc_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xdafbf9ff, 0x43}, 0x75}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -942,7 +942,7 @@ static int daE_AI_Create(fopAc_ac_c* i_this) {
return ((e_ai_class*)i_this)->Create();
}
static actor_method_class l_daE_AI_Method = {
static DUSK_CONST actor_method_class l_daE_AI_Method = {
(process_method_func)daE_AI_Create,
(process_method_func)daE_AI_Delete,
(process_method_func)daE_AI_Execute,
@@ -950,7 +950,7 @@ static actor_method_class l_daE_AI_Method = {
(process_method_func)daE_AI_Draw,
};
actor_process_profile_definition g_profile_E_AI = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_AI = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -769,13 +769,13 @@ static int daE_ARROW_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_ARROW_Method = {
static DUSK_CONST actor_method_class l_daE_ARROW_Method = {
(process_method_func)daE_ARROW_Create, (process_method_func)daE_ARROW_Delete,
(process_method_func)daE_ARROW_Execute, (process_method_func)daE_ARROW_IsDelete,
(process_method_func)daE_ARROW_Draw,
};
actor_process_profile_definition g_profile_E_ARROW = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_ARROW = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
+4 -4
View File
@@ -990,9 +990,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) {
static char* arc_name[3] = {"E_ba", "E_fb", "E_ib"};
static DUSK_CONST char* arc_name[3] = {"E_ba", "E_fb", "E_ib"};
static dCcD_SrcSph cc_sph_src = {
static DUSK_CONSTEXPR dCcD_SrcSph cc_sph_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
{dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -1096,7 +1096,7 @@ static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) {
return step;
}
static actor_method_class l_daE_BA_Method = {
static DUSK_CONST actor_method_class l_daE_BA_Method = {
(process_method_func)daE_BA_Create,
(process_method_func)daE_BA_Delete,
(process_method_func)daE_BA_Execute,
@@ -1104,7 +1104,7 @@ static actor_method_class l_daE_BA_Method = {
(process_method_func)daE_BA_Draw,
};
actor_process_profile_definition g_profile_E_BA = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BA = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -762,7 +762,7 @@ static cPhs_Step daE_Bee_Create(fopAc_ac_c* i_this) {
_this->mCounter = fopAcM_GetID(i_this);
_this->mCcStts.Init(0, 0, i_this);
static dCcD_SrcCyl cc_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x410022, 0x23}, 0x0}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -807,7 +807,7 @@ static cPhs_Step daE_Bee_Create(fopAc_ac_c* i_this) {
return step;
}
static actor_method_class l_daE_Bee_Method = {
static DUSK_CONST actor_method_class l_daE_Bee_Method = {
(process_method_func)daE_Bee_Create,
(process_method_func)daE_Bee_Delete,
(process_method_func)daE_Bee_Execute,
@@ -815,7 +815,7 @@ static actor_method_class l_daE_Bee_Method = {
(process_method_func)daE_Bee_Draw,
};
actor_process_profile_definition g_profile_E_BEE = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BEE = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1429,7 +1429,7 @@ static int daE_BG_Create(daE_BG_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_BG_Method = {
static DUSK_CONST actor_method_class l_daE_BG_Method = {
(process_method_func)daE_BG_Create,
(process_method_func)daE_BG_Delete,
(process_method_func)daE_BG_Execute,
@@ -1437,7 +1437,7 @@ static actor_method_class l_daE_BG_Method = {
(process_method_func)daE_BG_Draw,
};
actor_process_profile_definition g_profile_E_BG = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BG = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -908,7 +908,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) {
actor->health = 30;
actor->field_0x560 = 30;
static dCcD_SrcCyl cc_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x79}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -987,7 +987,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) {
AUDIO_INSTANCES;
static actor_method_class l_daE_BI_Method = {
static DUSK_CONST actor_method_class l_daE_BI_Method = {
(process_method_func)daE_BI_Create,
(process_method_func)daE_BI_Delete,
(process_method_func)daE_BI_Execute,
@@ -995,7 +995,7 @@ static actor_method_class l_daE_BI_Method = {
(process_method_func)daE_BI_Draw,
};
actor_process_profile_definition g_profile_E_BI = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BI = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 9,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -116,13 +116,13 @@ static int daE_BI_LEAF_Create(fopAc_ac_c* actor) {
return phase_state;
}
static actor_method_class l_daE_BI_LEAF_Method = {
static DUSK_CONST actor_method_class l_daE_BI_LEAF_Method = {
(process_method_func)daE_BI_LEAF_Create, (process_method_func)daE_BI_LEAF_Delete,
(process_method_func)daE_BI_LEAF_Execute, (process_method_func)daE_BI_LEAF_IsDelete,
(process_method_func)daE_BI_LEAF_Draw,
};
actor_process_profile_definition g_profile_E_BI_LEAF = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BI_LEAF = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 9,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -920,7 +920,7 @@ static int daE_BS_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_BS_Method = {
static DUSK_CONST actor_method_class l_daE_BS_Method = {
(process_method_func)daE_BS_Create,
(process_method_func)daE_BS_Delete,
(process_method_func)daE_BS_Execute,
@@ -928,7 +928,7 @@ static actor_method_class l_daE_BS_Method = {
(process_method_func)daE_BS_Draw,
};
actor_process_profile_definition g_profile_E_BS = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BS = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1128,7 +1128,7 @@ static int daE_BU_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_BU_Method = {
static DUSK_CONST actor_method_class l_daE_BU_Method = {
(process_method_func)daE_BU_Create,
(process_method_func)daE_BU_Delete,
(process_method_func)daE_BU_Execute,
@@ -1136,7 +1136,7 @@ static actor_method_class l_daE_BU_Method = {
(process_method_func)daE_BU_Draw,
};
actor_process_profile_definition g_profile_E_BU = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BU = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -893,7 +893,7 @@ static cPhs_Step daE_Bug_Create(fopAc_ac_c* a_this) {
AUDIO_INSTANCES;
static actor_method_class l_daE_Bug_Method = {
static DUSK_CONST actor_method_class l_daE_Bug_Method = {
(process_method_func)daE_Bug_Create,
(process_method_func)daE_Bug_Delete,
(process_method_func)daE_Bug_Execute,
@@ -901,7 +901,7 @@ static actor_method_class l_daE_Bug_Method = {
(process_method_func)daE_Bug_Draw,
};
actor_process_profile_definition g_profile_E_BUG = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BUG = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -537,7 +537,7 @@ static int daE_CR_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_CR_Method = {
static DUSK_CONST actor_method_class l_daE_CR_Method = {
(process_method_func)daE_CR_Create,
(process_method_func)daE_CR_Delete,
(process_method_func)daE_CR_Execute,
@@ -545,7 +545,7 @@ static actor_method_class l_daE_CR_Method = {
(process_method_func)daE_CR_Draw,
};
actor_process_profile_definition g_profile_E_CR = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_CR = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -215,7 +215,7 @@ static int daE_CR_EGG_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_CR_EGG_Method = {
static DUSK_CONST actor_method_class l_daE_CR_EGG_Method = {
(process_method_func)daE_CR_EGG_Create,
(process_method_func)daE_CR_EGG_Delete,
(process_method_func)daE_CR_EGG_Execute,
@@ -223,7 +223,7 @@ static actor_method_class l_daE_CR_EGG_Method = {
(process_method_func)daE_CR_EGG_Draw,
};
actor_process_profile_definition g_profile_E_CR_EGG = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_CR_EGG = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -2228,7 +2228,7 @@ static int daE_DB_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_DB_Method = {
static DUSK_CONST actor_method_class l_daE_DB_Method = {
(process_method_func)daE_DB_Create,
(process_method_func)daE_DB_Delete,
(process_method_func)daE_DB_Execute,
@@ -2236,7 +2236,7 @@ static actor_method_class l_daE_DB_Method = {
(process_method_func)daE_DB_Draw,
};
actor_process_profile_definition g_profile_E_DB = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DB = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -59,7 +59,7 @@ static int daE_DB_LEAF_Create(fopAc_ac_c* i_this) {
return ret;
}
static actor_method_class l_daE_DB_LEAF_Method = {
static DUSK_CONST actor_method_class l_daE_DB_LEAF_Method = {
(process_method_func)daE_DB_LEAF_Create,
(process_method_func)daE_DB_LEAF_Delete,
(process_method_func)daE_DB_LEAF_Execute,
@@ -67,7 +67,7 @@ static actor_method_class l_daE_DB_LEAF_Method = {
(process_method_func)daE_DB_LEAF_Draw,
};
actor_process_profile_definition g_profile_E_DB_LEAF = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DB_LEAF = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+1 -1
View File
@@ -1783,7 +1783,7 @@ actor_method_class l_daE_DD_Method = {
(process_method_func)daE_DD_Draw,
};
actor_process_profile_definition g_profile_E_DD = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DD = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -711,13 +711,13 @@ static int daE_DF_Create(fopAc_ac_c* i_this) {
return a_this->Create();
}
static actor_method_class l_daE_DF_Method = {
static DUSK_CONST actor_method_class l_daE_DF_Method = {
(process_method_func)daE_DF_Create, (process_method_func)daE_DF_Delete,
(process_method_func)daE_DF_Execute, (process_method_func)daE_DF_IsDelete,
(process_method_func)daE_DF_Draw,
};
actor_process_profile_definition g_profile_E_DF = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DF = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1073,7 +1073,7 @@ static int daE_DK_Create(daE_DK_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_DK_Method = {
static DUSK_CONST actor_method_class l_daE_DK_Method = {
(process_method_func)daE_DK_Create,
(process_method_func)daE_DK_Delete,
(process_method_func)daE_DK_Execute,
@@ -1081,7 +1081,7 @@ static actor_method_class l_daE_DK_Method = {
(process_method_func)daE_DK_Draw,
};
actor_process_profile_definition g_profile_E_DK = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DK = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -3506,7 +3506,7 @@ e_dn_class::e_dn_class() {}
AUDIO_INSTANCES;
static actor_method_class l_daE_DN_Method = {
static DUSK_CONST actor_method_class l_daE_DN_Method = {
(process_method_func)daE_DN_Create,
(process_method_func)daE_DN_Delete,
(process_method_func)daE_DN_Execute,
@@ -3514,7 +3514,7 @@ static actor_method_class l_daE_DN_Method = {
(process_method_func)daE_DN_Draw,
};
actor_process_profile_definition g_profile_E_DN = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DN = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -2558,7 +2558,7 @@ static cPhs_Step daE_DT_Create(daE_DT_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_DT_Method = {
static DUSK_CONST actor_method_class l_daE_DT_Method = {
(process_method_func)daE_DT_Create,
(process_method_func)daE_DT_Delete,
(process_method_func)daE_DT_Execute,
@@ -2566,7 +2566,7 @@ static actor_method_class l_daE_DT_Method = {
(process_method_func)daE_DT_Draw,
};
actor_process_profile_definition g_profile_E_DT = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DT = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -993,7 +993,7 @@ static int daE_FB_Create(daE_FB_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_FB_Method = {
static DUSK_CONST actor_method_class l_daE_FB_Method = {
(process_method_func)daE_FB_Create,
(process_method_func)daE_FB_Delete,
(process_method_func)daE_FB_Execute,
@@ -1001,7 +1001,7 @@ static actor_method_class l_daE_FB_Method = {
(process_method_func)daE_FB_Draw,
};
actor_process_profile_definition g_profile_E_FB = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FB = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -803,7 +803,7 @@ static int daE_FK_Create(fopAc_ac_c* i_this) {
AUDIO_INSTANCES
static actor_method_class l_daE_FK_Method = {
static DUSK_CONST actor_method_class l_daE_FK_Method = {
(process_method_func)daE_FK_Create,
(process_method_func)daE_FK_Delete,
(process_method_func)daE_FK_Execute,
@@ -811,7 +811,7 @@ static actor_method_class l_daE_FK_Method = {
(process_method_func)daE_FK_Draw,
};
actor_process_profile_definition g_profile_E_FK = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FK = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -3880,7 +3880,7 @@ static int daE_FM_Create(fopAc_ac_c* i_this) {
e_fm_class::e_fm_class() {}
static actor_method_class l_daE_FM_Method = {
static DUSK_CONST actor_method_class l_daE_FM_Method = {
(process_method_func)daE_FM_Create,
(process_method_func)daE_FM_Delete,
(process_method_func)daE_FM_Execute,
@@ -3888,7 +3888,7 @@ static actor_method_class l_daE_FM_Method = {
(process_method_func)daE_FM_Draw,
};
actor_process_profile_definition g_profile_E_FM = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FM = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -787,7 +787,7 @@ static cPhs_Step daE_Fs_Create(fopAc_ac_c* i_this) {
_this->mAtInfo.mpSound = &_this->mCreatureSound;
_this->mAtInfo.field_0x18 = 0x25;
static dCcD_SrcCyl cc_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -844,7 +844,7 @@ static cPhs_Step daE_Fs_Create(fopAc_ac_c* i_this) {
AUDIO_INSTANCES;
static actor_method_class l_daE_Fs_Method = {
static DUSK_CONST actor_method_class l_daE_Fs_Method = {
(process_method_func)daE_Fs_Create,
(process_method_func)daE_Fs_Delete,
(process_method_func)daE_Fs_Execute,
@@ -852,7 +852,7 @@ static actor_method_class l_daE_Fs_Method = {
(process_method_func)daE_Fs_Draw,
};
actor_process_profile_definition g_profile_E_FS = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FS = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1039,13 +1039,13 @@ static int daE_FZ_Create(daE_FZ_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_FZ_Method = {
static DUSK_CONST actor_method_class l_daE_FZ_Method = {
(process_method_func)daE_FZ_Create, (process_method_func)daE_FZ_Delete,
(process_method_func)daE_FZ_Execute, (process_method_func)daE_FZ_IsDelete,
(process_method_func)daE_FZ_Draw,
};
actor_process_profile_definition g_profile_E_FZ = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FZ = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -256,7 +256,7 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_Ga_Method = {
static DUSK_CONST actor_method_class l_daE_Ga_Method = {
(process_method_func)daE_Ga_Create,
(process_method_func)daE_Ga_Delete,
(process_method_func)daE_Ga_Execute,
@@ -264,7 +264,7 @@ static actor_method_class l_daE_Ga_Method = {
(process_method_func)daE_Ga_Draw,
};
actor_process_profile_definition g_profile_E_GA = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GA = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -1632,7 +1632,7 @@ static cPhs_Step daE_GB_Create(fopAc_ac_c* actor) {
} // mSphAttr
};
static dCcD_SrcCyl body_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl body_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x79}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -1721,7 +1721,7 @@ static cPhs_Step daE_GB_Create(fopAc_ac_c* actor) {
e_gb_class::e_gb_class() {}
static actor_method_class l_daE_GB_Method = {
static DUSK_CONST actor_method_class l_daE_GB_Method = {
(process_method_func)daE_GB_Create,
(process_method_func)daE_GB_Delete,
(process_method_func)daE_GB_Execute,
@@ -1729,7 +1729,7 @@ static actor_method_class l_daE_GB_Method = {
(process_method_func)daE_GB_Draw,
};
actor_process_profile_definition g_profile_E_GB = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GB = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1370,13 +1370,13 @@ static int daE_GE_Create(daE_GE_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_GE_Method = {
static DUSK_CONST actor_method_class l_daE_GE_Method = {
(process_method_func)daE_GE_Create, (process_method_func)daE_GE_Delete,
(process_method_func)daE_GE_Execute, (process_method_func)daE_GE_IsDelete,
(process_method_func)daE_GE_Draw,
};
actor_process_profile_definition g_profile_E_GE = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GE = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1103,7 +1103,7 @@ static int daE_GI_Create(daE_GI_c* a_this) {
return a_this->create();
}
static actor_method_class l_daE_GI_Method = {
static DUSK_CONST actor_method_class l_daE_GI_Method = {
(process_method_func)daE_GI_Create,
(process_method_func)daE_GI_Delete,
(process_method_func)daE_GI_Execute,
@@ -1111,7 +1111,7 @@ static actor_method_class l_daE_GI_Method = {
(process_method_func)daE_GI_Draw,
};
actor_process_profile_definition g_profile_E_GI = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GI = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1815,7 +1815,7 @@ static int daE_GM_Create(daE_GM_c* i_this) {
AUDIO_INSTANCES;
static actor_method_class l_daE_GM_Method = {
static DUSK_CONST actor_method_class l_daE_GM_Method = {
(process_method_func)daE_GM_Create,
(process_method_func)daE_GM_Delete,
(process_method_func)daE_GM_Execute,
@@ -1823,7 +1823,7 @@ static actor_method_class l_daE_GM_Method = {
(process_method_func)daE_GM_Draw,
};
actor_process_profile_definition g_profile_E_GM = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GM = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -2394,7 +2394,7 @@ static int daE_GOB_Create(fopAc_ac_c* i_this) {
e_gob_class::e_gob_class() {}
static actor_method_class l_daE_GOB_Method = {
static DUSK_CONST actor_method_class l_daE_GOB_Method = {
(process_method_func)daE_GOB_Create,
(process_method_func)daE_GOB_Delete,
(process_method_func)daE_GOB_Execute,
@@ -2402,7 +2402,7 @@ static actor_method_class l_daE_GOB_Method = {
(process_method_func)daE_GOB_Draw,
};
actor_process_profile_definition g_profile_E_GOB = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GOB = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -224,7 +224,7 @@ static int daE_GS_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_GS_Method = {
static DUSK_CONST actor_method_class l_daE_GS_Method = {
(process_method_func)daE_GS_Create,
(process_method_func)daE_GS_Delete,
(process_method_func)daE_GS_Execute,
@@ -232,7 +232,7 @@ static actor_method_class l_daE_GS_Method = {
(process_method_func)daE_GS_Draw,
};
actor_process_profile_definition g_profile_E_GS = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GS = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1533,7 +1533,7 @@ static int daE_HB_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_HB_Method = {
static DUSK_CONST actor_method_class l_daE_HB_Method = {
(process_method_func)daE_HB_Create,
(process_method_func)daE_HB_Delete,
(process_method_func)daE_HB_Execute,
@@ -1541,7 +1541,7 @@ static actor_method_class l_daE_HB_Method = {
(process_method_func)daE_HB_Draw,
};
actor_process_profile_definition g_profile_E_HB = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HB = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -80,13 +80,13 @@ static int daE_HB_LEAF_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_HB_LEAF_Method = {
static DUSK_CONST actor_method_class l_daE_HB_LEAF_Method = {
(process_method_func)daE_HB_LEAF_Create, (process_method_func)daE_HB_LEAF_Delete,
(process_method_func)daE_HB_LEAF_Execute, (process_method_func)daE_HB_LEAF_IsDelete,
(process_method_func)daE_HB_LEAF_Draw,
};
actor_process_profile_definition g_profile_E_HB_LEAF = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HB_LEAF = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1594,7 +1594,7 @@ static int daE_HM_Create(fopAc_ac_c* i_this) {
AUDIO_INSTANCES
static actor_method_class l_daE_HM_Method = {
static DUSK_CONST actor_method_class l_daE_HM_Method = {
(process_method_func)daE_HM_Create,
(process_method_func)daE_HM_Delete,
(process_method_func)daE_HM_Execute,
@@ -1602,7 +1602,7 @@ static actor_method_class l_daE_HM_Method = {
(process_method_func)daE_HM_Draw,
};
actor_process_profile_definition g_profile_E_HM = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HM = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1323,13 +1323,13 @@ static int daE_HP_Create(daE_HP_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_HP_Method = {
static DUSK_CONST actor_method_class l_daE_HP_Method = {
(process_method_func)daE_HP_Create, (process_method_func)daE_HP_Delete,
(process_method_func)daE_HP_Execute, (process_method_func)daE_HP_IsDelete,
(process_method_func)daE_HP_Draw,
};
actor_process_profile_definition g_profile_E_HP = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HP = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -2104,13 +2104,13 @@ static int daE_HZ_Create(daE_HZ_c* i_this) {
return i_this->create();
}
static actor_method_class l_daE_HZ_Method = {
static DUSK_CONST actor_method_class l_daE_HZ_Method = {
(process_method_func)daE_HZ_Create, (process_method_func)daE_HZ_Delete,
(process_method_func)daE_HZ_Execute, (process_method_func)daE_HZ_IsDelete,
(process_method_func)daE_HZ_Draw,
};
actor_process_profile_definition g_profile_E_HZ = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HZ = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+2 -2
View File
@@ -1526,7 +1526,7 @@ static int daE_HZELDA_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_HZELDA_Method = {
static DUSK_CONST actor_method_class l_daE_HZELDA_Method = {
(process_method_func)daE_HZELDA_Create,
(process_method_func)daE_HZELDA_Delete,
(process_method_func)daE_HZELDA_Execute,
@@ -1534,7 +1534,7 @@ static actor_method_class l_daE_HZELDA_Method = {
(process_method_func)daE_HZELDA_Draw,
};
actor_process_profile_definition g_profile_E_HZELDA = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HZELDA = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
+3 -3
View File
@@ -683,7 +683,7 @@ static int daE_IS_Create(fopAc_ac_c* i_this) {
} // mSphAttr
};
static dCcD_SrcCyl cc_cyl_src = {
static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -746,7 +746,7 @@ static int daE_IS_Create(fopAc_ac_c* i_this) {
return phase_state;
}
static actor_method_class l_daE_IS_Method = {
static DUSK_CONST actor_method_class l_daE_IS_Method = {
(process_method_func)daE_IS_Create,
(process_method_func)daE_IS_Delete,
(process_method_func)daE_IS_Execute,
@@ -754,7 +754,7 @@ static actor_method_class l_daE_IS_Method = {
(process_method_func)daE_IS_Draw,
};
actor_process_profile_definition g_profile_E_IS = {
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_IS = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,

Some files were not shown because too many files have changed in this diff Show More