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

b_dr equivalent, update dtk-template (#2327)

Browse Source 
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup

* b_dr equivalent

* update dtk-template

* rename j3dframectrl mode enum
This commit is contained in:
TakaRikka
2025-03-14 01:46:21 -07:00
committed by GitHub
parent 51a6a0f4fb
commit 4ba9e77b25
70 changed files with 5468 additions and 4064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_fs.cpp
+9 -9
View File
@@ -175,7 +175,7 @@ static void e_fs_appear(e_fs_class* i_this) {
if (i_this->mTimer[0] == 0) {
i_this->current.pos.y = i_this->home.pos.y;
i_this->old.pos = i_this->current.pos;
anm_init(i_this, ANM_APPEAR, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_APPEAR, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode++;
i_this->current.angle.y = i_this->mPlayerAngleY;
i_this->attention_info.flags = 4;
@@ -215,7 +215,7 @@ static void e_fs_wait(e_fs_class* i_this) {
// fallthrough
case 0:
anm_init(i_this, ANM_WAIT01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(60.0f) + 2.0f;
break;
@@ -249,7 +249,7 @@ static void e_fs_wait(e_fs_class* i_this) {
static void e_fs_move(e_fs_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_MOVE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_MOVE, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode++;
// fallthrough
@@ -294,7 +294,7 @@ static void e_fs_attack(e_fs_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_ATTACK01, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK01, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mPlayerPos = player->current.pos;
i_this->mMode++;
break;
@@ -336,7 +336,7 @@ static void e_fs_attack(e_fs_class* i_this) {
static void e_fs_damage(e_fs_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode++;
break;
@@ -357,7 +357,7 @@ static void e_fs_end(e_fs_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DIE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, cM_rndF(0.4f) + 0.7f);
anm_init(i_this, ANM_DIE, 2.0f, J3DFrameCtrl::EMode_NONE, cM_rndF(0.4f) + 0.7f);
i_this->mMode++;
fopAcM_OffStatus(i_this, 0);
i_this->attention_info.flags = 0;
@@ -492,7 +492,7 @@ static void e_fs_demowait(e_fs_class* i_this) {
break;
case 1:
anm_init(i_this, ANM_APPEAR, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 0.0f);
anm_init(i_this, ANM_APPEAR, 0.0f, J3DFrameCtrl::EMode_NONE, 0.0f);
i_this->current.pos.y = (fopAcM_GetID(i_this) & 3) * 200.0f + 1300.0f;
i_this->mMode = 2;
i_this->field_0x566 = 1;
@@ -511,7 +511,7 @@ static void e_fs_demowait(e_fs_class* i_this) {
case 3:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_WAIT01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 4;
}
break;
@@ -719,7 +719,7 @@ static int useHeapIe_fst(fopAc_ac_c* i_this) {
e_fs_class* _this = static_cast<e_fs_class*>(i_this);
_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_FS", 0xc), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_FS", 9),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1,
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1,
&_this->mCreatureSound, 0x80000, 0x11000084);
if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) {
return 0;