mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-02 16:16:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://github.com/TwilitRealm/dusklight into jpn

Browse Source
This commit is contained in:
TakaRikka
2026-07-16 15:09:23 -07:00
parent 1a7c853d9b 1bae8a5e6a
commit 6058a0c597
1815 changed files with 43740 additions and 14076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_L7demo_dr.cpp
+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,
src/d/actor/d_a_L7low_dr.cpp
+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,
src/d/actor/d_a_L7op_demo_dr.cpp
+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,
src/d/actor/d_a_alink.cpp
+73 -44
View File
@@ -57,6 +57,7 @@
#include "dusk/settings.h"
#include "res/Object/Alink.h"
#include <cstring>
#include <helpers/string.hpp>
#endif
static int daAlink_Create(fopAc_ac_c* i_this);
@@ -112,31 +113,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 };
@@ -216,7 +217,7 @@ static s16 const l_insectNameList[12] = {
f32 l_jumpTop;
#endif
daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
DUSK_GAME_DATA daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
{dRes_ID_ALANM_BCK_ATRFWS_e, dRes_ID_ALANM_BCK_ATRFWS_e},
{dRes_ID_ALANM_BCK_ATRFDS_e, dRes_ID_ALANM_BCK_ATRFDS_e},
{dRes_ID_ALANM_BCK_ATBW_e, dRes_ID_ALANM_BCK_ATLS_e},
@@ -239,7 +240,7 @@ daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
{dRes_ID_ALANM_BCK_DASHS_e, dRes_ID_ALANM_BCK_ATLS_e},
};
daAlink_BckData const daAlink_c::m_mainBckSword[5] = {
DUSK_GAME_DATA daAlink_BckData const daAlink_c::m_mainBckSword[5] = {
{dRes_ID_ALANM_BCK_ATL_e, dRes_ID_ALANM_BCK_ATL_e},
{dRes_ID_ALANM_BCK_ATR_e, dRes_ID_ALANM_BCK_ATR_e},
{dRes_ID_ALANM_BCK_WALKS_e, dRes_ID_ALANM_BCK_WALKS_e},
@@ -247,7 +248,7 @@ daAlink_BckData const daAlink_c::m_mainBckSword[5] = {
{dRes_ID_ALANM_BCK_SWIMWAIT_e, dRes_ID_ALANM_BCK_SWIMWAITS_e},
};
daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
DUSK_GAME_DATA daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
{dRes_ID_ALANM_BCK_ATRFWS_e, dRes_ID_ALANM_BCK_WALKFISHR_e},
{dRes_ID_ALANM_BCK_ATRFDS_e, dRes_ID_ALANM_BCK_DASHFISHR_e},
{dRes_ID_ALANM_BCK_ATBW_e, dRes_ID_ALANM_BCK_WALKFISHR_e},
@@ -278,7 +279,7 @@ daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
{dRes_ID_ALANM_BCK_WAITBTOA_e, dRes_ID_ALANM_BCK_WALKFISHR_e},
};
daAlink_AnmData const daAlink_c::m_anmDataTable[daAlink_c::ANM_MAX] = {
DUSK_GAME_DATA daAlink_AnmData const daAlink_c::m_anmDataTable[daAlink_c::ANM_MAX] = {
{dRes_ID_ALANM_BCK_ATRFWS_e, dRes_ID_ALANM_BCK_ATRFW_e, 0xFE, 0xFE, FTANM_0, dRes_ID_ALANM_BCK_FAT_e, 0x0},
{dRes_ID_ALANM_BCK_ATRFDS_e, dRes_ID_ALANM_BCK_ATRFD_e, 0xFE, 0xFE, FTANM_0, dRes_ID_ALANM_BCK_FAT_e, 0x0},
{dRes_ID_ALANM_BCK_ATBW_e, dRes_ID_ALANM_BCK_ATBW_e, 0xFE, 0xFE, FTANM_0, dRes_ID_ALANM_BCK_FAT_e, 0x0},
@@ -695,7 +696,7 @@ daAlink_AnmData const daAlink_c::m_anmDataTable[daAlink_c::ANM_MAX] = {
{dRes_ID_ALANM_BCK_ASHIMOTO_e, dRes_ID_ALANM_BCK_ASHIMOTO_e, 0xFE, 0xFE, FTANM_ASHIMOTO, dRes_ID_ALANM_BCK_FASHIMOTO_e, 0x0},
};
daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[daAlink_c::WANM_MAX] = {
DUSK_GAME_DATA daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[daAlink_c::WANM_MAX] = {
{dRes_ID_ALANM_BCK_WL_WAITA_e, 0x0, 0x1, 10, 40, -1, -1},
{dRes_ID_ALANM_BCK_WL_WALKA_e, 0x0, 0x2, 1, 14, -1, -1},
{dRes_ID_ALANM_BCK_WL_WALKB_e, 0x0, 0x2, 1, 14, -1, -1},
@@ -845,7 +846,7 @@ daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[daAlink_c::WANM_MAX] = {
{0x802B, 0xC, 0xC, -1, -1, -1, -1},
};
daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = {
DUSK_GAME_DATA daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = {
{dRes_ID_ALANM_BTP_FMABA01_e, dRes_ID_ALANM_BTK_FMABA01_e},
{dRes_ID_ALANM_BTP_FMABA02_e, dRes_ID_ALANM_BTK_FMABA02_e},
{dRes_ID_ALANM_BTP_FMABA03_e, dRes_ID_ALANM_BTK_FMABA03_e},
@@ -1011,7 +1012,7 @@ daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = {
{dRes_ID_ALANM_BTP_WL_FC_e, dRes_ID_ALANM_BTK_WL_FA_e},
};
const daAlink_procInitTable daAlink_c::m_procInitTable[] = {
DUSK_GAME_DATA const daAlink_procInitTable daAlink_c::m_procInitTable[] = {
{ &daAlink_c::procPreActionUnequip, 0x21 },
{ &daAlink_c::procServiceWait, 0x10000085 },
{ &daAlink_c::procTiredWait, 0x10001185 },
@@ -1366,7 +1367,7 @@ const daAlink_procInitTable daAlink_c::m_procInitTable[] = {
{ &daAlink_c::procDemoCommon, 0x1 },
};
daAlink_procFunc daAlink_c::m_demoInitTable[] = {
DUSK_GAME_DATA daAlink_procFunc daAlink_c::m_demoInitTable[] = {
NULL,
NULL,
NULL,
@@ -2002,9 +2003,9 @@ daAlinkHIO_cut_c::~daAlinkHIO_cut_c() {}
daAlinkHIO_c::~daAlinkHIO_c() {}
bool daAlink_matAnm_c::m_eye_move_flg;
DUSK_GAME_DATA bool daAlink_matAnm_c::m_eye_move_flg;
u8 daAlink_matAnm_c::m_morf_frame;
DUSK_GAME_DATA u8 daAlink_matAnm_c::m_morf_frame;
void daAlink_matAnm_c::init() {
field_0xf4 = 0.0f;
@@ -5990,7 +5991,7 @@ void daAlink_c::setItemMatrix(int param_0) {
mDoMtx_stack_c::XrotS(-0x8000);
#ifdef TARGET_PC
if (dusk::getSettings().game.enableFrameInterpolation) {
if (dusk::frame_interp::is_enabled()) {
Mtx boot_mtx;
mDoMtx_concat(mpLinkModel->getAnmMtx(0x18), mDoMtx_stack_c::get(), boot_mtx);
mpLinkBootModels[1]->setAnmMtx(1, boot_mtx);
@@ -12733,7 +12734,19 @@ void daAlink_c::setMagicArmorBrk(int i_status) {
BOOL daAlink_c::checkMagicArmorHeavy() const {
#if TARGET_PC
return checkMagicArmorWearAbility() && (dComIfGs_getRupee() == 0 && !dusk::getSettings().game.freeMagicArmor);
if(!checkMagicArmorWearAbility()) {
return false;
}
switch(dusk::getSettings().game.armorRupeeDrain) {
case dusk::MagicArmorMode::NORMAL:
return dComIfGs_getRupee() == 0;
case dusk::MagicArmorMode::ON_DAMAGE:
case dusk::MagicArmorMode::DOUBLE_DEFENSE:
case dusk::MagicArmorMode::INVINCIBLE:
case dusk::MagicArmorMode::COSMETIC:
return false;
}
#else
return checkMagicArmorWearAbility() && dComIfGs_getRupee() == 0;
#endif
@@ -14795,6 +14808,8 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) {
#if TARGET_PC
mIBChainInterpPrevValid = false;
mIBChainInterpCurrValid = false;
mHsChainInterpPrevValid = false;
mHsChainInterpCurrValid = false;
#endif
field_0x0774 = NULL;
field_0x0778 = NULL;
@@ -18706,7 +18721,7 @@ int daAlink_c::execute() {
#if TARGET_PC
// This handles rupee drain and transitions between rupees/no rupees
// We can skip all of that if the magic armor doesn't use rupees
if (!dusk::getSettings().game.freeMagicArmor && checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
if (dusk::getSettings().game.armorRupeeDrain.getValue() == dusk::MagicArmorMode::NORMAL && checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
#else
if (checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
#endif
@@ -19767,23 +19782,37 @@ int daAlink_c::draw() {
dComIfGd_getOpaListDark()->entryImm(mpHookChain, 0);
#if TARGET_PC
if (dusk::getSettings().game.enableFrameInterpolation &&
mEquipItem == dItemNo_IRONBALL_e &&
mIronBallChainPos != NULL && mIronBallChainAngle != NULL)
{
if (mIBChainInterpCurrValid) {
memcpy(mIBChainInterpPrevPos, mIBChainInterpCurrPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
memcpy(mIBChainInterpPrevAngle, mIBChainInterpCurrAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
mIBChainInterpPrevHandRoot = mIBChainInterpCurrHandRoot;
mIBChainInterpPrevValid = true;
if (dusk::frame_interp::is_enabled()) {
if (mEquipItem == dItemNo_IRONBALL_e &&
mIronBallChainPos != NULL && mIronBallChainAngle != NULL)
{
if (mIBChainInterpCurrValid) {
memcpy(mIBChainInterpPrevPos, mIBChainInterpCurrPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
memcpy(mIBChainInterpPrevAngle, mIBChainInterpCurrAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
mIBChainInterpPrevHandRoot = mIBChainInterpCurrHandRoot;
mIBChainInterpPrevValid = true;
}
memcpy(mIBChainInterpCurrPos, mIronBallChainPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
memcpy(mIBChainInterpCurrAngle, mIronBallChainAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
mIBChainInterpCurrHandRoot = mHookshotTopPos;
mIBChainInterpCurrValid = true;
dusk::frame_interp::add_interpolation_callback(&ironBallChainInterpCallback, this);
} else {
if (mHsChainInterpCurrValid) {
mHsChainInterpPrevTop = mHsChainInterpCurrTop;
mHsChainInterpPrevRoot = mHsChainInterpCurrRoot;
mHsChainInterpPrevSubRoot = mHsChainInterpCurrSubRoot;
mHsChainInterpPrevSubTop = mHsChainInterpCurrSubTop;
mHsChainInterpPrevValid = true;
}
mHsChainInterpCurrTop = mHookshotTopPos;
mHsChainInterpCurrRoot = mHeldItemRootPos;
mHsChainInterpCurrSubRoot = field_0x3810;
mHsChainInterpCurrSubTop = mIronBallBgChkPos;
mHsChainInterpCurrValid = true;
}
memcpy(mIBChainInterpCurrPos, mIronBallChainPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
memcpy(mIBChainInterpCurrAngle, mIronBallChainAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
mIBChainInterpCurrHandRoot = mHookshotTopPos;
mIBChainInterpCurrValid = true;
dusk::frame_interp::add_interpolation_callback(&ironBallChainInterpCallback, this);
}
#endif
}
@@ -19889,13 +19918,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,
src/d/actor/d_a_alink_HIO_data.inc
+112 -112
View File
@@ -1,7 +1,7 @@
#include "d/actor/d_a_alink.h"
// clang-format off
const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
false,
20000,
-10000,
@@ -30,7 +30,7 @@ const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
5000.0f,
};
const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
{
11,
0.7f,
@@ -58,7 +58,7 @@ const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
0.4f,
};
const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
3000,
2000,
6,
@@ -83,7 +83,7 @@ const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
1.3f,
};
const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
3000,
2000,
6,
@@ -108,7 +108,7 @@ const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
2.3f,
};
const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
{
29,
1.1f,
@@ -147,7 +147,7 @@ const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
60.0f,
};
const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
{
9,
0.7f,
@@ -168,7 +168,7 @@ const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
10.0f,
};
const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
{
5,
1.1f,
@@ -205,7 +205,7 @@ const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
10.0f,
};
const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
{
14,
0.75f,
@@ -248,7 +248,7 @@ const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
{
27,
1.2f,
@@ -264,7 +264,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
{
27,
1.2f,
@@ -280,7 +280,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
{
27,
1.2f,
@@ -296,7 +296,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
{
31,
1.1f,
@@ -312,7 +312,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
{
27,
1.1f,
@@ -328,7 +328,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
{
29,
1.0f,
@@ -348,7 +348,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
{
33,
1.0f,
@@ -368,7 +368,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
{
31,
1.1f,
@@ -388,7 +388,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
{
33,
0.9f,
@@ -408,7 +408,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
{
31,
0.9f,
@@ -427,7 +427,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
#pragma pop
#pragma push
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
{
34,
1.1f,
@@ -445,7 +445,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
};
#pragma pop
const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
{
19,
1.0f,
@@ -474,7 +474,7 @@ const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
80.0f,
};
const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
{
17,
1.1f,
@@ -498,7 +498,7 @@ const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
3.0f,
};
const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
{
47,
1.0f,
@@ -548,7 +548,7 @@ const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
{
21,
0.9f,
@@ -564,7 +564,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
{
24,
0.9f,
@@ -580,7 +580,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
{
24,
0.95f,
@@ -596,7 +596,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
{
11,
0.9f,
@@ -610,7 +610,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
};
#pragma pop
const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
{
6,
0.45f,
@@ -643,7 +643,7 @@ const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
{
12,
0.8f,
@@ -658,7 +658,7 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
{
14,
1.0f,
@@ -673,7 +673,7 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
{
14,
1.0f,
@@ -686,7 +686,7 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
};
#pragma pop
const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
{
8,
1.0f,
@@ -729,7 +729,7 @@ const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
10.0f,
};
const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
{
8,
0.9f,
@@ -762,7 +762,7 @@ const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
1.6f,
};
const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
{
29,
1.3f,
@@ -802,7 +802,7 @@ const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
5.0f,
};
const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
{
18,
-1.100f,
@@ -857,7 +857,7 @@ const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
0.0f,
};
const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
{
14,
1.0f,
@@ -873,7 +873,7 @@ const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
{
21,
1.2f,
@@ -888,7 +888,7 @@ const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
};
#pragma pop
const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
{
27,
1.0f,
@@ -906,7 +906,7 @@ const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
25.0f,
};
const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
{
11,
1.0f,
@@ -951,7 +951,7 @@ const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
18.0f,
};
const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
{
9,
1.0f,
@@ -978,7 +978,7 @@ const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
5.0f,
};
const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
{
6,
1.2f,
@@ -1036,7 +1036,7 @@ const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
23.0f,
};
const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
{
8,
0.6f,
@@ -1063,7 +1063,7 @@ const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
7.0f,
};
const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
{
19,
1.0f,
@@ -1095,7 +1095,7 @@ const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
4.0f,
};
const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
{
22,
0.8f,
@@ -1112,7 +1112,7 @@ const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
},
};
const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
0.8f,
1.1f,
3.0f,
@@ -1120,7 +1120,7 @@ const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
3.0f,
};
const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
2,
3,
50.0f,
@@ -1131,7 +1131,7 @@ const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
200.0f,
};
const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
0,
120,
7,
@@ -1153,7 +1153,7 @@ const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
0.75f,
};
const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
{
22,
2.3f,
@@ -1190,7 +1190,7 @@ const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
0.5f,
};
const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
{
49,
0.8f,
@@ -1256,7 +1256,7 @@ const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
0.5f,
};
const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
{
49,
0.8f,
@@ -1322,7 +1322,7 @@ const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
0.5f,
};
const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
{
9,
2.0f,
@@ -1341,7 +1341,7 @@ const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
5000,
};
const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
{
11,
1.2f,
@@ -1367,7 +1367,7 @@ const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
15.0f,
};
const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
{
59,
1.5f,
@@ -1382,7 +1382,7 @@ const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
1.3f,
};
const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
{
22,
1.2f,
@@ -1433,7 +1433,7 @@ const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
15.0f,
};
const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
{
14,
1.0f,
@@ -1471,7 +1471,7 @@ const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
35.0f,
};
const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
{
18,
1.2f,
@@ -1512,7 +1512,7 @@ const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
5.0f,
};
const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
{
23,
1.3f,
@@ -1536,7 +1536,7 @@ const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
0.2f,
};
const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
{
9,
1.0f,
@@ -1572,7 +1572,7 @@ const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
800.0f,
};
const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
{
21,
0.9f,
@@ -1599,7 +1599,7 @@ const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
40.0f,
};
const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
160,
50,
50,
@@ -1624,7 +1624,7 @@ const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
0,
3,
0,
@@ -1639,7 +1639,7 @@ const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
};
#pragma pop
const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
{
30,
1.1f,
@@ -1672,7 +1672,7 @@ const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
0.5f,
};
const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
{
20,
1.2f,
@@ -1689,7 +1689,7 @@ const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
},
};
const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
{
29,
1.1f,
@@ -1713,7 +1713,7 @@ const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
0.7f,
};
const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
{
18,
0.9f,
@@ -1732,7 +1732,7 @@ const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
30.0f,
};
const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
{
9,
2.5f,
@@ -1782,7 +1782,7 @@ const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
50.0f,
};
const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
{
56,
1.15f,
@@ -1848,7 +1848,7 @@ const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
},
};
const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
{
12,
1.0f,
@@ -1885,7 +1885,7 @@ const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
90.0f,
};
const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
{
21,
0.8f,
@@ -1908,7 +1908,7 @@ const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
60.0f,
};
const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
{
19,
1.1f,
@@ -1949,7 +1949,7 @@ const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
0.5f,
};
const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
19,
1.0f,
0.0f,
@@ -1966,7 +1966,7 @@ const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
2000.0f,
};
const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
771,
0,
182,
@@ -1979,7 +1979,7 @@ const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
0.0f,
};
const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
{
12,
1.0f,
@@ -2003,7 +2003,7 @@ const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
1.3f,
};
const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
{
13,
0.8f,
@@ -2038,7 +2038,7 @@ const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
80.0f,
};
const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
{
34,
1.0f,
@@ -2063,7 +2063,7 @@ const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
3.0f,
};
const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
{
4,
0.9f,
@@ -2146,7 +2146,7 @@ const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
0.55f,
};
const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
{
25,
1.0f,
@@ -2224,7 +2224,7 @@ const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
1.3f,
};
const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
{
14,
1.0f,
@@ -2303,7 +2303,7 @@ const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
0.5f,
};
const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
9000,
100,
5,
@@ -2325,7 +2325,7 @@ const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
30.0f,
};
const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
9000,
100,
3,
@@ -2343,7 +2343,7 @@ const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
2.0f,
};
const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
{
5,
1.0f,
@@ -2380,7 +2380,7 @@ const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
10.0f,
};
const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
{
11,
0.8f,
@@ -2401,7 +2401,7 @@ const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
10.0f,
};
const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
{
49,
1.0f,
@@ -2436,7 +2436,7 @@ const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
0.7f,
};
const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
{
3,
1.2f,
@@ -2478,7 +2478,7 @@ const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
100.0f,
};
const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
1.0f,
3.0f,
1.0f,
@@ -2486,7 +2486,7 @@ const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
0.75f,
};
const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
{
14,
1.5f,
@@ -2515,7 +2515,7 @@ const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
515,
0,
120,
@@ -2529,7 +2529,7 @@ const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
};
#pragma pop
const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
{
13,
1.2f,
@@ -2583,7 +2583,7 @@ const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
10.0f,
};
const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
{
9,
1.0f,
@@ -2618,7 +2618,7 @@ const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
0.25f,
};
const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
{
49,
1.0f,
@@ -2658,7 +2658,7 @@ const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
{
49,
1.1f,
@@ -2697,7 +2697,7 @@ const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
};
#pragma pop
const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
{
11,
1.0f,
@@ -2721,7 +2721,7 @@ const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
15.0f,
};
const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
300,
5,
1.2f,
@@ -2729,7 +2729,7 @@ const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
1.5f,
};
const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
{
9,
1.1f,
@@ -2747,7 +2747,7 @@ const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
0.7f,
};
const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
{
20,
1.25f,
@@ -2790,7 +2790,7 @@ const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
30.0f,
};
const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
{
16,
1.0f,
@@ -2812,7 +2812,7 @@ const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
{
41,
0.9f,
@@ -2836,7 +2836,7 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
{
15,
0.9f,
@@ -2860,7 +2860,7 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
{
42,
1.05f,
@@ -2882,7 +2882,7 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
};
#pragma pop
const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
{
40,
1.0f,
@@ -2895,7 +2895,7 @@ const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
0.0f,
};
const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
{
6,
1.0f,
@@ -2915,7 +2915,7 @@ const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
10.0f,
};
const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
{
3,
2.0f,
@@ -2947,7 +2947,7 @@ const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
0.1f,
};
const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
{
19,
0.9f,
@@ -2972,7 +2972,7 @@ const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
2.0f,
};
const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
{
3,
1.0f,
@@ -3029,7 +3029,7 @@ const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
13.0f,
};
const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
{
6,
3.0f,
@@ -3057,7 +3057,7 @@ const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
1000.0f,
};
const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
{
5,
1.0f,
@@ -3088,7 +3088,7 @@ const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
0.02f,
};
const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
{
59,
1.2f,
@@ -3108,7 +3108,7 @@ const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
30.0f,
};
const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
{
6,
0.9f,
@@ -3150,7 +3150,7 @@ const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
0.2f,
};
const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
{
39,
1.0f,
@@ -3183,7 +3183,7 @@ const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
5.0f,
};
const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
{
25,
0.9f,
@@ -3237,7 +3237,7 @@ const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
7.0f,
};
const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
{
20,
1.5f,
@@ -3277,7 +3277,7 @@ const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
{
64,
1.0f,
@@ -3299,7 +3299,7 @@ const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
};
#pragma pop
const daAlinkHIO_wolf_c1 daAlinkHIO_wolf_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wolf_c1 daAlinkHIO_wolf_c0::m = {
13000,
-10000,
8000,
src/d/actor/d_a_alink_cut.inc
+4
View File
@@ -1165,6 +1165,10 @@ int daAlink_c::procCutFinishInit(int i_type) {
const daAlink_cutParamTbl* cutParams = &cutParamTable[i_type];
BOOL is_proc_frontRoll = mProcID == PROC_FRONT_ROLL;
#if TARGET_PC
mIsRollstab = (is_proc_frontRoll != FALSE) && (i_type == CUT_FINISH_PARAM_STAB);
#endif
commonProcInit(PROC_CUT_FINISH);
setCutType(cutParams->m_cutType);
field_0x3198 = cutParams->m_recoilAnmID;
src/d/actor/d_a_alink_damage.inc
+25 -1
View File
@@ -192,7 +192,7 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, BOOL i_checkZoraMag, BOOL i_setDm
if (checkMagicArmorNoDamage()) {
#if TARGET_PC
if(dusk::getSettings().game.freeMagicArmor) {
if(dusk::getSettings().game.armorRupeeDrain.getValue() == dusk::MagicArmorMode::INVINCIBLE) {
i_dmgAmount = 0;
}
#endif
@@ -202,6 +202,11 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, BOOL i_checkZoraMag, BOOL i_setDm
if (!mpHIO->mDamage.m.mInvincible && g_debugHpMode == 0)
#endif
{
#if TARGET_PC
if(checkMagicArmorWearAbility() && dusk::getSettings().game.armorRupeeDrain.getValue() == dusk::MagicArmorMode::DOUBLE_DEFENSE) {
i_dmgAmount /= 2;
}
#endif
dComIfGp_setItemLifeCount(-i_dmgAmount, 0);
}
@@ -281,7 +286,26 @@ BOOL daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* i_poly) {
}
BOOL daAlink_c::checkMagicArmorNoDamage() {
#ifdef TARGET_PC
if (!checkMagicArmorWearAbility()) {
return false;
}
switch(dusk::getSettings().game.armorRupeeDrain) {
case dusk::MagicArmorMode::NORMAL:
return !checkMagicArmorHeavy();
case dusk::MagicArmorMode::ON_DAMAGE:
return dComIfGs_getRupee() != 0;
case dusk::MagicArmorMode::DOUBLE_DEFENSE:
return false;
case dusk::MagicArmorMode::INVINCIBLE:
return true;
case dusk::MagicArmorMode::COSMETIC:
return false;
}
#else
return checkMagicArmorWearAbility() && !checkMagicArmorHeavy();
#endif
}
int daAlink_c::checkPolyDamage() {
src/d/actor/d_a_alink_demo.inc
+2 -2
View File
@@ -4359,7 +4359,7 @@ void daAlink_c::dungeonReturnWarp() {
s16 angle = dComIfGs_getWarpPlayerAngleY();
s8 room = dComIfGs_getWarpRoomNo();
char name[8];
strcpy(name, dComIfGs_getWarpStageName());
SAFE_STRCPY(name, dComIfGs_getWarpStageName());
dComIfGs_setRestartRoom(pos, angle, room);
dComIfGp_setNextStage(name, -1, dComIfGs_getRestartRoomNo(), -1, 0.0f, 12, 0,
@@ -4535,7 +4535,7 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
if (checkBossRoom() && fopAcM_GetRoomNo(this) == 50) {
char stageName[32];
strcpy(stageName, dComIfGp_getStartStageName());
SAFE_STRCPY(stageName, dComIfGp_getStartStageName());
for (int i = 0; i < 32; i++) {
if ((s64)stageName[i] == 0) {
src/d/actor/d_a_alink_dusk.cpp
+11 -1
View File
@@ -144,7 +144,7 @@ void daAlink_c::handleQuickTransform() {
procCoMetamorphoseInit();
}
bool daAlink_c::checkGyroAimContext() {
bool daAlink_c::checkAimContext() {
switch (mProcID) {
case PROC_SUBJECTIVITY:
case PROC_SWIM_SUBJECTIVITY:
@@ -175,3 +175,13 @@ bool daAlink_c::checkGyroAimContext() {
return false;
}
}
bool daAlink_c::checkAimInputContext() {
switch (mProcID) {
case PROC_HOOKSHOT_ROOF_WAIT:
case PROC_HOOKSHOT_WALL_WAIT:
return false;
default:
return checkAimContext();
}
}
src/d/actor/d_a_alink_effect.inc
+18 -5
View File
@@ -8,9 +8,9 @@
#include "d/actor/d_a_alink.h"
#include "d/d_com_inf_game.h"
#include "d/d_k_wmark.h"
#include "dusk/gx_helper.h"
#include "helpers/gx_helper.h"
const EffParamProc daAlink_c::m_fEffParamProc[] = {
DUSK_GAME_DATA const EffParamProc daAlink_c::m_fEffParamProc[] = {
&daAlink_c::setEffectFrontRollParam,
&daAlink_c::setEffectSlipParam,
&daAlink_c::setEffectSmallLandParam,
@@ -2028,11 +2028,10 @@ void daAlink_blur_c::traceBlur(cXyz const* param_0, cXyz const* param_1, s16 par
}
void daAlink_blur_c::draw() {
ZoneScoped;
j3dSys.reinitGX();
#ifdef TARGET_PC
TGXTexObj texObj;
#else
#if !TARGET_PC
static TGXTexObj texObj;
#endif
static GXColor nColor0 = {0xFF, 0xFF, 0xFF, 0x14};
@@ -2040,11 +2039,25 @@ void daAlink_blur_c::draw() {
GXSetNumIndStages(0);
nColor0.a = field_0x20;
#if TARGET_PC
if (mpCachedBlurTex != m_blurTex) {
mBlurTexObj.reset();
GXInitTexObj(&mBlurTexObj,
reinterpret_cast<void*>(
reinterpret_cast<uintptr_t>(m_blurTex) + m_blurTex->imageOffset),
16, 4, GX_TF_I4, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObjLOD(
&mBlurTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
mpCachedBlurTex = m_blurTex;
}
GXLoadTexObj(&mBlurTexObj, GX_TEXMAP0);
#else
GXInitTexObj(&texObj, (void*)((uintptr_t)m_blurTex + m_blurTex->imageOffset), 16, 4, GX_TF_I4,
GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObjLOD(&texObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE,
GX_ANISO_1);
GXLoadTexObj(&texObj, GX_TEXMAP0);
#endif
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA4, 8);
GXClearVtxDesc();
src/d/actor/d_a_alink_hook.inc
+23
View File
@@ -136,8 +136,26 @@ void daAlink_c::hsChainShape_c::draw() {
}
}
} else {
#if TARGET_PC
cXyz hsInterpTop, hsInterpRoot, hsInterpSubRoot, hsInterpSubTop;
if (dusk::frame_interp::is_enabled() && alink->mHsChainInterpPrevValid && alink->mHsChainInterpCurrValid) {
const f32 alpha = dusk::frame_interp::get_interpolation_step();
hsInterpTop = alink->mHsChainInterpPrevTop + (alink->mHsChainInterpCurrTop - alink->mHsChainInterpPrevTop) * alpha;
hsInterpRoot = alink->mHsChainInterpPrevRoot + (alink->mHsChainInterpCurrRoot - alink->mHsChainInterpPrevRoot) * alpha;
hsInterpSubRoot = alink->mHsChainInterpPrevSubRoot + (alink->mHsChainInterpCurrSubRoot - alink->mHsChainInterpPrevSubRoot) * alpha;
hsInterpSubTop = alink->mHsChainInterpPrevSubTop + (alink->mHsChainInterpCurrSubTop - alink->mHsChainInterpPrevSubTop) * alpha;
} else {
hsInterpTop = alink->getHsChainTopPos();
hsInterpRoot = alink->getHsChainRootPos();
hsInterpSubRoot = alink->getHsSubChainRootPos();
hsInterpSubTop = alink->getHsSubChainTopPos();
}
const cXyz& chainRootPos = hsInterpRoot;
const cXyz& chainTopPos = hsInterpTop;
#else
const cXyz& chainRootPos = alink->getHsChainRootPos();
const cXyz& chainTopPos = alink->getHsChainTopPos();
#endif
cXyz maxDistance = chainRootPos - chainTopPos;
f32 maxDistanceF = maxDistance.abs();
@@ -200,8 +218,13 @@ void daAlink_c::hsChainShape_c::draw() {
}
}
#if TARGET_PC
const cXyz& subChainRootPos = hsInterpSubRoot;
const cXyz& subChainTopPos = hsInterpSubTop;
#else
const cXyz& subChainRootPos = alink->getHsSubChainRootPos();
const cXyz& subChainTopPos = alink->getHsSubChainTopPos();
#endif
maxDistance = subChainRootPos - subChainTopPos;
maxDistanceF = maxDistance.abs();
src/d/actor/d_a_alink_horse.inc
+5 -5
View File
@@ -73,19 +73,19 @@ int daAlink_c::getReinRideDirection() {
return DIR_RIGHT;
}
Vec const daAlink_c::m_handLeftOutSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handLeftOutSidePos = {
9.0f, -5.0f, 3.0f
};
Vec const daAlink_c::m_handRightOutSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handRightOutSidePos = {
9.0f, -5.0f, -3.0f
};
Vec const daAlink_c::m_handLeftInSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handLeftInSidePos = {
9.0f, 5.0f, 3.0f
};
Vec const daAlink_c::m_handRightInSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handRightInSidePos = {
9.0f, 5.0f, -3.0f
};
@@ -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;
src/d/actor/d_a_alink_link.inc
+47 -7
View File
@@ -11,8 +11,10 @@
#include "d/actor/d_a_tag_mhint.h"
#if TARGET_PC
#include "dusk/gyro.h"
#include "dusk/action_bindings.h"
#include "dusk/gyro.h"
#include "dusk/mouse.h"
#include "dusk/touch_camera.h"
#endif
bool daAlink_c::checkNoSubjectModeCamera() {
@@ -131,7 +133,10 @@ BOOL daAlink_c::setBodyAngleToCamera() {
}
#if TARGET_PC
if (dusk::getSettings().game.enableGyroAim && checkGyroAimContext()) {
if ((dusk::getSettings().game.enableGyroAim ||
dusk::getSettings().game.enableMouseAim) &&
checkAimInputContext())
{
f32 gyro_scale = 1.0f;
if (checkWolfEyeUp()) {
gyro_scale *= 0.6f;
@@ -141,17 +146,52 @@ BOOL daAlink_c::setBodyAngleToCamera() {
gyro_scale /= dComIfGp_getCameraZoomScale(field_0x317c);
}
f32 gy_yaw = 0.f;
f32 gy_pitch = 0.f;
dusk::gyro::getAimDeltas(gy_yaw, gy_pitch);
f32 final_yaw = 0.f;
f32 final_pitch = 0.f;
if (dusk::getSettings().game.enableMouseAim) {
dusk::mouse::get_aim_deltas(final_yaw, final_pitch);
}
if (dusk::getSettings().game.enableGyroAim) {
f32 gyro_yaw = 0.f;
f32 gyro_pitch = 0.f;
dusk::gyro::getAimDeltas(gyro_yaw, gyro_pitch);
final_yaw += gyro_yaw;
final_pitch += gyro_pitch;
}
shape_angle.y = shape_angle.y + cM_rad2s(gy_yaw * gyro_scale);
sp8 = sp8 + cM_rad2s(gy_pitch * gyro_scale);
shape_angle.y = shape_angle.y + cM_rad2s(final_yaw * gyro_scale);
sp8 = sp8 + cM_rad2s(final_pitch * gyro_scale);
if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) {
sp8 = mBodyAngle.x;
}
}
if (dusk::getSettings().game.enableTouchControls && checkAimInputContext()) {
f32 touchYawDp = 0.0f;
f32 touchPitchDp = 0.0f;
if (dusk::touch_camera::consume_delta(touchYawDp, touchPitchDp)) {
f32 scale = 1.0f;
if (checkWolfEyeUp()) {
scale *= 0.6f;
}
if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
scale /= dComIfGp_getCameraZoomScale(field_0x317c);
}
const f32 yawDeg = -touchYawDp * dusk::touch_camera::YAW_DEGREES_PER_DP * scale *
dusk::getSettings().game.touchCameraXSensitivity;
const f32 pitchDeg = touchPitchDp * dusk::touch_camera::PITCH_DEGREES_PER_DP *
scale * dusk::getSettings().game.touchCameraYSensitivity;
shape_angle.y = shape_angle.y + cM_deg2s(yawDeg);
sp8 = sp8 + cM_deg2s(pitchDeg);
if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) {
sp8 = mBodyAngle.x;
}
}
}
#endif
if (checkNotItemSinkLimit() && sp8 > 0) {
src/d/actor/d_a_alink_swim.inc
+2 -2
View File
@@ -216,7 +216,7 @@ void daAlink_c::setSpeedAndAngleSwim() {
if (checkEventRun()) {
var_r28 = mMoveAngle;
} else {
var_r28 = shape_angle.y + (16384.0f * cM_ssin(mStickAngle));
var_r28 = shape_angle.y + (16384.0f * cM_ssin(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertAirSwimX ? -1.0f : 1.0f)));
}
cLib_addCalcAngleS(&shape_angle.y, var_r28, mpHIO->mSwim.m.mUnderwaterTurnRate, mpHIO->mSwim.m.mUnderwaterMaxTurn, mpHIO->mSwim.m.mUnderwaterMinTurn);
@@ -835,7 +835,7 @@ void daAlink_c::setSwimMoveAnime() {
} else {
s16 var_r24;
if (checkInputOnR() && !checkEventRun()) {
var_r24 = 13653.0f * cM_scos(mStickAngle);
var_r24 = 13653.0f * cM_scos(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertAirSwimY ? -1.0f : 1.0f));
} else {
var_r24 = 0;
}
src/d/actor/d_a_alink_wolf.inc
+10 -4
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() {
@@ -348,7 +348,7 @@ void daAlink_c::changeLink(int param_0) {
initModel(static_cast<J3DModelData*>(dComIfG_getObjectRes(l_mArcName, "al_hands.bmd")), 0);
#if TARGET_PC
if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.freeMagicArmor)
if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.armorRupeeDrain.getValue() != dusk::MagicArmorMode::NORMAL)
#else
if (dComIfGs_getRupee() != 0)
#endif
@@ -458,7 +458,7 @@ void daAlink_c::changeLink(int param_0) {
field_0x06f0 = field_0x064C->getMaterialNodePointer(2)->getShape();
#if TARGET_PC
if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.freeMagicArmor) {
if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.armorRupeeDrain.getValue() != dusk::MagicArmorMode::NORMAL) {
#else
if (dComIfGs_getRupee() != 0) {
#endif
@@ -4005,7 +4005,13 @@ int daAlink_c::procWolfHowlDemoInit() {
} else if (name == fpcNm_Tag_WaraHowl_e) {
mZ2WolfHowlMgr.setCorrectCurve(static_cast<daTagWrHowl_c*>(field_0x27f4)->getTuneId());
} else {
#if TARGET_PC
if (mZ2WolfHowlMgr.getCorrectCurveID() != 9) {
mZ2WolfHowlMgr.setCorrectCurve(-1);
}
#else
mZ2WolfHowlMgr.setCorrectCurve(-1);
#endif
}
} else {
#if TARGET_PC
src/d/actor/d_a_alldie.cpp
+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,
src/d/actor/d_a_andsw.cpp
+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,
src/d/actor/d_a_andsw2.cpp
+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,
src/d/actor/d_a_arrow.cpp
+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,
src/d/actor/d_a_b_bh.cpp
+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,
src/d/actor/d_a_b_bq.cpp
+2 -2
View File
@@ -2674,13 +2674,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,
src/d/actor/d_a_b_dr.cpp
+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,
src/d/actor/d_a_b_dre.cpp
+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,
src/d/actor/d_a_b_ds.cpp
+2 -2
View File
@@ -5680,13 +5680,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,
src/d/actor/d_a_b_gg.cpp
+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,
src/d/actor/d_a_b_gm.cpp
+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,
src/d/actor/d_a_b_gnd.cpp
+8 -4
View File
@@ -397,7 +397,7 @@ static int daB_GND_Draw(b_gnd_class* i_this) {
i_this->field_0x21e8.update(2, l_color, &a_this->tevStr);
dComIfGd_set3DlineMat(&i_this->field_0x21e8);
#if TARGET_PC
if (dusk::getSettings().game.enableFrameInterpolation) {
if (dusk::frame_interp::is_enabled()) {
if (i_this->mReinsInterpCurrValid) {
memcpy(i_this->mReinsInterpPrev, i_this->mReinsInterpCurr, sizeof(i_this->mReinsInterpCurr));
memcpy(i_this->mReinsTexInterpPrev, i_this->mReinsTexInterpCurr, sizeof(i_this->mReinsTexInterpCurr));
@@ -2192,6 +2192,9 @@ static void damage_check(b_gnd_class* i_this) {
i_this->mDamageInvulnerabilityTimer = 100;
}
}
#if TARGET_PC
dusk::AchievementSystem::get().signal("ganondorf_hit");
#endif
}
cXyz hitmark_size(1.0f, 1.0f, 1.0f);
@@ -2218,6 +2221,7 @@ static void damage_check(b_gnd_class* i_this) {
i_this->field_0xc7c = 0;
dScnPly_c::setPauseTimer(7);
a_this->health = 100;
dusk::AchievementSystem::get().signal("ganondorf_knocked_down");
}
break;
}
@@ -4933,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
@@ -5014,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,
@@ -5022,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,
src/d/actor/d_a_b_go.cpp
+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,
src/d/actor/d_a_b_gos.cpp
+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,
src/d/actor/d_a_b_mgn.cpp
+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,
src/d/actor/d_a_b_ob.cpp
+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,
src/d/actor/d_a_b_oh.cpp
+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,
src/d/actor/d_a_b_oh2.cpp
+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,
src/d/actor/d_a_b_tn.cpp
+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,
src/d/actor/d_a_b_yo.cpp
+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,
src/d/actor/d_a_b_yo_ice.cpp
+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,
src/d/actor/d_a_b_zant.cpp
+11 -2
View File
@@ -5472,6 +5472,15 @@ int daB_ZANT_c::create() {
fopAcM_ct(this, daB_ZANT_c);
OS_REPORT("B_ZANT PARAM %x\n", fopAcM_GetParam(this));
#if TARGET_PC
// Due to our loads being so much faster, Zant can initialize *before* the player
// This breaks respawning in the final phase of the fight when it tries
// to load the player's position
if (daPy_getPlayerActorClass() == NULL) {
return cPhs_INIT_e;
}
#endif
mSwbit = fopAcM_GetParam(this);
if (mSwbit != 0xFF) {
if (dComIfGs_isSwitch(mSwbit, fopAcM_GetRoomNo(this))) {
@@ -5591,7 +5600,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 +5608,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,
src/d/actor/d_a_b_zant_magic.cpp
+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,
src/d/actor/d_a_b_zant_mobile.cpp
+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,
src/d/actor/d_a_b_zant_sima.cpp
+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,
src/d/actor/d_a_balloon_2D.cpp
+5 -5
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();
@@ -229,9 +229,9 @@ int daBalloon2D_c::createHeap() {
return 1;
}
daBalloon2D_HIO_c l_HOSTIO;
DUSK_GAME_DATA daBalloon2D_HIO_c l_HOSTIO;
daBalloon2D_c* daBalloon2D_c::myclass;
DUSK_GAME_DATA daBalloon2D_c* daBalloon2D_c::myclass;
int daBalloon2D_c::create() {
int rv = dComIfG_resLoad(this, l_arcName);
@@ -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,
src/d/actor/d_a_bd.cpp
+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,
src/d/actor/d_a_bg.cpp
+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,
src/d/actor/d_a_bg_obj.cpp
+23 -22
View File
@@ -5,24 +5,25 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bg_obj.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include <cstdio>
#include <os.h>
#include <cstring>
#include <os.h>
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "SSystem/SComponent/c_math.h"
#include "d/actor/d_a_bg_obj.h"
#include "d/actor/d_a_set_bgobj.h"
#include "d/d_s_play.h"
#include "SSystem/SComponent/c_math.h"
#include "helpers/string.hpp"
static const char* getBmdName(int param_0, int param_1) {
static char l_bmdName[16];
switch (param_1) {
case 0:
sprintf(l_bmdName, "model%d.bmd", param_0);
SAFE_SPRINTF(l_bmdName, "model%d.bmd", param_0);
break;
default:
sprintf(l_bmdName, "model%d_%d.bmd", param_0, param_1);
SAFE_SPRINTF(l_bmdName, "model%d_%d.bmd", param_0, param_1);
break;
}
@@ -34,10 +35,10 @@ static const char* getBtkName(int param_0, int param_1) {
switch (param_1) {
case 0:
sprintf(l_btkName, "model%d.btk", param_0);
SAFE_SPRINTF(l_btkName, "model%d.btk", param_0);
break;
default:
sprintf(l_btkName, "model%d_%d.btk", param_0, param_1);
SAFE_SPRINTF(l_btkName, "model%d_%d.btk", param_0, param_1);
break;
}
@@ -49,10 +50,10 @@ static const char* getBrkName(int param_0, int param_1) {
switch (param_1) {
case 0:
sprintf(l_brkName, "model%d.brk", param_0);
SAFE_SPRINTF(l_brkName, "model%d.brk", param_0);
break;
default:
sprintf(l_brkName, "model%d_%d.brk", param_0, param_1);
SAFE_SPRINTF(l_brkName, "model%d_%d.brk", param_0, param_1);
break;
}
@@ -62,7 +63,7 @@ static const char* getBrkName(int param_0, int param_1) {
static const char* getDzbName(int param_0) {
static char l_dzbName[16];
sprintf(l_dzbName, "model%d.dzb", param_0);
SAFE_SPRINTF(l_dzbName, "model%d.dzb", param_0);
return l_dzbName;
}
@@ -95,12 +96,12 @@ u8* daBgObj_c::spec_data_c::initTexShareBlock(u8* i_dataPtr) {
u8* dataPos = i_dataPtr + 8;
for (; i < mTexShareNum; i++) {
strcpy(sp48, (char*)dataPos);
SAFE_STRCPY(sp48, (char*)dataPos);
int len = strlen((char*)dataPos);
dataPos += len + 1;
if (*dataPos != 0) {
strcpy(sp8, (char*)dataPos);
SAFE_STRCPY(sp8, (char*)dataPos);
dataPos += strlen((char*)dataPos) + 1;
} else if (*dataPos == 0 && dataPos[1] == 1) {
dataPos += 2;
@@ -498,16 +499,16 @@ static dCcD_SrcTri l_tri_src = {
},
};
static char* l_specName = "spec.dat";
static DUSK_CONST char* l_specName = "spec.dat";
createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
DUSK_GAME_DATA createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
&daBgObj_c::CreateHeapType0,
&daBgObj_c::CreateHeapType1,
&daBgObj_c::CreateHeapType1,
&daBgObj_c::CreateHeapType1,
};
createInitFunc daBgObj_c::mCreateInitFunc[] = {
DUSK_GAME_DATA createInitFunc daBgObj_c::mCreateInitFunc[] = {
&daBgObj_c::CreateInitType0,
&daBgObj_c::CreateInitType1,
&daBgObj_c::CreateInitType1,
@@ -518,14 +519,14 @@ int daBgObj_c::Create() {
return (this->*mCreateInitFunc[mSpecData.mSpecType])();
}
executeFunc daBgObj_c::mExecuteFunc[] = {
DUSK_GAME_DATA executeFunc daBgObj_c::mExecuteFunc[] = {
&daBgObj_c::ExecuteType0,
&daBgObj_c::ExecuteType1,
&daBgObj_c::ExecuteType1,
&daBgObj_c::ExecuteType1,
};
tgSetFunc daBgObj_c::mTgSetFunc[] = {
DUSK_GAME_DATA tgSetFunc daBgObj_c::mTgSetFunc[] = {
&daBgObj_c::set_tri_0, &daBgObj_c::set_tri_1, &daBgObj_c::set_cyl_0,
&daBgObj_c::set_tri_2, &daBgObj_c::set_tri_3,
};
@@ -646,14 +647,14 @@ void daBgObj_c::doShareTexture() {
u8* spec_res_name = mSpecData.mpTexShareBlock + 8;
for (int i = 0; i < mSpecData.mTexShareNum; i++) {
strcpy(res_name, (char*)spec_res_name);
SAFE_STRCPY(res_name, (char*)spec_res_name);
spec_res_name += strlen((char*)spec_res_name) + 1;
J3DModelData* modelData =
(J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), res_name);
if (*spec_res_name != 0) {
strcpy(share_res_name, (char*)spec_res_name);
SAFE_STRCPY(share_res_name, (char*)spec_res_name);
spec_res_name += strlen((char*)spec_res_name) + 1;
J3DModelData* shareModelData =
@@ -1354,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,
@@ -1362,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,
src/d/actor/d_a_boomerang.cpp
+8 -8
View File
@@ -137,17 +137,17 @@ static const u8 lbl_46_rodata_24[6] = {
0x1E,
};
const u16 daBoomerang_HIO_c0::m_lockWaitTime = 10;
DUSK_GAME_DATA const u16 daBoomerang_HIO_c0::m_lockWaitTime = 10;
const f32 daBoomerang_HIO_c0::m_minCircleR = 28.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_minCircleR = 28.0f;
const f32 daBoomerang_HIO_c0::m_middleCircleR = 35.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_middleCircleR = 35.0f;
const f32 daBoomerang_HIO_c0::m_maxCircleR = 80.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_maxCircleR = 80.0f;
const f32 daBoomerang_HIO_c0::m_scale = 3.0f / 5.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_scale = 3.0f / 5.0f;
const f32 daBoomerang_HIO_c0::m_lockWindScale = 2.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_lockWindScale = 2.0f;
static const u32 l_lockSeFlg[BOOMERANG_LOCK_MAX] = {
Z2SE_SY_BOOM_LOCK_ON_1,
@@ -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,
src/d/actor/d_a_bullet.cpp
+7 -7
View File
@@ -8,20 +8,20 @@
#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;
const dCcD_SrcGObjInf daBullet_c::mCcDObjInfo = {
DUSK_GAME_DATA const dCcD_SrcGObjInf daBullet_c::mCcDObjInfo = {
{0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},
{dCcD_SE_NONE, 0, 0, 0, 0},
{0},
};
dCcD_SrcSph daBullet_c::mCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph daBullet_c::mCcDSph = {
daBullet_c::mCcDObjInfo,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSph
@@ -81,7 +81,7 @@ int daBullet_c::Delete() {
return 1;
}
daBullet_HIOParam const daBullet_Param_c::m = {
DUSK_GAME_DATA daBullet_HIOParam const daBullet_Param_c::m = {
-3.0f,
255.0f,
3.0f,
@@ -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,
src/d/actor/d_a_canoe.cpp
+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,
src/d/actor/d_a_coach_2D.cpp
+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,
src/d/actor/d_a_coach_fire.cpp
+4 -4
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_coach_fire.h"
CoachFireAttr const daCoachFire_c::M_attr = {
DUSK_GAME_DATA CoachFireAttr const daCoachFire_c::M_attr = {
50.0f, // radius
4.0f, // field_0x04
36, // field_0x08
@@ -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,
src/d/actor/d_a_cow.cpp
+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,
src/d/actor/d_a_crod.cpp
+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,
src/d/actor/d_a_cstaF.cpp
+3 -3
View File
@@ -34,7 +34,7 @@ static const char l_arcNameFB[] = "CstaFB";
static const char l_spStageName[8] = "R_SP209";
const daCstaF_c::BckTbl daCstaF_c::m_bckIdxTable[] = {
DUSK_GAME_DATA const daCstaF_c::BckTbl daCstaF_c::m_bckIdxTable[] = {
{9, 9, 8, 7},
{9, 9, 8, 7}
};
@@ -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,
src/d/actor/d_a_cstatue.cpp
+3 -3
View File
@@ -53,7 +53,7 @@ enum CStatueAnimIndex {
CStatueAnimIndex_N,
};
u16 const daCstatue_c::m_bckIdxTable[daCstatueType_N][CStatueAnimIndex_N] = {
DUSK_GAME_DATA u16 const daCstatue_c::m_bckIdxTable[daCstatueType_N][CStatueAnimIndex_N] = {
// daCstatueType_NORMAL
{CStatueAnimSwing, CStatueAnimWalk, CStatueAnimSwing, CStatueAnimFall, CStatueAnimStop,
CStatueAnimStart, CStatueAnimSwingre},
@@ -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,
src/d/actor/d_a_demo00.cpp
+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,
src/d/actor/d_a_demo_item.cpp
+2 -2
View File
@@ -552,7 +552,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,
@@ -560,7 +560,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,
src/d/actor/d_a_disappear.cpp
+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,
src/d/actor/d_a_dmidna.cpp
+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,
src/d/actor/d_a_do.cpp
+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,
src/d/actor/d_a_door_boss.cpp
+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,
src/d/actor/d_a_door_bossL1.cpp
+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,
src/d/actor/d_a_door_bossL5.cpp
+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,
src/d/actor/d_a_door_dbdoor00.cpp
+11 -11
View File
@@ -27,31 +27,31 @@ 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];
sprintf(l_bmdName, "%s%02d.bmd", l_bmd_base_name, door_param2_c::getDoorModel(this));
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,
src/d/actor/d_a_door_knob00.cpp
+13 -13
View File
@@ -30,32 +30,32 @@ 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];
sprintf(l_bmdName, "%s%02d.bmd", l_bmd_base_name, knob_param_c::getDoorModel(this));
SAFE_SPRINTF(l_bmdName, "%s%02d.bmd", l_bmd_base_name, knob_param_c::getDoorModel(this));
return l_bmdName;
}
@@ -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,
src/d/actor/d_a_door_mbossL1.cpp
+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,
src/d/actor/d_a_door_push.cpp
+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,
src/d/actor/d_a_door_shutter.cpp
+23 -23
View File
@@ -22,7 +22,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:
@@ -35,11 +35,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";
@@ -56,7 +56,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:
@@ -65,20 +65,20 @@ char* daDoor20_c::getBmdName() {
case 10:
case 12:
default:
sprintf(bmdName, "door-shutter_%02d.bmd", door_param2_c::getDoorModel(this));
SAFE_SPRINTF(bmdName, "door-shutter_%02d.bmd", door_param2_c::getDoorModel(this));
break;
case 9:
sprintf(bmdName, "door-knob_%02d.bmd", door_param2_c::getDoorModel(this));
SAFE_SPRINTF(bmdName, "door-knob_%02d.bmd", door_param2_c::getDoorModel(this));
break;
}
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:
@@ -1536,7 +1536,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,
@@ -1558,49 +1558,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",
@@ -1610,28 +1610,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",
@@ -1842,7 +1842,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",
@@ -2151,13 +2151,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,
src/d/actor/d_a_door_spiral.cpp
+5 -5
View File
@@ -94,9 +94,9 @@ const char* daSpiral_c::getBmd(int i_type) {
const char* daSpiral_c::getBmd2(int i_type) {
static char bmdName[32];
if (i_type == daSpiral_TYPE_DOWN_e) {
sprintf(bmdName, "door-stairSpiralU.bmd");
SAFE_SPRINTF(bmdName, "door-stairSpiralU.bmd");
} else {
sprintf(bmdName, "door-stairSpiralD.bmd");
SAFE_SPRINTF(bmdName, "door-stairSpiralD.bmd");
}
return bmdName;
@@ -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,
src/d/actor/d_a_dshutter.cpp
+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,
src/d/actor/d_a_e_ai.cpp
+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,
src/d/actor/d_a_e_arrow.cpp
+24 -2
View File
@@ -674,7 +674,29 @@ static int daE_ARROW_Create(fopAc_ac_c* i_this) {
}
int phase_state = dComIfG_resLoad(&a_this->mPhase, a_this->mResName);
#if TARGET_PC
static int s_create_frames = 0;
static bool s_first_arrow = true;
static fpc_ProcID s_last_scene_id = 0;
s_create_frames++;
fpc_ProcID cur_scene_id = dStage_roomControl_c::getProcID();
if (cur_scene_id != s_last_scene_id) {
s_first_arrow = true;
s_last_scene_id = cur_scene_id;
}
if (phase_state == cPhs_COMPLEATE_e && s_first_arrow && s_create_frames < 4) {
return cPhs_INIT_e;
}
#endif
if (phase_state == cPhs_COMPLEATE_e) {
#if TARGET_PC
s_create_frames = 0;
s_first_arrow = false;
#endif
a_this->mArrowType = fopAcM_GetParam(a_this) & 0xF;
a_this->mFlags = fopAcM_GetParam(a_this) & 0xF0;
@@ -747,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,
src/d/actor/d_a_e_ba.cpp
+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,
src/d/actor/d_a_e_bee.cpp
+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,
src/d/actor/d_a_e_bg.cpp
+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,
src/d/actor/d_a_e_bi.cpp
+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,
src/d/actor/d_a_e_bi_leaf.cpp
+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,
src/d/actor/d_a_e_bs.cpp
+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,
src/d/actor/d_a_e_bu.cpp
+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,
src/d/actor/d_a_e_bug.cpp
+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,
src/d/actor/d_a_e_cr.cpp
+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,
src/d/actor/d_a_e_cr_egg.cpp
+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,
src/d/actor/d_a_e_db.cpp
+3 -3
View File
@@ -116,7 +116,7 @@ static int daE_DB_Draw(e_db_class* i_this) {
i_this->stalkLine.update(12, l_color, &actor->tevStr);
dComIfGd_set3DlineMat(&i_this->stalkLine);
#if TARGET_PC
if (dusk::getSettings().game.enableFrameInterpolation) {
if (dusk::frame_interp::is_enabled()) {
if (i_this->mStalkLineInterpCurrValid) {
memcpy(i_this->mStalkLineInterpPrev, i_this->mStalkLineInterpCurr, sizeof(i_this->mStalkLineInterpCurr));
i_this->mStalkLineInterpPrevValid = true;
@@ -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,
src/d/actor/d_a_e_db_leaf.cpp
+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,
src/d/actor/d_a_e_dd.cpp
+2 -2
View File
@@ -1775,7 +1775,7 @@ static cPhs_Step daE_DD_Create(fopAc_ac_c* a_this) {
return phase;
}
actor_method_class l_daE_DD_Method = {
DUSK_GAME_DATA actor_method_class l_daE_DD_Method = {
(process_method_func)daE_DD_Create,
(process_method_func)daE_DD_Delete,
(process_method_func)daE_DD_Execute,
@@ -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,
src/d/actor/d_a_e_df.cpp
+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,
src/d/actor/d_a_e_dk.cpp
+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,
src/d/actor/d_a_e_dn.cpp
+3 -3
View File
@@ -1031,7 +1031,7 @@ static int way_check(e_dn_class* i_this) {
return 2;
}
int learn_check;
DUSK_GAME_DATA int learn_check;
static void* shot_s_sub(void* i_actor, void* i_data) {
UNUSED(i_data);
@@ -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,
src/d/actor/d_a_e_dt.cpp
+10 -10
View File
@@ -124,15 +124,15 @@ enum Joint {
/* 0x2A */ JNT_TAIL_2,
};
f32 E_DT_n::eDt_ShakeFrame[10] = {
DUSK_GAME_DATA f32 E_DT_n::eDt_ShakeFrame[10] = {
20.0f, 22.0f, 24.0f, 26.0f, 28.0f, 30.0f, 32.0f, 34.0f, 36.0f, 38.0f,
};
f32 E_DT_n::eDt_ShakeFrameDemo[10] = {
DUSK_GAME_DATA f32 E_DT_n::eDt_ShakeFrameDemo[10] = {
310.0f, 312.0f, 314.0f, 316.0f, 318.0f, 320.0f, 322.0f, 324.0f, 326.0f, 328.0f,
};
dCcD_SrcSph E_DT_n::cc_dt_body_src = {
DUSK_GAME_DATA dCcD_SrcSph E_DT_n::cc_dt_body_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj
{dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -144,7 +144,7 @@ dCcD_SrcSph E_DT_n::cc_dt_body_src = {
} // mSphAttr
};
dCcD_SrcSph E_DT_n::cc_dt_tongue_src = {
DUSK_GAME_DATA dCcD_SrcSph E_DT_n::cc_dt_tongue_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj
{dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -700,9 +700,9 @@ void daE_DT_c::setBoxTubaLandEffect() {
}
}
int E_DT_n::mDt_OtamaNum;
DUSK_GAME_DATA int E_DT_n::mDt_OtamaNum;
int E_DT_n::mDt_OtamaNo[20];
DUSK_GAME_DATA int E_DT_n::mDt_OtamaNo[20];
static void* s_otama_todo(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))
@@ -726,7 +726,7 @@ int daE_DT_c::getNumberOfOtama() {
return E_DT_n::mDt_OtamaNum;
}
int E_DT_n::m_fall_no;
DUSK_GAME_DATA int E_DT_n::m_fall_no;
static void* s_fall_otama(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))
@@ -772,7 +772,7 @@ static void* s_demo_otama(void* i_proc, void* i_this) {
return NULL;
}
cXyz E_DT_n::m_tongue_pos;
DUSK_GAME_DATA cXyz E_DT_n::m_tongue_pos;
static void* s_bomb_search(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))) {
@@ -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,
src/d/actor/d_a_e_fb.cpp
+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,
src/d/actor/d_a_e_fk.cpp
+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,
src/d/actor/d_a_e_fm.cpp
+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,
src/d/actor/d_a_e_fs.cpp
+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,
src/d/actor/d_a_e_fz.cpp
+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,
src/d/actor/d_a_e_ga.cpp
+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,
src/d/actor/d_a_e_gb.cpp
+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,
src/d/actor/d_a_e_ge.cpp
+3 -3
View File
@@ -1081,7 +1081,7 @@ void daE_GE_c::executeShield() {
}
}
daE_GE_c::actionFunc daE_GE_c::l_actionmenu[9] = {
DUSK_GAME_DATA daE_GE_c::actionFunc daE_GE_c::l_actionmenu[9] = {
(&daE_GE_c::executeWait), (&daE_GE_c::executeFly), (&daE_GE_c::executeAttack),
(&daE_GE_c::executeBack), (&daE_GE_c::executeDown), (&daE_GE_c::executeSurprise),
(&daE_GE_c::executeCaw), (&daE_GE_c::executeWind), (&daE_GE_c::executeShield),
@@ -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,
src/d/actor/d_a_e_gi.cpp
+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,
src/d/actor/d_a_e_gm.cpp
+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,
src/d/actor/d_a_e_gob.cpp
+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,
src/d/actor/d_a_e_gs.cpp
+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,
src/d/actor/d_a_e_hb.cpp
+3 -3
View File
@@ -103,7 +103,7 @@ static int daE_HB_Draw(e_hb_class* i_this) {
i_this->stalkLine.update(12, l_color, &actor->tevStr);
dComIfGd_set3DlineMat(&i_this->stalkLine);
#if TARGET_PC
if (dusk::getSettings().game.enableFrameInterpolation) {
if (dusk::frame_interp::is_enabled()) {
if (i_this->mStalkLineInterpCurrValid) {
memcpy(i_this->mStalkLineInterpPrev, i_this->mStalkLineInterpCurr, sizeof(i_this->mStalkLineInterpCurr));
i_this->mStalkLineInterpPrevValid = true;
@@ -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,

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