-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
cbb409c
commit ea06aec
Showing
5 changed files
with
77 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,30 @@ | ||
| #ifndef D_T_COL_BOMB_SHIELD_H | ||
| #define D_T_COL_BOMB_SHIELD_H | ||
|
|
||
| #include "d/a/d_a_base.h" | ||
| #include "d/t/d_tg.h" | ||
| #include "m/m_mtx.h" | ||
| #include "s/s_State.hpp" | ||
| #include "s/s_StateMgr.hpp" | ||
|
|
||
| class dTgColBombShield : public dAcBase_c { | ||
| class dTgColBombShield : public dTg_c { | ||
| public: | ||
| dTgColBombShield() : mStateMgr(*this, sStateID::null) {} | ||
| virtual ~dTgColBombShield() {} | ||
|
|
||
| bool createHeap() override; | ||
| int create() override; | ||
| int doDelete() override; | ||
| int actorExecute() override; | ||
| int draw() override; | ||
|
|
||
| STATE_FUNC_DECLARE(dTgColBombShield, Wait); | ||
|
|
||
| private: | ||
| /* 0x??? */ STATE_MGR_DECLARE(dTgColBombShield); | ||
| /* 0x0FC */ STATE_MGR_DECLARE(dTgColBombShield); | ||
| void dummy_executeState() { | ||
| // Not called from the class but needed for weak function ordering | ||
| mStateMgr.executeState(); | ||
| } | ||
| /* 0x138 */ mMtx_c mColMtx; | ||
| }; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,50 @@ | ||
| #include "d/t/d_t_col_bomb_shield.h" | ||
| #include "common.h" | ||
| #include "d/a/obj/d_a_obj_base.h" | ||
| #include "d/a/d_a_player.h" | ||
| #include "d/col/cc/d_cc_s.h" | ||
| #include "m/m_mtx.h" | ||
| #include "rvl/MTX/mtx.h" | ||
|
|
||
| SPECIAL_ACTOR_PROFILE(COL_BOMSLD, dTgColBombShield, fProfile::COL_BOMSLD, 0x12, 0, 0); | ||
|
|
||
| STATE_DEFINE(dTgColBombShield, Wait); | ||
|
|
||
| bool dTgColBombShield::createHeap() { | ||
| return true; | ||
| } | ||
|
|
||
| int dTgColBombShield::create() { | ||
| 0.0f; // cool | ||
| CREATE_ALLOCATOR(dTgColBombShield); | ||
| static const f32 offset = 0.1f; | ||
| mScale.x += offset; | ||
| mScale.y += offset; | ||
| mScale.z += offset; | ||
| mColMtx.transS(position.x, position.y + mScale.y * 0.5f - 0.05f, position.z); | ||
| mColMtx.ZXYrotM(rotation.x, rotation.y, rotation.z); | ||
| mMtx_c tmp; | ||
| PSMTXScale(tmp, mScale.x, mScale.y, mScale.z); | ||
| mColMtx += tmp; | ||
| mStateMgr.changeState(StateID_Wait); | ||
| return SUCCEEDED; | ||
| } | ||
|
|
||
| int dTgColBombShield::doDelete() { | ||
| return SUCCEEDED; | ||
| } | ||
|
|
||
| int dTgColBombShield::actorExecute() { | ||
| if (dAcPy_c::LINK != nullptr && roomid == dAcPy_c::LINK->roomid) { | ||
| dCcS::GetInstance()->SetArea(&mColMtx); | ||
| } | ||
| return SUCCEEDED; | ||
| } | ||
|
|
||
| int dTgColBombShield::draw() { | ||
| return SUCCEEDED; | ||
| } | ||
|
|
||
| void dTgColBombShield::initializeState_Wait() {} | ||
| void dTgColBombShield::executeState_Wait() {} | ||
| void dTgColBombShield::finalizeState_Wait() {} |