mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-21 00:31:25 -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 34c5d8272e
commit 60748d0924
70 changed files with 5468 additions and 4064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+23 -4
View File
@@ -155,8 +155,8 @@ if not config.non_matching:
# Tool versions
config.binutils_tag = "2.42-1"
config.compilers_tag = "20240706"
config.dtk_tag = "v1.2.0"
config.objdiff_tag = "v2.3.4"
config.dtk_tag = "v1.3.0"
config.objdiff_tag = "v2.7.1"
config.sjiswrap_tag = "v1.2.0"
config.wibo_tag = "0.6.11"
@@ -183,6 +183,10 @@ if args.map:
# Use for any additional files that should cause a re-configure when modified
config.reconfig_deps = []
# Optional numeric ID for decomp.me preset
# Can be overridden in libraries or objects
config.scratch_preset_id = 69 # Twilight Princess (DOL)
# Base flags, common to most GC/Wii games.
# Generally leave untouched, with overrides added below.
cflags_base = [
@@ -352,7 +356,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
# Helper function for actor RELs
def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[str, Any]:
return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags)])
return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)])
# Helper function for JSystem libraries
@@ -1572,7 +1576,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_L7op_demo_dr"),
ActorRel(MatchingFor("GZ2E01"), "d_a_b_bh"),
ActorRel(NonMatching, "d_a_b_bq"),
ActorRel(NonMatching, "d_a_b_dr"),
ActorRel(Equivalent, "d_a_b_dr"), # weak func order
ActorRel(Equivalent, "d_a_b_dre"), # weak func order
ActorRel(NonMatching, "d_a_b_ds"),
ActorRel(NonMatching, "d_a_b_gg"),
@@ -2245,6 +2249,21 @@ if config_path.exists():
for asset in module.get("extract", []):
emit_build_rule(asset)
# Optional callback to adjust link order. This can be used to add, remove, or reorder objects.
# This is called once per module, with the module ID and the current link order.
#
# For example, this adds "dummy.c" to the end of the DOL link order if configured with --non-matching.
# "dummy.c" *must* be configured as a Matching (or Equivalent) object in order to be linked.
def link_order_callback(module_id: int, objects: List[str]) -> List[str]:
# Don't modify the link order for matching builds
if not config.non_matching:
return objects
if module_id == 0: # DOL
return objects + ["dummy.c"]
return objects
# Uncomment to enable the link order callback.
# config.link_order_callback = link_order_callback
# Optional extra categories for progress tracking
config.progress_categories = [
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+5 -5
View File
@@ -896,11 +896,11 @@ public:
class J3DFrameCtrl {
public:
enum Attribute_e {
LOOP_ONCE_e,
LOOP_ONCE_RESET_e,
LOOP_REPEAT_e,
LOOP_MIRROR_ONCE_e,
LOOP_MIRROR_REPEAT_e,
EMode_NONE,
EMode_RESET,
EMode_LOOP,
EMode_REVERSE,
EMode_LOOP_REVERSE,
};
J3DFrameCtrl() { this->init(0); }
include/d/actor/d_a_b_dr.h
+88 -50
View File
@@ -6,6 +6,7 @@
#include "d/d_cc_d.h"
#include "d/d_msg_flow.h"
#include "d/d_bg_s_acch.h"
#include "m_Do/m_Do_hostIO.h"
/**
* @ingroup actors-enemies
@@ -17,9 +18,9 @@
*/
class daB_DR_c : public fopEn_enemy_c {
public:
/* 805BAF80 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 805BB120 */ void JointCallBack(J3DJoint*, int);
/* 805BB16C */ void draw();
/* 805BAF80 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 805BB120 */ static int JointCallBack(J3DJoint*, int);
/* 805BB16C */ int draw();
/* 805BB408 */ void setBck(int, u8, f32, f32);
/* 805BB4B4 */ void setActionMode(int, int);
/* 805BB4CC */ void mGlider_WindPosSet();
@@ -37,25 +38,25 @@ public:
/* 805BCBF4 */ void mCountClr();
/* 805BCC18 */ void mAllClr();
/* 805BCC4C */ void mHeadAngleSet();
/* 805BCD7C */ void flapMove(bool);
/* 805BCEA4 */ void revolutionMove();
/* 805BD05C */ void mPlayerHighCheck();
/* 805BD15C */ void mBgFallGroundCheck();
/* 805BCD7C */ bool flapMove(bool);
/* 805BCEA4 */ bool revolutionMove();
/* 805BD05C */ bool mPlayerHighCheck();
/* 805BD15C */ bool mBgFallGroundCheck();
/* 805BD3E4 */ void normalHoverMove();
/* 805BD5FC */ void executeWait();
/* 805BD98C */ void executeFlyWait();
/* 805BDBC4 */ void executeTailHit();
/* 805BE9B4 */ void executeWeekHit();
/* 805BF4C8 */ void mBreathSet();
/* 805BF768 */ void mBreathHighSet(bool);
/* 805BFA6C */ void mFeintBreath();
/* 805BF768 */ bool mBreathHighSet(bool);
/* 805BFA6C */ bool mFeintBreath();
/* 805BFD88 */ void executeBreathAttack();
/* 805C062C */ void executeWindAttack();
/* 805C0CAC */ void mGliderMoveSub(f32);
/* 805C0CAC */ bool mGliderMoveSub(f32);
/* 805C0EF8 */ void executeGliderAttack();
/* 805C1E0C */ void executePillarSearch();
/* 805C24BC */ void executePillarWait();
/* 805C2BE8 */ void startDemoCheck();
/* 805C2BE8 */ bool startDemoCheck();
/* 805C2CD0 */ void executeDamageDemo();
/* 805C3558 */ void executeMiddleDemo();
/* 805C36A4 */ void executeDead();
@@ -69,38 +70,38 @@ public:
/* 805C46E0 */ void cc_set();
/* 805C4E14 */ void down_cc_set();
/* 805C4FB4 */ void demo_skip(int);
/* 805C50BC */ void DemoSkipCallBack(void*, int);
/* 805C50F0 */ void execute();
/* 805C55B0 */ void _delete();
/* 805C56A4 */ void CreateHeap();
/* 805C5974 */ void create();
/* 805C50BC */ static int DemoSkipCallBack(void*, int);
/* 805C50F0 */ int execute();
/* 805C55B0 */ int _delete();
/* 805C56A4 */ int CreateHeap();
/* 805C5974 */ int create();
/* 805C62B0 */ daB_DR_c();
MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
void onTarget() { mTarget = true; }
bool isBack() { return mPrm0; }
bool isBack() { return arg0; }
private:
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x05B8 */ J3DModel* mpPartModel;
/* 0x05BC */ mDoExt_brkAnm* mpCoreBrk;
/* 0x05C0 */ Z2CreatureEnemy field_0x5c0;
/* 0x0664 */ Z2CreatureEnemy field_0x664;
/* 0x0708 */ int mAction;
/* 0x070C */ int mMode;
/* 0x0710 */ int mAnmID;
/* 0x05C0 */ Z2CreatureEnemy mSound;
/* 0x0664 */ Z2CreatureEnemy mSound2;
/* 0x0708 */ int mActionMode;
/* 0x070C */ int mMoveMode;
/* 0x0710 */ int mAnm;
/* 0x0714 */ u8 field_0x714[0x0718 - 0x0714];
/* 0x0718 */ int field_0x718;
/* 0x071C */ u8 field_0x71C[0x0720 - 0x071C];
/* 0x0720 */ f32 field_0x720;
/* 0x071C */ u32 mShadowKey;
/* 0x0720 */ f32 mTargetHeight;
/* 0x0724 */ f32 field_0x724;
/* 0x0728 */ f32 field_0x728;
/* 0x072C */ f32 field_0x72c;
/* 0x0730 */ u8 field_0x730[0x0734 - 0x0730];
/* 0x0730 */ f32 field_0x730;
/* 0x0734 */ f32 field_0x734;
/* 0x0738 */ u8 field_0x738[0x073C - 0x0738];
/* 0x0738 */ f32 field_0x738;
/* 0x073C */ f32 field_0x73c;
/* 0x0740 */ f32 field_0x740;
/* 0x0744 */ f32 field_0x744;
@@ -111,44 +112,41 @@ private:
/* 0x0752 */ s16 field_0x752;
/* 0x0754 */ s16 field_0x754;
/* 0x0756 */ s16 field_0x756;
/* 0x0758 */ s16 field_0x758;
/* 0x075A */ s16 field_0x75a;
/* 0x075C */ u8 field_0x75C[0x0760 - 0x075C];
/* 0x0758 */ csXyz mHeadAngle;
/* 0x0760 */ cXyz field_0x760;
/* 0x076C */ cXyz field_0x76c;
/* 0x076C */ cXyz mBoot_c_trance;
/* 0x0778 */ cXyz field_0x778;
/* 0x0784 */ cXyz field_0x784;
/* 0x0790 */ cXyz field_0x790;
/* 0x079C */ cXyz field_0x79c;
/* 0x079C */ cXyz mGlider_WindPos;
/* 0x07A8 */ cXyz field_0x7a8;
/* 0x07B4 */ cXyz field_0x7b4;
/* 0x07C0 */ int mTimer[4];
/* 0x07D0 */ u8 field_0x7d0;
/* 0x07D1 */ u8 field_0x7d1;
/* 0x07D2 */ u8 field_0x7d2;
/* 0x07D2 */ u8 mBreakPartsNo;
/* 0x07D3 */ u8 field_0x7d3;
/* 0x07D4 */ u8 field_0x7d4;
/* 0x07D5 */ u8 field_0x7D5[0x07D6 - 0x07D5];
/* 0x07D5 */ u8 field_0x7d5;
/* 0x07D6 */ u8 field_0x7d6;
/* 0x07D7 */ u8 field_0x7d7;
/* 0x07D8 */ u8 field_0x7D8[0x07D9 - 0x07D8];
/* 0x07D8 */ u8 field_0x7d8;
/* 0x07D9 */ u8 mTarget;
/* 0x07DA */ u8 field_0x7DA[0x07DB - 0x07DA];
/* 0x07DA */ u8 field_0x7da;
/* 0x07DB */ u8 field_0x7db;
/* 0x07DC */ u8 field_0x7DC[0x07E0 - 0x07DC];
/* 0x07DC */ u8 field_0x7dc;
/* 0x07E0 */ int field_0x7e0;
/* 0x07E4 */ u8 field_0x7e4[4];
/* 0x07E4 */ u8 mCount[4];
/* 0x07E8 */ u8 field_0x7e8;
/* 0x07E9 */ u8 field_0x7E9[0x07EA - 0x07E9];
/* 0x07EA */ u8 mPrm0;
/* 0x07EB */ u8 field_0x7eb;
/* 0x07EC */ u8 mPrm1;
/* 0x07ED */ u8 mPrm2;
/* 0x07EE */ u8 mPrm3;
/* 0x07EF */ u8 field_0x7EF[0x07F0 - 0x07EF];
/* 0x07E9 */ u8 field_0x7e9;
/* 0x07EA */ u8 arg0;
/* 0x07EB */ u8 mPartNo;
/* 0x07EC */ u8 bitSw;
/* 0x07ED */ u8 bitSw2;
/* 0x07EE */ u8 bitSw3;
/* 0x07F0 */ dBgS_AcchCir mAcchCir;
/* 0x0830 */ dBgS_ObjAcch mAcch;
/* 0x0A08 */ dCcD_Stts field_0xa08;
/* 0x0A08 */ dCcD_Stts mColliderStts;
/* 0x0A44 */ dCcD_Cyl mWeekCc;
/* 0x0B80 */ dCcD_Sph mFootAtCc[2];
/* 0x0DF0 */ dCcD_Sph field_0xdf0;
@@ -162,14 +160,16 @@ private:
/* 0x2174 */ dCcD_Cyl mDownCc[5];
/* 0x27A0 */ u8 field_0x27A0[0x27A8 - 0x27A0];
/* 0x27A8 */ Z2CreatureEnemy* field_0x27a8;
/* 0x27AC */ u8 field_0x27AC[0x27C4 - 0x27AC];
/* 0x27C4 */ cXyz field_0x27c4;
/* 0x27D0 */ cXyz field_0x27d0;
/* 0x27AC */ u8 field_0x27AC[0x27BE - 0x27AC];
/* 0x27BE */ u8 field_0x27be;
/* 0x27BF */ u8 field_0x27bf[0x27C4 - 0x27BF];
/* 0x27C4 */ cXyz mDemoCamEye;
/* 0x27D0 */ cXyz mDemoCamCenter;
/* 0x27DC */ u32 field_0x27dc[4];
/* 0x27EC */ u32 field_0x27ec[4];
/* 0x27FC */ u32 field_0x27fc[4];
/* 0x280C */ u32 field_0x280c;
/* 0x2810 */ u8 field_0x2810[0x2814 - 0x2810];
/* 0x2810 */ u8 mInitHIO;
/* 0x2814 */ dMsgFlow_c mMsgFlow;
};
@@ -179,7 +179,45 @@ STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860);
class daB_DR_HIO_c {
public:
/* 805BAE6C */ daB_DR_HIO_c();
/* 805C6B94 */ ~daB_DR_HIO_c();
/* 805C6B94 */ virtual ~daB_DR_HIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 model_size;
/* 0x0C */ f32 fall_accel;
/* 0x10 */ f32 fall_accel_max;
/* 0x14 */ f32 wind_large_attack_lockon_range;
/* 0x18 */ f32 unk_0x18;
/* 0x1C */ f32 wind_small_attack_power;
/* 0x20 */ f32 wind_attack_power;
/* 0x24 */ f32 glide_wind_power;
/* 0x28 */ f32 breath_attack_threshold;
/* 0x2C */ f32 unk_0x2c;
/* 0x30 */ f32 breath_move_speed_max;
/* 0x34 */ f32 breath_move_speed_min;
/* 0x38 */ s16 tail_hit_chance_time;
/* 0x3A */ s16 center_wind_time;
/* 0x3C */ s16 breath_continue_time;
/* 0x3E */ s16 breath_continue_no_armor_time;
/* 0x40 */ s16 breath_feint1_time;
/* 0x42 */ s16 breath_feint2_time;
/* 0x44 */ s16 breath_feint3_time;
/* 0x46 */ s16 no_attack_time;
/* 0x48 */ s16 unk_0x48;
/* 0x4A */ s16 no_attack_no_armor_time;
/* 0x4C */ s16 unk_0x4c;
/* 0x4E */ s16 back_hit_chance_time;
/* 0x50 */ s16 after_breath_chance_time;
/* 0x52 */ s16 neck_search_speed;
/* 0x54 */ s16 neck_search2_speed;
/* 0x56 */ s16 neck_search_speed_max;
/* 0x58 */ s16 body_search_speed;
/* 0x5A */ s16 body_search2_speed;
/* 0x5C */ s16 body_search_speed_max;
/* 0x5E */ s16 body_search_feint_speed_max;
/* 0x60 */ s16 feint_angle;
/* 0x62 */ s16 unk_0x62;
/* 0x64 */ u8 display_range;
/* 0x65 */ u8 breath_feint2_OFF;
};
#endif /* D_A_B_DR_H */
include/d/actor/d_a_player.h
+3
View File
@@ -932,6 +932,7 @@ public:
u32 getCutAtFlg() const { return checkNoResetFlg0(FLG0_UNK_40); }
u32 checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
u32 checkBoarSingleBattleSecond() const { return checkNoResetFlg2(FLG2_UNK_1000000); }
u32 getFootOnGround() const { return checkResetFlg1(daPy_RFLG1(RFLG1_UNK_10 | RFLG1_UNK_20)); }
void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); }
@@ -1073,6 +1074,8 @@ public:
static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; }
static u8 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; }
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; }
inline static u32 i_getLastSceneMode();
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip() {
include/d/d_menu_window.h
+5 -82
View File
@@ -28,86 +28,12 @@ BOOL dMw_A_TRIGGER();
BOOL dMw_B_TRIGGER();
BOOL dMw_Z_TRIGGER();
BOOL dMw_START_TRIGGER();
BOOL dMw_LEFT_TRIGGER();
BOOL dMw_RIGHT_TRIGGER();
void dMw_onPauseWindow();
void dMw_offPauseWindow();
class dDlst_MENU_CAPTURE_c : public dDlst_base_c {
public:
virtual void draw() {
if (getDrawFlag() == 1) {
setDrawFlag();
dComIfGp_onPauseFlag();
GXSetTexCopySrc(0, 0, 608, 448);
GXSetTexCopyDst(304, 224, (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_ENABLE);
GXCopyTex(mDoGph_gInf_c::getFrameBufferTex(), GX_FALSE);
GXPixModeSync();
} else {
GXTexObj tex;
GXInitTexObj(&tex, mDoGph_gInf_c::getFrameBufferTex(), 304, 224,
(GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObjLOD(&tex, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
GXLoadTexObj(&tex, GX_TEXMAP0);
GXSetNumChans(0);
GXSetNumTexGens(1);
GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125);
GXSetNumTevStages(1);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_TEXC);
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
const GXColor color = {0, 0, 0, mAlpha};
GXSetTevColor(GX_TEVREG0, color);
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0);
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
GXSetZCompLoc(GX_TRUE);
GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_OR);
GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor);
GXSetFogRangeAdj(GX_FALSE, 0, NULL);
GXSetCullMode(GX_CULL_NONE);
GXSetDither(GX_TRUE);
GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0);
GXSetCurrentMtx(0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY(), 0);
GXTexCoord2s8(0, 0);
GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY(), 0);
GXTexCoord2s8(1, 0);
GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY(), 0);
GXTexCoord2s8(1, 1);
GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY(), 0);
GXTexCoord2s8(0, 1);
GXEnd();
}
}
virtual ~dDlst_MENU_CAPTURE_c() {}
dDlst_MENU_CAPTURE_c() {
mFlag = 0;
mAlpha = 255;
mTopFlag = 0;
}
void setCaptureFlag() { mFlag = 1; }
bool checkDraw() { return mFlag; }
u8 getAlpha() { return mAlpha; }
u8 getTopFlag() { return mTopFlag; }
u8 getDrawFlag() { return mFlag; }
void setDrawFlag() { mFlag = 3; }
private:
/* 0x4 */ u8 mFlag;
/* 0x5 */ u8 mAlpha;
/* 0x6 */ u8 mTopFlag;
};
class dDlst_MENU_CAPTURE_c;
class dMw_c : public msg_class {
public:
@@ -303,7 +229,4 @@ private:
/* 0x154 */ bool mPauseWindow;
};
BOOL dMw_LEFT_TRIGGER();
BOOL dMw_RIGHT_TRIGGER();
#endif /* D_MENU_D_MENU_WINDOW_H */
src/d/actor/d_a_alink.cpp
+2 -2
View File
@@ -5480,7 +5480,7 @@ int daAlink_c::createHeap() {
JKRReadIdxResource(mFaceBckHeap.getBuffer(), 0xC00, 0xE8, dComIfGp_getAnmArchive());
J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(mFaceBckHeap.getBuffer());
if (!field_0x2164.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!field_0x2164.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
@@ -15273,7 +15273,7 @@ void daAlink_c::setBasAnime(daAlink_c::daAlink_UNDER param_0) {
void daAlink_c::initBasAnime() {
if (field_0x2d7c != NULL) {
f32 var_f31;
if (field_0x2d7c->getAttribute() == J3DFrameCtrl::LOOP_REPEAT_e) {
if (field_0x2d7c->getAttribute() == J3DFrameCtrl::EMode_LOOP) {
var_f31 = field_0x2d7c->getFrame() - field_0x2d7c->getRate();
if (var_f31 <= field_0x2d7c->getStart()) {
src/d/actor/d_a_alink_bottle.inc
+2 -2
View File
@@ -67,14 +67,14 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
if (i_itemNo == fpcNm_ITEM_FAIRY) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(142, 0);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_WORM) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(151, 0);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
src/d/actor/d_a_alink_demo.inc
+1 -1
View File
@@ -1680,7 +1680,7 @@ int daAlink_c::procCoToolDemo() {
if (field_0x0698 != blk_p) {
field_0x0698 = blk_p;
field_0x069c->init(mpDemoFCTmpBls, field_0x0698, FALSE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
field_0x069c->getBlkAnm()->setFrame(0.0f);
}
src/d/actor/d_a_b_bq.cpp
+20 -20
View File
@@ -456,7 +456,7 @@ static void damage_check(b_bq_class* i_this) {
}
def_se_set(&i_this->mSound, i_this->mAtInfo.mpCollider, 0x2D, NULL);
anm_init(i_this, ANM_NO_DAMAGE, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_NO_DAMAGE, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_NODAMAGE, -1);
i_this->field_0x6de = 10;
}
@@ -501,7 +501,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 0.0f);
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f);
i_this->mMode = 1;
break;
case 2:
@@ -523,7 +523,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
}
if (i_this->mTimers[0] == 0) {
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 4;
i_this->mDisableDraw = false;
@@ -549,7 +549,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAction = ACTION_WAIT;
anm_init(i_this, ANM_WAIT_01, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
}
break;
@@ -562,7 +562,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
static void b_bq_wait(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
// fallthrough
case 1:
@@ -582,7 +582,7 @@ static void b_bq_wait(b_bq_class* i_this) {
}
if (i_this->mAnmID == ANM_NO_DAMAGE && i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->field_0x11fc != 0 && i_this->mTimers[2] == 1) {
@@ -598,7 +598,7 @@ static void b_bq_damage(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_BOMB_DAMAGE, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_BOMB_DAMAGE, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = 1000;
a_this->health = 50;
@@ -629,7 +629,7 @@ static void b_bq_damage(b_bq_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_DAMAGE_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = l_HIO.mChanceTime;
}
@@ -641,12 +641,12 @@ static void b_bq_damage(b_bq_class* i_this) {
}
break;
case 10:
anm_init(i_this, ANM_CORE_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_CORE_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 11;
break;
case 11:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_DAMAGE_WAIT, JREG_F(15), J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_WAIT, JREG_F(15), J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
}
break;
@@ -661,7 +661,7 @@ static void b_bq_damage(b_bq_class* i_this) {
return;
}
anm_init(i_this, ANM_RETURN_01, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RETURN_01, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 21;
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_DAMAGEBACK, -1);
break;
@@ -671,7 +671,7 @@ static void b_bq_damage(b_bq_class* i_this) {
}
break;
case 30:
anm_init(i_this, ANM_RETURN_02, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RETURN_02, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 31;
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_BACK, -1);
break;
@@ -725,7 +725,7 @@ static void b_bq_damage(b_bq_class* i_this) {
i_this->setDownPos(&sp5C);
if (i_this->checkCutDownHitFlg()) {
anm_init(i_this, ANM_TODOME, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_TODOME, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mPlayTodomeBtk = true;
i_this->mMode = 40;
@@ -764,7 +764,7 @@ static s8 b_bq_attack(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_ATTACK_A, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK_A, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
if (cM_rndF(1.0f) < 0.5f) {
@@ -788,7 +788,7 @@ static s8 b_bq_attack(b_bq_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = l_HIO.mWaterSprayTime;
}
@@ -797,7 +797,7 @@ static s8 b_bq_attack(b_bq_class* i_this) {
set_dokuhaki = true;
if (i_this->mTimers[0] == 0) {
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
}
break;
@@ -901,7 +901,7 @@ static void b_bq_end(b_bq_class* i_this) {
case 0:
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_DEAD, -1);
anm_init(i_this, ANM_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mpDeadBrk->setPlaySpeed(1.0f);
i_this->mMode = 1;
@@ -2440,7 +2440,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
b_bq_class* a_this = (b_bq_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_bq", 0x1D), NULL,
NULL, NULL, J3DFrameCtrl::LOOP_REPEAT_e, 0.6f, 0, -1,
NULL, NULL, J3DFrameCtrl::EMode_LOOP, 0.6f, 0, -1,
&a_this->mSound, 0, 0x11000284);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
return false;
@@ -2460,7 +2460,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (!a_this->mpDeadBrk->init(a_this->mpMorf->getModel()->getModelData(),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("B_bq", 0x20), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1))
{
return false;
}
@@ -2474,7 +2474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (!a_this->mpTodomeBtk->init(a_this->mpMorf->getModel()->getModelData(),
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_bq", 0x23), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1))
{
return false;
}
src/d/actor/d_a_b_dr.cpp
+4260 -3015
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_b_ds.cpp
+8 -8
View File
@@ -1524,7 +1524,7 @@ void daB_DS_c::executeOpeningDemo() {
}
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f);
mZantScale.set(0.0f, 5.0f, 0.0f);
mZantEyePos.set(mZantPos);
mZantEyePos.y += 200.0f;
@@ -1600,12 +1600,12 @@ void daB_DS_c::executeOpeningDemo() {
mCameraEye.set(mOpEyeDt[4]);
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 64)),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
mpSwordMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
mpSwordBrkAnm->init(mpSwordMorf->getModel()->getModelData(),
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("B_DS", 81)), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
particle_angle.x = 0;
particle_angle.y = field_0x7ca + 5000;
@@ -1687,7 +1687,7 @@ void daB_DS_c::executeOpeningDemo() {
case 26:
if (!field_0x85e && mpZantMorf->isStop()) {
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 67)),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f);
field_0x85e = true;
}
@@ -1705,12 +1705,12 @@ void daB_DS_c::executeOpeningDemo() {
if (mModeTimer == 100) {
mpOpPatternBrkAnm->init(mpOpPatternModel->getModelData(),
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("B_DS", 79)),
TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
mpOpPatternBtkAnm->init(
mpOpPatternModel->getModelData(),
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("B_DS", 85)), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
mPlayPatternAnm = true;
}
@@ -1722,7 +1722,7 @@ void daB_DS_c::executeOpeningDemo() {
}
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 65)),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
mSound.startCreatureSound(Z2SE_EN_ZAN_L4_2, 0, -1);
mMode = 30;
field_0x85e = false;
src/d/actor/d_a_b_gm.cpp
+17 -17
View File
@@ -372,7 +372,7 @@ static void b_gm_wait(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_GOMA_WAIT, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.wait_anm_speed);
anm_init(i_this, ANM_GOMA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.wait_anm_speed);
i_this->mTimers[0] = 100.0f + cM_rndF(100.0f);
i_this->mMode = 1;
/* fallthrough */
@@ -405,7 +405,7 @@ static void b_gm_move(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.dash_anm_speed);
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.dash_anm_speed);
i_this->mMode = 1;
i_this->unk_0x5cc = 0;
/* fallthrough */
@@ -489,7 +489,7 @@ static void b_gm_move(b_gm_class* i_this) {
move_speed = 0.0f;
if (i_this->mTimers[0] == 0) {
if (i_this->mAnmID != ANM_GOMA_DASH) {
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.dash_anm_speed);
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.dash_anm_speed);
}
i_this->mMode = 3;
@@ -531,12 +531,12 @@ static void b_gm_beam(b_gm_class* i_this) {
case 0:
i_this->mMode = 2;
i_this->field_0x6f4 = 0;
anm_init(i_this, ANM_GOMA_ATTACK_A, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_ATTACK_A, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 2:
i_this->field_0x1ad6 = 1;
if (i_this->mpModelMorf->isStop()) {
anm_init(i_this, ANM_GOMA_ATTACK_B, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_ATTACK_B, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 3;
i_this->mTimers[0] = 200;
}
@@ -546,7 +546,7 @@ static void b_gm_beam(b_gm_class* i_this) {
cLib_addCalc2(&i_this->field_0x6c0, 1.0f, 1.0f, 0.1f);
if (i_this->mTimers[0] == 0) {
i_this->mMode = 4;
anm_init(i_this, ANM_GOMA_ATTACK_C, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_ATTACK_C, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
break;
case 4:
@@ -586,7 +586,7 @@ static void b_gm_kogoma(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.dash_anm_speed);
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.dash_anm_speed);
i_this->mTargetMovePos.x = 0.0f;
i_this->mTargetMovePos.z = 0.0f;
i_this->mMode = 1;
@@ -601,7 +601,7 @@ static void b_gm_kogoma(b_gm_class* i_this) {
}
if (sp54.abs() < 200.0f) {
anm_init(i_this, ANM_GOMA_LAY_EGGS, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_LAY_EGGS, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimers[0] = 200;
i_this->mMode = 2;
}
@@ -637,7 +637,7 @@ static void b_gm_damage(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mMode = 1;
anm_init(i_this, ANM_GOMA_ROOF_DAMAGE, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_ROOF_DAMAGE, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 1:
if (anm_frame >= 50) {
@@ -652,7 +652,7 @@ static void b_gm_damage(b_gm_class* i_this) {
if (i_this->mpModelMorf->isStop()) {
i_this->mAction = ACTION_DROP;
i_this->mMode = 0;
anm_init(i_this, ANM_GOMA_FALL_LOOP, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_FALL_LOOP, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
}
@@ -683,7 +683,7 @@ static void b_gm_drop(b_gm_class* i_this) {
dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x4F, cXyz(0.0f, 1.0f, 0.0f));
i_this->mMode = 2;
anm_init(i_this, ANM_GOMA_LANDING, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_LANDING, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mTimers[0] = 300;
fopAcM_effSmokeSet1(&i_this->field_0x1c84, &i_this->field_0x1c88, &a_this->current.pos, NULL, 15.0f, &a_this->tevStr, 1);
@@ -693,19 +693,19 @@ static void b_gm_drop(b_gm_class* i_this) {
break;
case 2:
if (i_this->mpModelMorf->isStop()) {
anm_init(i_this, ANM_GOMA_LANDING_WAIT, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_LANDING_WAIT, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
a_this->current.pos.y = 0.0f;
if (i_this->mTimers[0] == 0) {
i_this->mMode = 3;
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
Z2GetAudioMgr()->changeBgmStatus(2);
}
break;
case 3:
if (i_this->mpModelMorf->isStop()) {
anm_init(i_this, ANM_GOMA_WAIT, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.wait_anm_speed);
anm_init(i_this, ANM_GOMA_WAIT, 0.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.wait_anm_speed);
a_this->current.angle.x = 0;
a_this->shape_angle.x = 0;
i_this->mTimers[0] = 5;
@@ -730,17 +730,17 @@ static void b_gm_drop(b_gm_class* i_this) {
}
break;
case 10:
anm_init(i_this, ANM_GOMA_LANDING_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_LANDING_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 11;
case 11:
if (i_this->mpModelMorf->isStop()) {
i_this->mMode = 3;
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mInvincibilityTimer = 200;
}
break;
case 20:
anm_init(i_this, ANM_GOMA_DEATH, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_DEATH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 21;
case 21:
if (i_this->mpModelMorf->getFrame() >= 160.0f) {
src/d/actor/d_a_b_go.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
a_this->mpMorf = new mDoExt_McaMorfSO(
(J3DModelData*)dComIfG_getObjectRes("B_go", RES_IS_MODEL), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_go", ANM_WAIT_03), J3DFrameCtrl::LOOP_REPEAT_e,
(J3DAnmTransform*)dComIfG_getObjectRes("B_go", ANM_WAIT_03), J3DFrameCtrl::EMode_LOOP,
1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
src/d/actor/d_a_b_gos.cpp
+4 -4
View File
@@ -61,7 +61,7 @@ static void wait(b_gos_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, 6, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, 6, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = cM_rndF(30) + 30.0f;
break;
@@ -89,7 +89,7 @@ static void walk(b_gos_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, 4, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, 4, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = cM_rndF(60) + 60.0f;
i_this->mWalkDirection = cM_rndF(0x10000);
@@ -116,7 +116,7 @@ static void ball(b_gos_class* i_this) {
// fallthrough
case 1:
if (i_this->mTimers[0] == 0) {
anm_init(i_this, 5, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, 5, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = cM_rndF(30) + 60.0f;
}
@@ -331,7 +331,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gos", 9), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gos", 6),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, &a_this->mSound,
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound,
0x80000, 0x11000084);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
src/d/actor/d_a_b_ob.cpp
+23 -23
View File
@@ -979,7 +979,7 @@ static void bombfishset(b_ob_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f);
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 3.0f);
i_this->mMode = 1;
if (a_this->field_0x567 == 0 && i_this->mDemoAction == 0) {
@@ -1014,7 +1014,7 @@ static void bombfishset(b_ob_class* i_this) {
i_this->mAction = OB_ACTION_CORE_HAND_MOVE;
i_this->mMode = 0;
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
}
@@ -1152,7 +1152,7 @@ static void core_end(b_ob_class* i_this) {
a_this->gravity = 0.0f;
i_this->mDemoAction = 20;
i_this->field_0x479c = -1000.0f;
anm_init(i_this, OB_ANM_TENTACLE_END, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_TENTACLE_END, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
particle_pos.set(0.0f, 0.0f, 0.0f);
dComIfGp_particle_set(0x880A, &particle_pos, NULL, NULL);
@@ -1211,7 +1211,7 @@ static void core_end(b_ob_class* i_this) {
i_this->mMoveAngle.x = -0x4000;
i_this->field_0x4750 = 0;
i_this->mTimers[0] = 110;
anm_init(i_this, OB_ANM_APPEAR_2, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_APPEAR_2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
fopAcM_OffStatus(a_this, 0x80000);
fopAcM_OnStatus(a_this, 0x200000);
@@ -1550,7 +1550,7 @@ static int fish_normal(b_ob_class* i_this) {
}
if (i_this->mAnmID != OB_ANM_SWIM_WAIT) {
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (dist_to_ground < l_HIO.mBodySize * (ZREG_F(8) + 1200.0f)) {
@@ -1701,7 +1701,7 @@ static int fish_normal(b_ob_class* i_this) {
}
if (i_this->mAnmID == OB_ANM_APPEAR_2 && i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (throw_player) {
@@ -1724,13 +1724,13 @@ static int fish_vacume(b_ob_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, OB_ANM_OPEN_MOUTH, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_OPEN_MOUTH, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->field_0x476a = 0;
break;
case 1:
if (i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = 200;
}
@@ -1766,9 +1766,9 @@ static int fish_vacume(b_ob_class* i_this) {
if (i_this->mBodyParts[0].mpMorf->isStop()) {
if (i_this->mAnmID == OB_ANM_SWALLOW) {
anm_init(i_this, OB_ANM_EAT_2, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_EAT_2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (i_this->mAnmID == OB_ANM_EAT_2) {
anm_init(i_this, OB_ANM_THROWUP, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_THROWUP, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_V_THROWUP, -1);
} else if (i_this->mAnmID == OB_ANM_THROWUP) {
i_this->mAction = OB_ACTION_FISH_NORMAL;
@@ -1809,11 +1809,11 @@ static int fish_end(b_ob_class* i_this) {
i_this->field_0x5d04 = KREG_F(8) + 1.5f;
i_this->mBlureRateTarget = 150;
i_this->field_0x5dd8 = 3;
anm_init(i_this, OB_ANM_LAST_DAMAGE, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 1:
if (i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_SWIM_WAIT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_SWIM_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->mTimers[0] == 0) {
@@ -1821,7 +1821,7 @@ static int fish_end(b_ob_class* i_this) {
i_this->mTargetMovePos.set(0.0f, -19000.0f, -6500.0f);
i_this->mTimers[0] = 150;
i_this->mDemoCamEye.set(-6000.0f, -22000.0f, 2000.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
break;
case 2:
@@ -1836,12 +1836,12 @@ static int fish_end(b_ob_class* i_this) {
i_this->mDemoAction = 42;
i_this->mDemoActionTimer = 0;
i_this->mBlureRateTarget = 0;
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
break;
case 3:
if (i_this->mAcch.ChkWallHit() && i_this->mTimers[0] == 0) {
anm_init(i_this, OB_ANM_DEAD, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_DEAD, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
dComIfGp_getVibration().StartShock(8, 31, cXyz(0.0f, 1.0f, 0.0f));
mDoAud_seStart(Z2SE_OBJ_BOMB_EXPLODE, NULL, 0, 0);
@@ -2503,7 +2503,7 @@ static void demo_camera(b_ob_class* i_this) {
if (i_this->mBodyParts[0].mpMorf->isStop()) {
i_this->mDemoAction = 100;
i_this->mCoreAnm = OB_ANM_WAIT;
i_this->mCoreAnmMode = J3DFrameCtrl::LOOP_REPEAT_e;
i_this->mCoreAnmMode = J3DFrameCtrl::EMode_LOOP;
i_this->field_0x4794 = 100;
}
break;
@@ -2527,7 +2527,7 @@ static void demo_camera(b_ob_class* i_this) {
i_this->field_0x5cfc = 0;
i_this->field_0x5d00 = ZREG_F(3) + 1000.0;
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
if (cM_rndF(1.0f) < 0.5f) {
i_this->field_0x5cd4 = 500.0f;
@@ -2582,7 +2582,7 @@ static void demo_camera(b_ob_class* i_this) {
if (i_this->mDemoActionTimer >= 15) {
if (i_this->mDemoActionTimer == 30) {
anm_init(i_this, OB_ANM_SWALLOW, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_SWALLOW, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_V_SWALLOW, -1);
}
@@ -2860,7 +2860,7 @@ static void demo_camera(b_ob_class* i_this) {
}
if (i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_WAIT, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_WAIT, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->mDemoActionTimer == 120) {
@@ -3191,7 +3191,7 @@ static void demo_camera(b_ob_class* i_this) {
i_this->field_0x5cfc = 0;
i_this->field_0x5d00 = ZREG_F(3) + 300.0f;
anm_init(i_this, OB_ANM_EAT, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_EAT, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_V_EAT, -1);
@@ -3255,7 +3255,7 @@ static void demo_camera(b_ob_class* i_this) {
if (i_this->mDemoAction == 52 && i_this->mBodyParts[0].mpMorf->isStop()) {
i_this->mDemoAction = 100;
i_this->mCoreAnm = OB_ANM_WAIT;
i_this->mCoreAnmMode = J3DFrameCtrl::LOOP_REPEAT_e;
i_this->mCoreAnmMode = J3DFrameCtrl::EMode_LOOP;
i_this->field_0x4794 = 100;
}
break;
@@ -3833,7 +3833,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpSuiBrk->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_oh", 0x2E), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!a_this->mpSuiBrk->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_oh", 0x2E), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
@@ -3842,7 +3842,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpSuiBtk->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_oh", 0x35), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!a_this->mpSuiBtk->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_oh", 0x35), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_b_yo.cpp
+30 -30
View File
@@ -456,7 +456,7 @@ void daB_YO_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
brk_idx = 0x25;
}
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_YO", brk_idx);
mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
}
/* 8062FE0C-8062FE18 000A8C 000C+00 11/11 0/0 0/0 .text setActionMode__8daB_YO_cFii */
@@ -808,7 +808,7 @@ void daB_YO_c::executeOpening() {
Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_OP1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fopAcM_OffStatus(this, 0x4000);
field_0xfb5 = 3;
setBck(ANM_WAIT_A, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_A, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 1;
gravity = 0.0f;
current.pos.set(100.0f, 0.0f, 1000.0f);
@@ -834,7 +834,7 @@ void daB_YO_c::executeOpening() {
mCamCenter.y = 180.0f;
mCamEye.set(0.0f, 250.0f, 1450.0f);
if (doYoMessage() == 1) {
setBck(ANM_WALK, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 2;
mActionTimer = 90;
mActionTimer2 = 300;
@@ -883,7 +883,7 @@ void daB_YO_c::executeOpening() {
speedF = 0.0f;
shape_angle.y = field_0xf80;
player->changeDemoMode(20, 0, 0, 0);
setBck(ANM_WAIT_A, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_WAIT_A, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mMode = 4;
}
break;
@@ -935,7 +935,7 @@ void daB_YO_c::executeOpening() {
player->changeDemoMode(1, 0, 0, 0);
}
if (mActionTimer == 15) {
setBck(ANM_TALK_A, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_TALK_A, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
if (mActionTimer == 0) {
setYoMessage(0x2350);
@@ -972,7 +972,7 @@ void daB_YO_c::executeOpening() {
case 10:
if (doYoMessage() == 1) {
mActionTimer = 150;
setBck(ANM_TO_TALK_B, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_TO_TALK_B, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 11;
mActionTimer2 = 10;
mColorMode = 1;
@@ -982,7 +982,7 @@ void daB_YO_c::executeOpening() {
case 11:
if (mpYetaMorf->isStop()) {
setBck(ANM_TALK_B, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_TALK_B, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 12;
setYoMessage(0x235F);
}
@@ -1008,7 +1008,7 @@ void daB_YO_c::executeOpening() {
cam_pos.set(51.0f, 207.0f, -1562.0f);
cLib_chasePos(&mCamEye, cam_pos, mCamEyeSpeed);
if (mActionTimer == 0) {
setBck(ANM_ANGRY, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_ANGRY, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 15;
player->changeDemoMode(1, 0, 0, 0);
}
@@ -1030,7 +1030,7 @@ void daB_YO_c::executeOpening() {
if (mpYetaMorf->isStop()) {
mMode = 16;
setYoMessage(0x2352);
setBck(ANM_ANGRY_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_ANGRY_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
break;
@@ -1046,7 +1046,7 @@ void daB_YO_c::executeOpening() {
if (mActionTimer == 0) {
mColorMode = 3;
mColBlend = 1.0f;
setBck(ANM_WAIT_B, J3DFrameCtrl::LOOP_REPEAT_e, 16.0f, 1.0f);
setBck(ANM_WAIT_B, J3DFrameCtrl::EMode_LOOP, 16.0f, 1.0f);
shape_angle.y = 0;
current.angle.y = 0;
mMode = 20;
@@ -1089,7 +1089,7 @@ void daB_YO_c::executeOpening() {
if (mActionTimer == 0) {
dComIfGs_onSwitch(mSwNo, fopAcM_GetRoomNo(this));
mMode = 22;
setBck(ANM_FLOAT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
current.pos.set(0.0f, 0.0f, -500.0f);
mCamEye.set(0.0f, 50.0f, 500.0f);
mCamCenter.set(0.0f, 500.0f, 400.0f);
@@ -1418,7 +1418,7 @@ void daB_YO_c::executeChase() {
mpBtkAnm->remove(mpModel[0]->getModelData());
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_YO", 0x35);
mpBtkAnm->init(mpModel[1]->getModelData(), btk, FALSE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
} else if (mModelNo == 6) {
mpBtkAnm->setFrame(2.0f);
}
@@ -1583,7 +1583,7 @@ void daB_YO_c::executeSeriousDemo() {
Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_MID, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fpcM_Search(s_frizad_delete, this);
field_0xfb5 = 1;
setBck(ANM_WAIT_C2, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f);
setBck(ANM_WAIT_C2, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f);
mColorMode = 5;
mColBlend = 0.0f;
return;
@@ -1638,7 +1638,7 @@ void daB_YO_c::executeSeriousDemo() {
if (mActionTimer == 0) {
shape_angle.y = 0;
current.angle.y = 0;
setBck(ANM_FLOAT_B, J3DFrameCtrl::LOOP_REPEAT_e, 15.0f, 1.0f);
setBck(ANM_FLOAT_B, J3DFrameCtrl::EMode_LOOP, 15.0f, 1.0f);
mActionTimer = 90;
mMode = 5;
mCamCenterSpeed = 3.0f;
@@ -1675,12 +1675,12 @@ void daB_YO_c::executeSeriousDemo() {
cLib_chaseF(&speed.y, 5.0f, 0.2f);
} else {
if (cLib_chaseF(&speed.y, 0.0f, 0.2f)) {
setBck(ANM_WAIT_C, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_WAIT_C, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
}
}
if (mActionTimer == 0) {
setBck(ANM_SCREAM, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SCREAM, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 11;
}
break;
@@ -1714,7 +1714,7 @@ void daB_YO_c::executeSeriousDemo() {
case 12:
mActionTimer = 120;
if (mpYetaMorf->isStop()) {
setBck(ANM_SCREAM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SCREAM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 17;
}
// fallthrough
@@ -1736,7 +1736,7 @@ void daB_YO_c::executeSeriousDemo() {
current.pos.y -= 350.0f;
mIceCenterPos.y = current.pos.y - 30.0f;
mActionTimer = 90;
setBck(ANM_WAIT_D, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_D, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
break;
@@ -2393,7 +2393,7 @@ void daB_YO_c::executeDeath() {
speedF = 0.0f;
mMode = 3;
mActionTimer = 30;
setBck(ANM_DOWN_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DOWN_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
setBreakIceEffect();
setWallHitEffect();
}
@@ -2420,7 +2420,7 @@ void daB_YO_c::executeDeath() {
pos1.y -= 200.0f;
cLib_addCalcPos2(&mCamCenter, pos1, 0.1f, 3.0f);
if (mpYetaMorf->isStop()) {
setBck(ANM_DOWN_C, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_DOWN_C, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 110;
mBlureRate = 0.0f;
}
@@ -2453,7 +2453,7 @@ void daB_YO_c::executeDeath() {
pos1.set(0.0f, 1230.0f, -1400.0f);
cLib_addCalcPos2(&mCamEye, pos1, 0.1f, 60.0f);
if (mActionTimer == 0) {
setBck(ANM_DOWN_C, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_DOWN_C, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 110;
mBlureRate = 0.0f;
}
@@ -2493,7 +2493,7 @@ void daB_YO_c::executeDeath() {
mpYetaMorf->setPlaySpeed(mIceCenterSpeed);
}
if (mActionTimer == 0) {
setBck(ANM_DOWN_C, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_DOWN_C, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 110;
mBlureRate = 0.0f;
}
@@ -3179,7 +3179,7 @@ int daB_YO_c::CreateHeap() {
model_data = (J3DModelData*)dComIfG_getObjectRes("B_YO", 0x1c);
mpYetaMorf = new mDoExt_McaMorfSO(
model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_YO", 0x14),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, &mCreatureSound, 0, 0x11020284
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mCreatureSound, 0, 0x11020284
);
if (mpYetaMorf == NULL || mpYetaMorf->getModel() == NULL) {
return 0;
@@ -3191,7 +3191,7 @@ int daB_YO_c::CreateHeap() {
}
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_YO", 0x35);
if (!mpBtkAnm->init(mpModel[0]->getModelData(), btk, FALSE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
@@ -3201,7 +3201,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_YO", 0x32);
if (!mpYetaBtkAnm->init(model_data, btk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) {
if (!mpYetaBtkAnm->init(model_data, btk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) {
return 0;
}
@@ -3210,7 +3210,7 @@ int daB_YO_c::CreateHeap() {
return 5;
}
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("B_YO", 0x3f);
if (!mpYetaBtpAnm->init(model_data, btp, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) {
if (!mpYetaBtpAnm->init(model_data, btp, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) {
return 5;
}
@@ -3219,7 +3219,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_YO", 0x24);
if (!mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
@@ -3228,7 +3228,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_YO", 0x27);
if (!mpYetaWhiteBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1)) {
if (!mpYetaWhiteBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1)) {
return 0;
}
@@ -3273,7 +3273,7 @@ int daB_YO_c::CreateHeap() {
model_data = (J3DModelData*)dComIfG_getObjectRes("ykW", 0xb);
mpYetaRevertedMorf = new mDoExt_McaMorfSO(
model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("ykW1", 0x1a),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000084
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000084
);
if (mpYetaRevertedMorf == NULL || mpYetaRevertedMorf->getModel() == NULL) {
return 0;
@@ -3431,7 +3431,7 @@ cPhs__Step daB_YO_c::create() {
if (cDmr_SkipInfo != 0) {
mScale = 1.0f;
setBck(ANM_ANGRY, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_ANGRY, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
cDmr_SkipInfo = 0;
field_0xfb5 = 0;
setActionMode(ACT_CHASE, 0);
src/d/actor/d_a_b_zant.cpp
+91 -91
View File
@@ -1127,9 +1127,9 @@ void daB_ZANT_c::executeSmallAttack() {
field_0x6fd = 0;
if (field_0x711 != 0) {
setBck(ANM_MAGIC_SHOOT_A_B, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_MAGIC_SHOOT_A_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else {
setBck(ANM_MAGIC_SHOOT_A_B_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_MAGIC_SHOOT_A_B_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
}
field_0x717 = 1;
@@ -1153,9 +1153,9 @@ void daB_ZANT_c::executeSmallAttack() {
}
if (field_0x711 != 0) {
setBck(ANM_MAGIC_SHOOT_A_C, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, anm_speed);
setBck(ANM_MAGIC_SHOOT_A_C, J3DFrameCtrl::EMode_LOOP, 3.0f, anm_speed);
} else {
setBck(ANM_MAGIC_SHOOT_A_B_B, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, anm_speed);
setBck(ANM_MAGIC_SHOOT_A_B_B, J3DFrameCtrl::EMode_LOOP, 3.0f, anm_speed);
}
mMode = 3;
@@ -1192,9 +1192,9 @@ void daB_ZANT_c::executeSmallAttack() {
mMode = 4;
if (field_0x711 != 0) {
setBck(ANM_MAGIC_SHOOT_A_D, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_MAGIC_SHOOT_A_D, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else {
setBck(ANM_MAGIC_SHOOT_A_B_C, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_MAGIC_SHOOT_A_B_C, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
}
field_0x717 = 0;
@@ -1261,9 +1261,9 @@ void daB_ZANT_c::executeWarp() {
if (mFightPhase != PHASE_MK && mFightPhase != PHASE_YO && mFightPhase != PHASE_LAST) {
if (field_0x711 & 1) {
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
} else {
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
}
@@ -1350,9 +1350,9 @@ void daB_ZANT_c::executeWarp() {
}
if (field_0x711 != 0) {
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
} else {
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
dComIfGp_particle_set(0x88FE, &current.pos, &shape_angle, NULL);
@@ -1399,17 +1399,17 @@ void daB_ZANT_c::executeDamage() {
if (mFightPhase == PHASE_OI) {
if (mMode == 1) {
setBck(ANM_FLOAT_DAMAGE_L, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_DAMAGE_L, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else {
setBck(ANM_FLOAT_DAMAGE_R, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_DAMAGE_R, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
}
speed.y = 0.0f;
speedF = 0.0f;
} else if (mMode == 1) {
setBck(ANM_DAMAGE_L_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DAMAGE_L_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else {
setBck(ANM_DAMAGE_R_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DAMAGE_R_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
}
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1);
@@ -1436,7 +1436,7 @@ void daB_ZANT_c::executeConfuse() {
speed.y = 0.0f;
mMode = 1;
setBck(ANM_GROUND_REACTION, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_NO_DMG, -1);
field_0x702 = 0;
case 1:
@@ -1445,7 +1445,7 @@ void daB_ZANT_c::executeConfuse() {
}
break;
case 5:
setBck(ANM_FAINT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
speedF = 0.0f;
speed.y = 0.0f;
field_0x702 = 0;
@@ -1485,7 +1485,7 @@ void daB_ZANT_c::executeOpening() {
sp34.set(0.0f, 0.0f, -700.0f);
player->setPlayerPosAndAngle(&sp34, 0, 0);
setBck(ANM_OP_1, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f);
setBck(ANM_OP_1, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f);
mMode = MODE_START_DEMO_WAIT;
mModeTimer = 30;
@@ -1512,7 +1512,7 @@ void daB_ZANT_c::executeOpening() {
if (mModeTimer == 0) {
mMode = MODE_MSG_1;
setBck(ANM_OP_2, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_OP_2, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_OP_V_WAKEUP, -1);
}
break;
@@ -1527,7 +1527,7 @@ void daB_ZANT_c::executeOpening() {
if (mpModelMorf->isStop()) {
mMode = MODE_MSG_1_WAIT;
mModeTimer = 20;
setBck(ANM_OP_3, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_OP_3, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
setZantMessage(0xE3B); // My god had only one wish...
}
break;
@@ -1560,7 +1560,7 @@ void daB_ZANT_c::executeOpening() {
break;
case MODE_WARP_WAIT:
if (mModeTimer == 0) {
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
player->changeDemoMode(0x48, 0, 0, 0);
mMode = MODE_PAN_THRONE;
mModeTimer = 105;
@@ -1601,7 +1601,7 @@ void daB_ZANT_c::executeOpening() {
break;
case MODE_MSG_2:
if (doZantMessage() == true) {
setBck(ANM_OP_RISE, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_OP_RISE, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mMode = MODE_FLY_UP;
mModeTimer = 90;
mSound.startCreatureSound(Z2SE_EN_ZAN_OP_FLY, 0, -1);
@@ -1629,7 +1629,7 @@ void daB_ZANT_c::executeOpening() {
shape_angle.y = fopAcM_searchPlayerAngleY(this);
shape_angle.x = -fopAcM_searchPlayerAngleX(this) * 0.5f;
setBck(ANM_OP_RISE, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_OP_RISE, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
sp34.x = -140.0f;
sp34.y += 250.0f;
@@ -1701,7 +1701,7 @@ void daB_ZANT_c::executeOpening() {
calcRoomChangeCamera(0);
if (mModeTimer == 0) {
mMode = MODE_START_ROOM_CHANGE;
setBck(ANM_FLOAT_APPEAR, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
setBck(ANM_FLOAT_APPEAR, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mSound.startCreatureSound(Z2SE_EN_ZAN_MAHOJIN_BB, 0, -1);
field_0x714 = 1;
mKankyoBlend = 0.0f;
@@ -1723,7 +1723,7 @@ void daB_ZANT_c::executeOpening() {
if (mpModelMorf->isStop()) {
dComIfGp_getVibration().StopQuake(31);
setBck(ANM_FLOAT_APPEAR_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_APPEAR_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = MODE_ROOM_CHANGE;
mModeTimer = l_HIO.mMahojinWaitTime;
@@ -1770,7 +1770,7 @@ void daB_ZANT_c::executeOpening() {
mMode = MODE_END_DEMO;
field_0x714 = 0;
mKankyoBlend = 0.0f;
setBck(ANM_FLOAT_WAIT_RETURN, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
setBck(ANM_FLOAT_WAIT_RETURN, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMahojinAnmMode = 4;
}
break;
@@ -1809,7 +1809,7 @@ void daB_ZANT_c::executeFly() {
switch (mMode) {
case 0:
setTgHitBit(TRUE);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mModeTimer = 0;
mMode = 1;
gravity = 0.0f;
@@ -1831,7 +1831,7 @@ void daB_ZANT_c::executeFly() {
}
break;
case 10:
setBck(ANM_SWAMP_FALL_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SWAMP_FALL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_BB_V_FALL, -1);
mMode = 11;
@@ -1845,11 +1845,11 @@ void daB_ZANT_c::executeFly() {
case 12:
if (mMode == 11) {
if (mpModelMorf->isStop()) {
setBck(ANM_SWAMP_FALL_LOOP, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SWAMP_FALL_LOOP, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 12;
}
} else if (speed.y < -10.0f) {
setBck(ANM_SWAMP_FALL_B, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SWAMP_FALL_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 13;
}
case 13:
@@ -1878,7 +1878,7 @@ void daB_ZANT_c::executeFly() {
current.angle.y = (cM_rndFX(2.9f) * (f32)0x1000) - (f32)0x8000;
mMode = 11;
setBck(ANM_SWAMP_FALL_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SWAMP_FALL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_BB_V_JUMP, -1);
cXyz pos(current.pos.x, gnd_pos, current.pos.z);
@@ -1892,7 +1892,7 @@ void daB_ZANT_c::executeFly() {
} else {
fopAcM_effSmokeSet1(&field_0x3894, &field_0x3898, &current.pos, NULL, 2.0f, &tevStr, 1);
speedF = 0.0f;
setBck(ANM_SWAMP_LANDING, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f);
setBck(ANM_SWAMP_LANDING, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f);
mMode = 14;
setTgHitBit(TRUE);
setTgType(0xD8FBFDFF);
@@ -1937,7 +1937,7 @@ void daB_ZANT_c::executeFlyGround() {
}
speed.y = 0.0f;
speedF = 0.0f;
setBck(ANM_LV1_FATIGUE, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
setBck(ANM_LV1_FATIGUE, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mMode = 1;
field_0x702 = 0;
mSound.startCreatureVoice(Z2SE_EN_ZAN_BB_V_ZEIZEI, -1);
@@ -2015,7 +2015,7 @@ void daB_ZANT_c::executeHook() {
field_0x705 = 0;
field_0x706 = 0;
setBck(ANM_HOOK_HIT, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_HOOK_HIT, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 2;
field_0x6ff++;
break;
@@ -2026,7 +2026,7 @@ void daB_ZANT_c::executeHook() {
if (mpModelMorf->isStop()) {
mMode = 3;
setBck(ANM_HOOK_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_HOOK_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
case 3:
if (!fopAcM_checkStatus(this, 0x100000)) {
@@ -2054,7 +2054,7 @@ void daB_ZANT_c::executeWater() {
field_0x6f0 = 0x78;
field_0x705 = 1;
attention_info.flags = 4;
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
} else if (field_0x705 != 0) {
if (((daB_ZANTZ_c*)pmobile)->getAppearMode() == 3) {
mMode = 15;
@@ -2293,7 +2293,7 @@ void daB_ZANT_c::executeSwim() {
return;
}
setBck(ANM_HOOK_RELEASE, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_HOOK_RELEASE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 11;
case 11:
if (current.pos.y < 50.0f) {
@@ -2307,7 +2307,7 @@ void daB_ZANT_c::executeSwim() {
}
break;
case 0:
setBck(ANM_SWIM, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
setBck(ANM_SWIM, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mpModelMorf->setFrame(10.0f);
field_0x6cc = 0.0f;
attention_info.flags = 4;
@@ -2472,7 +2472,7 @@ void daB_ZANT_c::executeSimaJump() {
mBodySphCc[0].OnTgNoHitMark();
mBodySphCc[1].OnTgNoHitMark();
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
if (mLastAction == ACT_SMALL_ATTACK) {
field_0x702 = 0;
@@ -2485,7 +2485,7 @@ void daB_ZANT_c::executeSimaJump() {
}
attention_info.flags = 4;
setBck(ANM_LV1_FATIGUE, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_LV1_FATIGUE, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_MG_V_ZEIZEI, -1);
return;
}
@@ -2560,7 +2560,7 @@ void daB_ZANT_c::executeSimaJump() {
if (mMode == 1) {
if (mAcch.ChkGroundHit() && field_0x6ec == 0) {
setBck(ANM_JUMP_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 2;
}
} else if (mMode == 2) {
@@ -2574,7 +2574,7 @@ void daB_ZANT_c::executeSimaJump() {
}
} else if (mMode == 3) {
if (speed.y <= 0.0f) {
setBck(ANM_JUMP_B, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_JUMP_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 4;
}
} else if (mMode == 4) {
@@ -2631,7 +2631,7 @@ void daB_ZANT_c::executeIceDemo() {
mFootCc[iron_tg_cc[i]].OnTgIronBallRebound();
}
setBck(ANM_HUGE, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_HUGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
speedF = 0.0f;
gravity = 0.0f;
shape_angle.z = 0;
@@ -2656,7 +2656,7 @@ void daB_ZANT_c::executeIceDemo() {
case 2:
cLib_chaseF(&speed.y, 50.0f, 5.0f);
if (mpModelMorf->isStop()) {
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
setActionMode(ACT_ICE_JUMP, 3);
}
break;
@@ -2673,7 +2673,7 @@ void daB_ZANT_c::executeIceJump() {
switch (mMode) {
case 0:
setBck(ANM_HUGE_LANDING, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, -1.0f);
setBck(ANM_HUGE_LANDING, J3DFrameCtrl::EMode_NONE, 3.0f, -1.0f);
mMode = 1;
attention_info.flags = 0;
field_0x70e = 0;
@@ -2687,7 +2687,7 @@ void daB_ZANT_c::executeIceJump() {
break;
case 2:
if (mpModelMorf->isStop()) {
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 3;
}
case 3:
@@ -2724,7 +2724,7 @@ void daB_ZANT_c::executeIceJump() {
speed.y = 0.0f;
speedF = 0.0f;
setBck(ANM_HUGE_LANDING, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_HUGE_LANDING, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_YO_V_LAND, -1);
mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_L));
@@ -2874,19 +2874,19 @@ void daB_ZANT_c::executeIceStep() {
switch (var_r28) {
case 2:
setBck(ANM_TRAMPLE_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRAMPLE_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 2;
break;
case 3:
setBck(ANM_TRAMPLE_C, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRAMPLE_C, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 3;
break;
case 4:
setBck(ANM_TRAMPLE_B, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRAMPLE_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 4;
break;
case 5:
setBck(ANM_TRAMPLE_D, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRAMPLE_D, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 5;
break;
}
@@ -3065,9 +3065,9 @@ void daB_ZANT_c::executeIceDamage() {
field_0x70e = 2;
if (mMode == 0) {
setBck(ANM_SHIND_L, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_SHIND_L, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
} else {
setBck(ANM_SHIND_R, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_SHIND_R, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
mFoot2Cc[0].OffAtSetBit();
@@ -3178,9 +3178,9 @@ void daB_ZANT_c::executeIceDamage() {
}
if (cM_rnd() < 0.5f) {
setBck(ANM_DAMAGE_L_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DAMAGE_L_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else {
setBck(ANM_DAMAGE_R_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DAMAGE_R_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
}
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1);
@@ -3197,7 +3197,7 @@ void daB_ZANT_c::executeIceDamage() {
mModeTimer = 30;
}
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
break;
case 12:
@@ -3206,7 +3206,7 @@ void daB_ZANT_c::executeIceDamage() {
}
break;
case 20:
setBck(ANM_GROUND_REACTION, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_NO_DMG, -1);
mMode = 21;
speed.y = 0.0f;
@@ -3217,7 +3217,7 @@ void daB_ZANT_c::executeIceDamage() {
}
break;
case 40:
setBck(ANM_FAINT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 41;
speed.y = 0.0f;
speedF = 0.0f;
@@ -3404,15 +3404,15 @@ void daB_ZANT_c::executeMonkey() {
}
setNextPillarPos();
setBck(ANM_LV1_JUMP_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_LV1_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 8;
} else if (mLastAction == ACT_SMALL_ATTACK) {
mMode = 5;
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mModeTimer = 0;
} else {
mMode = 5;
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
field_0x70b = cM_rndF(2.9f) + 3.0f;
@@ -3433,12 +3433,12 @@ void daB_ZANT_c::executeMonkey() {
field_0x711 = 0;
setActionMode(ACT_WARP, 1);
} else {
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 2;
}
} else {
mMode = 5;
setBck(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
}
break;
@@ -3458,7 +3458,7 @@ void daB_ZANT_c::executeMonkey() {
cLib_addCalcAngleS2(&shape_angle.y, cLib_targetAngleY(&current.pos, &field_0x6ac), 8, 0x800);
if (mModeTimer == 0 && mAcch.ChkGroundHit()) {
setBck(ANM_LV1_JUMP_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_LV1_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 8;
}
break;
@@ -3485,7 +3485,7 @@ void daB_ZANT_c::executeMonkey() {
}
if (mModeTimer == 8) {
setBck(ANM_LB1_JUMP_B, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_LB1_JUMP_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
}
if (mAcch.ChkGroundHit()) {
@@ -3532,7 +3532,7 @@ void daB_ZANT_c::executeMonkeyFall() {
mModeTimer = 30;
}
setBck(ANM_FAINT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 1;
mBodySphCc[0].OffTgNoHitMark();
@@ -3545,7 +3545,7 @@ void daB_ZANT_c::executeMonkeyFall() {
}
break;
case 10:
setBck(ANM_FALL, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_FALL, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 11;
field_0x707 = 0;
setTgHitBit(FALSE);
@@ -3563,7 +3563,7 @@ void daB_ZANT_c::executeMonkeyFall() {
speedF = 8.0f;
current.angle.y = shape_angle.y + 0x8000;
setBck(ANM_LANDING, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0.0f);
setBck(ANM_LANDING, J3DFrameCtrl::EMode_NONE, 0.0f, 0.0f);
mMode = 12;
mBodySphCc[0].OnAtSetBit();
@@ -3605,7 +3605,7 @@ void daB_ZANT_c::executeMonkeyDamage() {
return;
}
setBck(ANM_LANDING_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_LANDING_DAMAGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1);
mMode = 1;
field_0x702 = 0;
@@ -3615,7 +3615,7 @@ void daB_ZANT_c::executeMonkeyDamage() {
}
if (mpModelMorf->isStop()) {
setBck(ANM_LANDING_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_LANDING_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 10;
}
break;
@@ -3628,7 +3628,7 @@ void daB_ZANT_c::executeMonkeyDamage() {
field_0x6f0 = 30;
}
setBck(ANM_LANDING_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_LANDING_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 10;
field_0x702 = 0;
case 10:
@@ -3823,7 +3823,7 @@ void daB_ZANT_c::executeLastStartDemo() {
} else {
camera->Stop();
camera->SetTrimSize(3);
setBck(ANM_LAST_DEMO, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_LAST_DEMO, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
mSound.startCreatureSound(Z2SE_EN_ZAN_CTL_OP, 0, -1);
mpModelMorf->setPlaySpeed(0.0f);
@@ -3935,7 +3935,7 @@ void daB_ZANT_c::executeLastAttack() {
if (field_0x713 == 0) {
mMode = 1;
setBck(ANM_SW_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SW_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mModeTimer = 60;
} else {
mMode = 5;
@@ -3964,7 +3964,7 @@ void daB_ZANT_c::executeLastAttack() {
if (fopAcM_searchPlayerDistance(this) < 800.0f || mModeTimer == 0) {
mMode = 2;
setBck(ANM_SW_WALK, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SW_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
}
break;
@@ -3997,11 +3997,11 @@ void daB_ZANT_c::executeLastAttack() {
break;
case 5:
if (field_0x713 == 0) {
setBck(ANM_SW_ATTACK, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SW_ATTACK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mModeTimer = 200;
speedF = 5.0f;
} else {
setBck(ANM_SW_ATTACK_B, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SW_ATTACK_B, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
if (field_0x713 != 2) {
mModeTimer = cM_rndF(60.0f) + 60.0f;
@@ -4099,13 +4099,13 @@ void daB_ZANT_c::executeLastAttack() {
mMode = 5;
} else {
mMode = 2;
setBck(ANM_SW_WALK, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SW_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
break;
case 10:
case 30:
dComIfGs_onOneZoneSwitch(1, fopAcM_GetRoomNo(this));
setBck(ANM_SPIN, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SPIN, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
if (field_0x704 == 0) {
if (field_0x713 != 2) {
@@ -4287,7 +4287,7 @@ void daB_ZANT_c::executeLastAttack() {
mRollCc.OffTgSetBit();
mRollCc.OffCoSetBit();
setBck(ANM_SW_FATIGUE, J3DFrameCtrl::LOOP_REPEAT_e, 30.0f, 1.0f);
setBck(ANM_SW_FATIGUE, J3DFrameCtrl::EMode_LOOP, 30.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_CTL_V_ZEIZEI, -1);
mMode = 13;
dComIfGs_offOneZoneSwitch(1, fopAcM_GetRoomNo(this));
@@ -4398,13 +4398,13 @@ void daB_ZANT_c::executeLastDamage() {
field_0x702 = 0;
if (mMode == 1) {
setBck(ANM_SW_DAMAGE_R, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SW_DAMAGE_R, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else if (mMode == 2) {
setBck(ANM_SW_DAMAGE_L, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SW_DAMAGE_L, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else if (cM_rnd() < 0.5f) {
setBck(ANM_SW_DAMAGE_L, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SW_DAMAGE_L, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
} else {
setBck(ANM_SW_DAMAGE_R, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SW_DAMAGE_R, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
}
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1);
@@ -4474,7 +4474,7 @@ void daB_ZANT_c::executeLastDamage() {
}
case 10:
attention_info.flags = 4;
setBck(ANM_GROUND_REACTION, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_NO_DMG, -1);
mMode = 11;
speedF = 0.0f;
@@ -4486,7 +4486,7 @@ void daB_ZANT_c::executeLastDamage() {
}
break;
case 20:
setBck(ANM_FAINT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
speedF = 0.0f;
speed.y = 0.0f;
field_0x702 = 0;
@@ -4532,7 +4532,7 @@ void daB_ZANT_c::executeLastEndDemo() {
camera->Stop();
camera->SetTrimSize(3);
setBck(ANM_DIE_DEMO, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DIE_DEMO, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureSound(Z2SE_EN_ZAN_END, 0, -1);
Z2GetAudioMgr()->bgmStop(30, 0);
fpcM_Search(s_del_tp, this);
@@ -4681,7 +4681,7 @@ void daB_ZANT_c::calcMahojinAnime() {
if (mpMahojinBrk2->isStop()) {
mMahojin2AnmMode = 0;
mpMahojinBrk2->init(mpMahojinModel2->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x4F), TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1);
mpMahojinBrk2->init(mpMahojinModel2->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x4F), TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1);
}
}
}
@@ -4812,7 +4812,7 @@ void daB_ZANT_c::executeRoomChange() {
mMode = 1;
if (mFightPhase != PHASE_MK) {
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
dComIfGp_particle_set(0x88FE, &current.pos, &shape_angle, NULL);
@@ -4839,7 +4839,7 @@ void daB_ZANT_c::executeRoomChange() {
current.angle.y = 0x8000;
shape_angle.y = 0x8000;
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
player->setPlayerPosAndAngle(&sp34, 0, 0);
player->changeOriginalDemo();
@@ -4899,7 +4899,7 @@ void daB_ZANT_c::executeRoomChange() {
if (mModeTimer == 0) {
mMode = 14;
setBck(ANM_FLOAT_APPEAR_SHORT, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
setBck(ANM_FLOAT_APPEAR_SHORT, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
field_0x714 = 1;
mKankyoBlend = 0.0f;
@@ -4932,7 +4932,7 @@ void daB_ZANT_c::executeRoomChange() {
if (mpModelMorf->isStop()) {
dComIfGp_getVibration().StopQuake(0x1F);
setBck(ANM_FLOAT_APPEAR_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_APPEAR_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mFightPhase++;
if (mFightPhase >= PHASE_MAX) {
@@ -4953,7 +4953,7 @@ void daB_ZANT_c::executeRoomChange() {
field_0x714 = 0;
mKankyoBlend = 0.0f;
setBck(ANM_FLOAT_WAIT_RETURN, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
setBck(ANM_FLOAT_WAIT_RETURN, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMahojinAnmMode = 4;
}
break;
src/d/actor/d_a_b_zant_mobile.cpp
+10 -10
View File
@@ -126,13 +126,13 @@ void daB_ZANTZ_c::setMouthMode(u8 param_0) {
if (param_0 == 2) {
if (mMouthMode == 0 || mMouthMode == 1) {
mMouthMode = 2;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x43), J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x43), J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f, 0.0f, -1.0f);
Z2GetAudioMgr()->seStart(Z2SE_EN_ZZ_CLOSE, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
} else if (param_0 == 0) {
if (mMouthMode == 2 || mMouthMode == 3) {
mMouthMode = 0;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f, 0.0f, -1.0f);
Z2GetAudioMgr()->seStart(Z2SE_EN_ZZ_OPEN, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
}
@@ -145,14 +145,14 @@ void daB_ZANTZ_c::setAppearMode(u8 param_0) {
if (param_0 == 2) {
if (mAppearMode == 0 || mAppearMode == 1) {
mAppearMode = 2;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
}
} else if (param_0 == 0) {
if (mAppearMode == 2 || mAppearMode == 3) {
mAppearMode = 0;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
@@ -174,7 +174,7 @@ void daB_ZANTZ_c::setAppearMode(u8 param_0) {
if (mAppearMode == 1) {
if (abs((s16)(fopAcM_searchPlayerAngleY(this) - shape_angle.y)) > 0x1800) {
mAppearMode = 4;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
}
@@ -183,7 +183,7 @@ void daB_ZANTZ_c::setAppearMode(u8 param_0) {
if (mAppearMode == 1) {
mAppearMode = 5;
mSearchContinue = true;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
}
@@ -262,7 +262,7 @@ void daB_ZANTZ_c::action() {
if (!var_f31) {
dComIfGp_getVibration().StopQuake(0x1F);
mAppearMode++;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_LOOP, 0.0f, 0.0f, 0.0f, -1.0f);
}
break;
}
@@ -285,7 +285,7 @@ void daB_ZANTZ_c::action() {
if (!var_f31) {
dComIfGp_getVibration().StopQuake(0x1F);
mAppearMode++;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_LOOP, 0.0f, 0.0f, 0.0f, -1.0f);
}
break;
}
@@ -317,7 +317,7 @@ void daB_ZANTZ_c::action() {
if (!field_0x660) {
dComIfGp_getVibration().StopQuake(0x1F);
mAppearMode = 1;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_LOOP, 0.0f, 0.0f, 0.0f, -1.0f);
}
} else {
cLib_chaseF(&field_0x660, 1.0f, 0.2f);
@@ -433,7 +433,7 @@ int daB_ZANTZ_c::CreateHeap() {
return 0;
}
if (!mpBrk->init(mpMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x50), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!mpBrk->init(mpMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x50), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_b_zant_sima.cpp
+2 -2
View File
@@ -164,7 +164,7 @@ int daB_ZANTS_c::CreateHeap() {
}
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("MAGNESIMA", 13);
if (!mpBtkAnm->init(mpModel->getModelData(), pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,
if (!mpBtkAnm->init(mpModel->getModelData(), pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,
-1))
{
return FALSE;
@@ -176,7 +176,7 @@ int daB_ZANTS_c::CreateHeap() {
}
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("MAGNESIMA", 10);
if (!mpBrkAnm->init(mpModel->getModelData(), pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,
if (!mpBrkAnm->init(mpModel->getModelData(), pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,
-1))
{
return FALSE;
src/d/actor/d_a_door_mbossL1.cpp
+1 -1
View File
@@ -969,7 +969,7 @@ int daMBdoorL1_c::openInit() {
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(1550, anm != 0);
int rt = mBckAnms[0]->init(anm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, true);
int rt = mBckAnms[0]->init(anm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true);
JUT_ASSERT(1552, rt == 0);
int level = getNowLevel(this);
u8 swBit3 = door_param2_c::getSwbit3(this);
src/d/actor/d_a_e_ba.cpp
+12 -12
View File
@@ -250,7 +250,7 @@ static void e_ba_roof(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_WAIT, 15.0f,
J3DFrameCtrl::LOOP_REPEAT_e, cM_rndF(0.1f) + 0.9f);
J3DFrameCtrl::EMode_LOOP, cM_rndF(0.1f) + 0.9f);
i_this->mMode = 1;
break;
@@ -277,7 +277,7 @@ static void e_ba_fight_fly(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mSpeedRatio = 0.0f;
break;
@@ -324,7 +324,7 @@ static void e_ba_fight(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_HOVERING, 2.0f,
J3DFrameCtrl::LOOP_REPEAT_e, cM_rndF(0.1f) + 1.0f);
J3DFrameCtrl::EMode_LOOP, cM_rndF(0.1f) + 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = 0;
i_this->mTimer[1] = cM_rndF(100.0f) + 30.0f;
@@ -396,7 +396,7 @@ static void e_ba_attack(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 2.0f);
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::EMode_LOOP, 2.0f);
i_this->mMode = 1;
i_this->mTimer[1] = 20;
break;
@@ -444,7 +444,7 @@ static void e_ba_attack(e_ba_class* i_this) {
static void e_ba_fly(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
break;
@@ -481,7 +481,7 @@ static void e_ba_fly(e_ba_class* i_this) {
static void e_ba_return(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mSpeedRatio = 0.0f;
@@ -511,7 +511,7 @@ static void e_ba_path_fly(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_FLY, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
// fallthrough
@@ -565,7 +565,7 @@ static void e_ba_path_fly(e_ba_class* i_this) {
static void e_ba_chance(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_HOVERING, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.5f);
anm_init(i_this, e_ba_class::ANM_HOVERING, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.5f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(30.0f) + 100.0f;
i_this->speed.x = 0.0f;
@@ -612,7 +612,7 @@ static void e_ba_wolfbite(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_HOLDWAIT, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_HOLDWAIT, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
break;
@@ -626,7 +626,7 @@ static void e_ba_wolfbite(e_ba_class* i_this) {
i_this->speedF = 40.0f;
i_this->speed.y = -20.0f;
i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_BA_V_DEATH, -1);
anm_init(i_this, e_ba_class::ANM_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mTimer[0] = 60;
i_this->mMode = 2;
i_this->health = 0;
@@ -671,7 +671,7 @@ static void e_ba_wind(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_FURA2, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_FURA2, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mWindSpinSpeed = -(cM_rndFX(1000.0f) + 15000.0f);
i_this->mWindOffset.x = cM_rndFX(50.0f);
@@ -709,7 +709,7 @@ static void e_ba_appear(e_ba_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_ba_class::ANM_APPEAR, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_ba_class::ANM_APPEAR, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(20.0f) + 40.0f;
i_this->speedF = 30.0f;
src/d/actor/d_a_e_dt.cpp
+40 -40
View File
@@ -873,7 +873,7 @@ void daE_DT_c::executeWait() {
mSound.startCreatureVoice(Z2SE_EN_DT_V_KYORO, -1);
}
if (mTimer == 0) {
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 2;
mTimer = (u8)(150.0f + cM_rndFX(30.0f));
}
@@ -881,7 +881,7 @@ void daE_DT_c::executeWait() {
case 2:
if (mTimer == 0) {
setBck(ANM_KYORO_2, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_KYORO_2, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 1;
mTimer = 180;
}
@@ -898,14 +898,14 @@ void daE_DT_c::executeCry() {
if (checkBeforeBg(1200.0f)) {
mMode = 1;
mTimer = 30;
setBck(ANM_STEP, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_STEP, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
if ((s16)(shape_angle.y - fopAcM_searchPlayerAngleY(this)) < 0) {
mTargetAngleY = shape_angle.y + 0x4000;
} else {
mTargetAngleY = shape_angle.y - 0x4000;
}
} else {
setBck(ANM_CROAK, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_CROAK, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
field_0x704 = 0;
mMode = 2;
}
@@ -917,7 +917,7 @@ void daE_DT_c::executeCry() {
if (checkBeforeBg(1200.0f)) {
mTimer = 30;
} else {
setBck(ANM_CROAK, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_CROAK, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
field_0x704 = 0;
mMode = 2;
}
@@ -956,7 +956,7 @@ void daE_DT_c::executeCry() {
void daE_DT_c::executeShake() {
switch (mMode) {
case 0:
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mTimer = 30;
mMode = 1;
break;
@@ -964,7 +964,7 @@ void daE_DT_c::executeShake() {
case 1:
if (mTimer == 0) {
setSwingEffect();
setBck(ANM_SWING, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SWING, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 2;
field_0x704 = 0;
mTimer = 60;
@@ -996,13 +996,13 @@ void daE_DT_c::executeWalk() {
|| mLegCcSph[0].ChkTgHit() || mLegCcSph[1].ChkTgHit()))
{
mMode = 7;
setBck(ANM_SMALL_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SMALL_DAMAGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureSound(Z2SE_EN_DT_SMALL_DAMAGE, 0, -1);
}
switch (mMode) {
case 0:
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mTimer = 30;
mMode = 1;
mWalkTimer = 1200;
@@ -1010,7 +1010,7 @@ void daE_DT_c::executeWalk() {
case 1:
if (mTimer == 0) {
setBck(ANM_STEP, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_STEP, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
offset.set(0.0f, 0.0f, 1500.0f);
s16 angle = cM_rndFX(0x2000) + fopAcM_searchPlayerAngleY(this) + 0x8000;
cLib_offsetPos(&mTargetPos, &home.pos, angle, &offset);
@@ -1023,7 +1023,7 @@ void daE_DT_c::executeWalk() {
if (cLib_chaseAngleS(&shape_angle.y, mTargetAngleY, 0x100)) {
current.angle.y = shape_angle.y;
mTimer = 300;
setBck(ANM_WALK_01, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_WALK_01, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mMode = 3;
}
break;
@@ -1040,7 +1040,7 @@ void daE_DT_c::executeWalk() {
}
cLib_chaseF(&speedF, l_HIO.mWalkSpeed, 1.0f);
if (mTimer == 0 || mTargetPos.absXZ(current.pos) < 300.0f) {
setBck(ANM_STEP, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_STEP, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mTargetAngleY = cLib_targetAngleY(&current.pos, &home.pos);
mMode = 4;
speedF = 0.0f;
@@ -1050,7 +1050,7 @@ void daE_DT_c::executeWalk() {
case 4:
if (cLib_chaseAngleS(&shape_angle.y, mTargetAngleY, 0x100)) {
current.angle.y = shape_angle.y;
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mMode = 5;
field_0x704 = 0;
}
@@ -1065,7 +1065,7 @@ void daE_DT_c::executeWalk() {
field_0x704++;
if (field_0x704 >= 150) {
mMode = 6;
setBck(ANM_KYORO_2, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_KYORO_2, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_DT_V_KYORO, -1);
}
}
@@ -1076,7 +1076,7 @@ void daE_DT_c::executeWalk() {
mSound.startCreatureVoice(Z2SE_EN_DT_V_KYORO, -1);
}
if (mpMorf->isStop()) {
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mMode = 5;
field_0x704 = 0;
}
@@ -1084,7 +1084,7 @@ void daE_DT_c::executeWalk() {
case 7:
if (mpMorf->isStop()) {
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 5;
field_0x704 = 0;
}
@@ -1116,7 +1116,7 @@ void daE_DT_c::executeJump() {
switch (mMode) {
case 0:
setBck(ANM_STEP, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_STEP, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
speed.y = 0.0f;
speedF = 0.0f;
gravity = -5.0f;
@@ -1131,7 +1131,7 @@ void daE_DT_c::executeJump() {
|| fopAcM_searchPlayerDistance(this) < 700.0f)
{
mMode = 2;
setBck(ANM_JUMP_START, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_JUMP_START, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_DT_V_JUMP, -1);
setJumpEffect();
if (!field_0x783) {
@@ -1152,7 +1152,7 @@ void daE_DT_c::executeJump() {
mMode = 3;
mTimer = 60;
current.angle.y = cLib_targetAngleY(&current.pos, &player_pos);
setBck(ANM_JUMP_TOP, J3DFrameCtrl::LOOP_ONCE_e, 20.0f, 1.0f);
setBck(ANM_JUMP_TOP, J3DFrameCtrl::EMode_NONE, 20.0f, 1.0f);
}
break;
@@ -1260,7 +1260,7 @@ void daE_DT_c::executeJump() {
mFlyingAttackLand = true;
dComIfGp_getVibration().StartQuake(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
mQuakeTimer = 30;
setBck(ANM_JUMP_END, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_JUMP_END, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 6;
mSound.startCreatureSound(Z2SE_EN_DT_SPLASH, 0, -1);
}
@@ -1312,7 +1312,7 @@ void daE_DT_c::executeDown() {
// fallthrough
case 1:
setBck(ANM_DOWN_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_DOWN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
speed.y = 0.0f;
speedF = 0.0f;
mMode = 3;
@@ -1328,7 +1328,7 @@ void daE_DT_c::executeDown() {
Z2GetAudioMgr()->changeSubBgmStatus(1);
mTimer = 0;
mSound.startCreatureVoice(Z2SE_EN_DT_V_DOWN_DAMAGE2, -1);
setBck(ANM_DOWN_DAMAGE_2, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DOWN_DAMAGE_2, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
speed.y = 0.0f;
speedF = 0.0f;
mMode = 4;
@@ -1352,7 +1352,7 @@ void daE_DT_c::executeDown() {
} else {
Z2GetAudioMgr()->changeSubBgmStatus(1);
}
setBck(ANM_DOWN_RETURN_2, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DOWN_RETURN_2, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_DT_V_RETURN, -1);
mMode = 5;
} else {
@@ -1391,7 +1391,7 @@ void daE_DT_c::executeDown() {
void daE_DT_c::executeSearch() {
switch (mMode) {
case 0:
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mTimer = 30;
mMode = 1;
break;
@@ -1423,7 +1423,7 @@ void daE_DT_c::executeDamage() {
mTimer = 120;
}
mSound.startCreatureVoice(Z2SE_EN_DT_V_DOWN_DAMAGE, -1);
setBck(ANM_DOWN_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DOWN_DAMAGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 1;
break;
@@ -1446,7 +1446,7 @@ void daE_DT_c::executeBombDamage() {
setBombEffect();
setBombSmokeEffect();
mSound.startCreatureVoice(Z2SE_EN_DT_CROAK_DAMAGE, -1);
setBck(ANM_CROAK_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_CROAK_DAMAGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 1;
break;
@@ -1489,7 +1489,7 @@ void daE_DT_c::executeDeath() {
case 0:
mSound.startCreatureVoice(Z2SE_EN_DT_V_TODOME, -1);
attention_info.flags = 0;
setBck(ANM_DOWN_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_DOWN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mTimer = 30;
mMode = 1;
mDead = 1;
@@ -1530,7 +1530,7 @@ void daE_DT_c::executeDeath() {
mCamFovy = 55.0f;
camera->mCamera.SetTrimSize(3);
attention_info.flags = 0;
setBck(ANM_DEAD, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DEAD, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_DT_V_DEAD, -1);
mMode = 3;
mTimer = 300;
@@ -1664,7 +1664,7 @@ void daE_DT_c::executeOpening() {
switch (mMode) {
case 0:
mMode = 1;
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
attention_info.flags = 0;
if (getNumberOfOtama() == 0) {
for (i = 0; i < 20; i++) {
@@ -1701,7 +1701,7 @@ void daE_DT_c::executeOpening() {
field_0x704 = 0;
if (mMode == 1) {
if (mTimer == 0) {
setBck(ANM_OP_DEMO_SWING, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_SWING, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 2;
field_0x775 = cM_rndF(2.9f);
}
@@ -1726,14 +1726,14 @@ void daE_DT_c::executeOpening() {
&shape_angle, NULL, 0xff);
}
if (mpMorf->isStop() && getNumberOfOtama() <= 20) {
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 1;
mTimer = 300.0f + cM_rndFX(60.0f);
}
}
} else {
if (field_0x704 != 0) {
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
field_0x704++;
}
if (in_sight) {
@@ -1744,7 +1744,7 @@ void daE_DT_c::executeOpening() {
mCamBank = camera->Bank();
player->onPlayerNoDraw();
camera->SetTrimSize(3);
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 3;
Z2GetAudioMgr()->subBgmStart(Z2BGM_DEKUTOAD_D01);
dComIfGs_onOneZoneSwitch(3, fopAcM_GetRoomNo(this));
@@ -1767,7 +1767,7 @@ void daE_DT_c::executeOpening() {
cLib_chasePos(&mCamCenter, vec2, 5.0f);
if (mTimer == 0) {
mMode = 5;
setBck(ANM_OP_DEMO_SWING, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_SWING, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mTimer = 60;
field_0x704 = 0;
}
@@ -1787,7 +1787,7 @@ void daE_DT_c::executeOpening() {
}
if (mpMorf->isStop()) {
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
if (mTimer == 0) {
@@ -1818,7 +1818,7 @@ void daE_DT_c::executeOpening() {
cLib_chasePos(&mCamCenter, vec2, 50.0f);
if (mTimer == 0) {
setBck(ANM_OP_DEMO_FALL, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO_FALL, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 7;
}
break;
@@ -1854,7 +1854,7 @@ void daE_DT_c::executeOpening() {
cLib_chasePos(&mCamCenter, vec2, field_0x6e8);
if (mpMorf->isStop()) {
setBck(ANM_JUMP_TOP, J3DFrameCtrl::LOOP_ONCE_e, 20.0f, 1.0f);
setBck(ANM_JUMP_TOP, J3DFrameCtrl::EMode_NONE, 20.0f, 1.0f);
}
cLib_chaseF(&speedF, 0.0f, 1.0f);
if (mTimer < 15) {
@@ -1889,7 +1889,7 @@ void daE_DT_c::executeOpening() {
if (mAcch.ChkGroundHit()) {
setLargeWaterEffect();
mMode = 11;
setBck(ANM_OP_DEMO, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_OP_DEMO, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
dComIfGp_getVibration().StartQuake(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
mQuakeTimer = 30;
mSound.startCreatureSound(Z2SE_EN_DT_SPLASH, 0, -1);
@@ -1964,7 +1964,7 @@ void daE_DT_c::executeOpening() {
}
if (mpMorf->isStop()) {
setBck(ANM_WAIT_01, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_01, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 32;
mTimer = 45;
player->changeOriginalDemo();
@@ -2493,7 +2493,7 @@ int daE_DT_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_DT", 28);
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DT", 23),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1,
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1,
&mSound, 0, 0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
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;
src/d/actor/d_a_e_hzelda.cpp
+2 -2
View File
@@ -212,7 +212,7 @@ static void e_hzelda_wait(e_hzelda_class* i_this) {
case -1:
Z2GetAudioMgr()->bgmStart(Z2BGM_VS_GANON_01, 0, 0);
case 0:
anm_init(i_this, ANM_FWAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_FWAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimers[TIMER_ATTACK_WAIT] = cM_rndF(150.0f) + 100.0f;
i_this->mMoveStep = 0.0f;
@@ -304,7 +304,7 @@ static int e_hzelda_attack_a(e_hzelda_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_BEFORE_ATTACK, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_BEFORE_ATTACK, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->field_0x5c4 = i_this->mTargetMovePos;
/* fallthrough */
src/d/actor/d_a_e_ot.cpp
+8 -8
View File
@@ -366,7 +366,7 @@ void daE_OT_c::executeBorn() {
speedF = 0.0f;
mHatched = true;
mMode = 1;
setBck(ANM_BORN, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_BORN, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 1;
mSound.startCreatureSound(Z2SE_EN_OT_BORN, 0, -1);
if (mDemoMode == 3) {
@@ -401,7 +401,7 @@ void daE_OT_c::executeAttack() {
switch (mMode) {
case 0:
setBck(ANM_SWIM, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SWIM, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
// fallthrough
case 10:
@@ -465,7 +465,7 @@ void daE_OT_c::executePanic() {
}
gravity = -5.0f;
mMode = 2;
setBck(ANM_BORN, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_BORN, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
break;
case 2:
@@ -481,7 +481,7 @@ void daE_OT_c::executePanic() {
if (mpMorf->isStop()) {
speedF = 20.0f;
mMode = 4;
setBck(ANM_SWIM, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SWIM, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
break;
@@ -500,7 +500,7 @@ void daE_OT_c::executePanic() {
case 5:
mTimer1 = 11.0f + cM_rndFX(3.0f);
mMode = 6;
setBck(ANM_BORN, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_BORN, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
gravity = 0.0f;
speedF = 0.0f;
// fallthrough
@@ -543,7 +543,7 @@ void daE_OT_c::executeDamage() {
attention_info.flags = 0;
mAtSph.OffAtSetBit();
mCcSph.OffTgSetBit();
setBck(ANM_DAMAGE, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_DAMAGE, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_OT_V_DEATH, -1);
speedF = 20.0f + cM_rndFX(5.0f);
speed.y = 40.0f + cM_rndFX(5.0f);
@@ -755,7 +755,7 @@ int daE_OT_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_OT", 14);
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_OT", ANM_BORN),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, &mSound,
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mSound,
0x80000, 0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
@@ -773,7 +773,7 @@ int daE_OT_c::CreateHeap() {
}
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_OT", 17);
if (!mpEggAnm->init(mpEggModel->getModelData(), btk, TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) {
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_e_ph.cpp
+15 -15
View File
@@ -168,7 +168,7 @@ int daE_PH_c::CreateHeap() {
mpMorf = new mDoExt_McaMorfSO(
modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", ANM_WAIT),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
}
@@ -238,7 +238,7 @@ void daE_PH_c::SearchNearP() {
void daE_PH_c::FlyAnm() {
if (mAnmID == ANM_DAMAGE_ARROW || mAnmID == ANM_HANG_START || mAnmID == ANM_HANG_WAIT) {
if (mpMorf->isStop()) {
SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
}
mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, &current.pos, &tevStr,
@@ -254,17 +254,17 @@ void daE_PH_c::FlyAnm() {
field_0x5ae = 15;
field_0x616 = 0x1000;
field_0x618 = 0x1000;
SetAnm(ANM_HANG_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_HANG_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
} else if (mAnmID != ANM_WAIT) {
SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
}
} else if (mAnmID == ANM_HANG_WAIT) {
if (!fopAcM_checkHookCarryNow(this) || !dComIfGp_checkPlayerStatus1(0, 0x10000)) {
SetAnm(ANM_HANG_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, mAnmSpeed);
SetAnm(ANM_HANG_END, J3DFrameCtrl::EMode_NONE, 5.0f, mAnmSpeed);
}
} else if (mAnmID == ANM_HANG_END) {
if (mpMorf->isStop()) {
SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
}
}
}
@@ -587,7 +587,7 @@ void daE_PH_c::S_SetAngle() {
void daE_PH_c::FlyAnm2() {
if (mAnmID == ANM_DAMAGE_ARROW || mAnmID == ANM_HANG_START || mAnmID == ANM_HANG_WAIT) {
if (mpMorf->isStop()) {
SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
}
mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, &current.pos, &tevStr,
@@ -606,21 +606,21 @@ void daE_PH_c::FlyAnm2() {
field_0x5ae = 15;
field_0x616 = 0x1000;
field_0x618 = 0x1000;
SetAnm(ANM_HANG_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_HANG_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
} else if (fopAcM_checkHookCarryNow(this)) {
attention_info.flags = 0;
} else if (mAnmID != ANM_WAIT) {
SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
}
} else if (mAnmID == ANM_HANG_WAIT) {
attention_info.flags = 0;
if (!fopAcM_checkHookCarryNow(this) || !dComIfGp_checkPlayerStatus1(0, 0x10000)) {
SetAnm(ANM_HANG_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, mAnmSpeed);
SetAnm(ANM_HANG_END, J3DFrameCtrl::EMode_NONE, 5.0f, mAnmSpeed);
}
} else if (mAnmID == ANM_HANG_END) {
if (mpMorf->isStop()) {
SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed);
SetAnm(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, mAnmSpeed);
}
}
}
@@ -855,7 +855,7 @@ void daE_PH_c::DemoAction() {
if (mpMorf->isStop()) {
mCAction++;
mTimers[0] = 50;
SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
if (speed.y <= 0.0f) {
@@ -1090,9 +1090,9 @@ void daE_PH_c::ObjHit() {
if (hit_obj->ChkAtType(AT_TYPE_HOOKSHOT)) {
field_0x616 = 0x1000;
field_0x618 = 0x1000;
SetAnm(ANM_HANG_START, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f);
SetAnm(ANM_HANG_START, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f);
} else {
SetAnm(ANM_DAMAGE_ARROW, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f);
SetAnm(ANM_DAMAGE_ARROW, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f);
}
dComIfGp_particle_set(0x878E, &current.pos, &tevStr, &shape_angle, NULL);
@@ -1312,7 +1312,7 @@ int daE_PH_c::create() {
if (mAction == 4 || mAction == 5) {
mpMorf->setPlaySpeed(0.0f);
SetAnm(ANM_APPEAR, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 0.0f);
SetAnm(ANM_APPEAR, J3DFrameCtrl::EMode_NONE, 5.0f, 0.0f);
mAnmID = ANM_WAIT;
}
src/d/actor/d_a_e_pm.cpp
+63 -63
View File
@@ -152,7 +152,7 @@ int daE_PM_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1d);
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x10),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1,
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1,
&mCreatureSound, 0x80000, 0x11020084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
@@ -164,7 +164,7 @@ int daE_PM_c::CreateHeap() {
}
if (!mpEyeAnm->init(mpMorf->getModel()->getModelData(),
(J3DAnmTexPattern*)dComIfG_getObjectRes("E_PM", 0x23),
TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) {
TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) {
return 5;
}
@@ -176,7 +176,7 @@ int daE_PM_c::CreateHeap() {
mpTrumpetMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1f), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x19),
J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, 1, NULL,
J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL,
0x80000, 0x11000084);
if (mpTrumpetMorf == NULL || mpTrumpetMorf->getModel() == NULL) {
return 0;
@@ -184,7 +184,7 @@ int daE_PM_c::CreateHeap() {
mpGlowEffectMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1c), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 5),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL,
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL,
0x80000, 0x11000084);
if (mpGlowEffectMorf == NULL || mpGlowEffectMorf->getModel() == NULL) {
return 0;
@@ -511,7 +511,7 @@ void daE_PM_c::Ap_StartAction() {
mTargetAngleY = shape_angle.y;
mMode++;
gravity = -5.0f;
SetAnm(ANM_APPEAR01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
Particle_Set(0x880D, current.pos);
}
@@ -529,7 +529,7 @@ void daE_PM_c::Ap_StartAction() {
NULL, NULL, NULL);
if (mAnm == ANM_APPEAR02 && mpMorf->isStop()) {
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_LAUGH, -1);
}
@@ -538,7 +538,7 @@ void daE_PM_c::Ap_StartAction() {
}
if (mAcch.ChkGroundHit() && mTimer[0] == 0) {
SetAnm(ANM_APPEAR02, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mTargetHeadAngleX = 0x2000;
mTimer[0] = 40;
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_L, 0, -1);
@@ -592,14 +592,14 @@ void daE_PM_c::Ap_CreateAction() {
switch (mMode) {
case 0:
if (mAnm != ANM_FOGBLOW_ST) {
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_FOGBLOW, -1);
} else if (mpMorf->isStop() && mAnm == ANM_FOGBLOW_ST) {
SetAnm(ANM_FOGBLOW_LP, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_LP, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mTimer[0] = 80;
mMode++;
mpTrumpetMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x19),
J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
vec2.set(0.0f, 0.0f, 150.0f);
vec5 = mCamEyeTarget;
cLib_offsetPos(&mCamEyeTarget, &vec5, shape_angle.y, &vec2);
@@ -675,7 +675,7 @@ void daE_PM_c::Ap_CreateAction() {
if (mTimer[0] == 0) {
field_0x618 = 1;
mAction = ACT_ESCAPE;
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f);
current.pos.set(mPoint.x, mPoint.y, mPoint.z);
old.pos = current.pos;
vec1.set(mPoint.x, mPoint.y + 120.0f, mPoint.z);
@@ -705,7 +705,7 @@ void daE_PM_c::Ap_EscapeAction() {
cLib_addCalcAngleS2(&mHeadAngleZ, -0x500, 4, 0x600);
if (mTimer[0] == 0) {
SetAnm(ANM_RUN, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_RUN, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mMode++;
mTargetSpeed = 13.0f;
}
@@ -809,7 +809,7 @@ void daE_PM_c::DemoBeforeEscape() {
mPuppetDelete = 1;
attention_info.flags = 0;
speedF = 0.0f;
SetAnm(ANM_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 0.5f);
SetAnm(ANM_DAMAGE, J3DFrameCtrl::EMode_NONE, 5.0f, 0.5f);
mDemoMode++;
vec1.set(current.pos.x, current.pos.y + 100.0f, current.pos.z);
s16 angle = cLib_targetAngleY(&current.pos, s_LinkPos);
@@ -900,7 +900,7 @@ void daE_PM_c::DemoAfterEscape() {
mTargetAngleY = shape_angle.y;
current.pos.set(mPoint.x, mPoint.y + 200.0f, mPoint.z);
old.pos = current.pos;
SetAnm(ANM_APPEAR01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mDemoMode++;
gravity = -3.0f;
speed.y = 0.0f;
@@ -917,7 +917,7 @@ void daE_PM_c::DemoAfterEscape() {
if (mAcch.ChkGroundHit()) {
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_L, 0, -1);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mDemoMode++;
mTimer[0] = 50;
mBossLightOn = true;
@@ -932,7 +932,7 @@ void daE_PM_c::DemoAfterEscape() {
vec2 = *s_LinkPos - vec1;
if (mpMorf->isStop() && mAnm == ANM_APPEAR02) {
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
player->offPlayerNoDraw();
player->offPlayerShadowNoDraw();
}
@@ -952,7 +952,7 @@ void daE_PM_c::DemoAfterEscape() {
if (mTimer[0] == 0) {
mDemoMode++;
mTargetSpeed = 13.0f;
SetAnm(ANM_RUN, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_RUN, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
SetStopingCam();
@@ -1004,7 +1004,7 @@ void daE_PM_c::WaitAction() {
switch (mMode) {
case 0:
speedF = 0.0f;
SetAnm(ANM_GLAD, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_GLAD, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mTimer[0] = (u8)(cM_rndFX(50.0f) + 200.0f);
mMode++;
break;
@@ -1014,7 +1014,7 @@ void daE_PM_c::WaitAction() {
if (s_dis < l_HIO.mEscapeRange && angle > -0x4000 && angle < 0x4000) {
mMode++;
mTimer[0] = 10;
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
break;
}
@@ -1071,7 +1071,7 @@ void daE_PM_c::GroundCheck() {
if (current.pos.y - vec3.y > 50.0f) {
speedF = 0.0f;
mTargetSpeed = 0.0f;
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
for (int i = 0; i < 4; i++) {
mTargetAngleY = current.angle.y + (i + 1) * 0x4000;
vec1.set(0.0f, 50.0f, 300.0f);
@@ -1082,7 +1082,7 @@ void daE_PM_c::GroundCheck() {
if (dComIfG_Bgsp().LineCross(&lin_chk)) break;
}
mMode = 10;
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
} else if (current.pos.y - vec4.y > 50.0f) {
mTargetAngleY = s_TargetAngle;
}
@@ -1095,7 +1095,7 @@ void daE_PM_c::GroundCheck() {
void daE_PM_c::EscapeAction() {
switch (mMode) {
case 0:
SetAnm(ANM_RUN, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_RUN, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mTargetSpeed = 13.0f;
speedF = 10.0f;
mMode++;
@@ -1176,14 +1176,14 @@ void daE_PM_c::DeathAction() {
case 0:
attention_info.flags = 0;
speedF = 0.0f;
SetAnm(ANM_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_DAMAGE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMode++;
break;
case 1:
if (mpMorf->getFrame() > 20.0f) {
mMode++;
SetAnm(ANM_HIDE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_HIDE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_FADEOUT, -1);
}
break;
@@ -1270,7 +1270,7 @@ void daE_PM_c::DemoBossStart2() {
mDemoMode++;
current.pos.y = 2500.0f;
old.pos = current.pos;
SetAnm(ANM_APPEAR01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
speed.y = 0.0f;
gravity = -3.0f;
Particle_Set(0x880D, current.pos);
@@ -1287,11 +1287,11 @@ void daE_PM_c::DemoBossStart2() {
mCamCenterTarget.y = current.pos.y + 100.0f;
if (mAcch.ChkGroundHit() && mAnm == ANM_APPEAR01) {
SetAnm(ANM_APPEAR02, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_L, 0, -1);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1);
} else if (mpMorf->isStop() && mAnm == ANM_APPEAR02) {
SetAnm(ANM_OP, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_OP, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_OP, -1);
mDemoMode++;
mBossLightOn = true;
@@ -1331,7 +1331,7 @@ void daE_PM_c::DemoBossStart2() {
case 3:
if (mTimer[0] == 0) {
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_FOGBLOW, -1);
mDemoMode++;
for (int i = 0; i < mPuppetNum; i++) {
@@ -1358,7 +1358,7 @@ void daE_PM_c::DemoBossStart2() {
case 5:
if (mpMorf->isStop()) {
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mpTrumpetMorf->setPlaySpeed(0.0f);
mDemoMode++;
mTimer[0] = 70;
@@ -1401,7 +1401,7 @@ void daE_PM_c::DemoBossStart() {
}
if (mAnm == ANM_WAIT01 && mTimer[0] == 0) {
SetAnm(ANM_OP, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_OP, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_OP, -1);
mDemoMode++;
}
@@ -1411,7 +1411,7 @@ void daE_PM_c::DemoBossStart() {
case 1:
if (mpMorf->isStop()) {
SetAnm(ANM_HIDE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_HIDE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_FADEOUT, -1);
mCamCenterTarget.y += 100.0f;
mDemoMode++;
@@ -1450,7 +1450,7 @@ void daE_PM_c::DemoBossStart() {
if (mpMorf->isStop() && mAnm == ANM_HIDE) {
mPoint = dPath_GetPnt(mpPath, 1)->m_position;
current.pos.set(mPoint.x, mPoint.y + 10000.0f, mPoint.z);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mTimer[1] = 15;
MTXCopy(mpMorf->getModel()->getAnmMtx(JNT_WAIST), *calc_mtx);
vec1.set(0.0f, -30.0f, 0.0f);
@@ -1504,14 +1504,14 @@ void daE_PM_c::DemoBossStart() {
}
if (mAcch.ChkGroundHit() && mAnm == ANM_APPEAR01) {
SetAnm(ANM_APPEAR02, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_L, 0, -1);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1);
vec1.set(mPoint.x, mPoint.y, mPoint.z);
vec2.set(0.0f, 100.0f, 250.0f);
cLib_offsetPos(&mCamEyeTarget, &vec1, shape_angle.y, &vec2);
} else if (mpMorf->isStop() && mAnm == ANM_APPEAR02) {
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
cLib_addCalcAngleS2(&current.angle.y, mTargetAngleY, 0x10, 0x1000);
@@ -1521,7 +1521,7 @@ void daE_PM_c::DemoBossStart() {
case 4:
if (mTimer[0] == 0) {
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_FOGBLOW, -1);
mDemoMode++;
for (int i = 0; i < mPuppetNum; i++) {
@@ -1552,7 +1552,7 @@ void daE_PM_c::DemoBossStart() {
case 6:
if (mpMorf->isStop()) {
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mpTrumpetMorf->setPlaySpeed(0.0f);
mDemoMode++;
mTimer[0] = 70;
@@ -1584,7 +1584,7 @@ void daE_PM_c::BossEscapeAction() {
switch (mMode) {
case 0:
attention_info.flags = 0;
SetAnm(ANM_HIDE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_HIDE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_FADEOUT, -1);
mCcCyl.OnTgNoHitMark();
mMode++;
@@ -1599,7 +1599,7 @@ void daE_PM_c::BossEscapeAction() {
if (mpMorf->isStop()) {
SearchRndP();
SetAnm(ANM_APPEAR01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
current.pos.set(mPoint.x, mPoint.y + 100.0f, mPoint.z);
old.pos = current.pos;
mMode++;
@@ -1614,7 +1614,7 @@ void daE_PM_c::BossEscapeAction() {
shape_angle.y = current.angle.y;
if (mAcch.ChkGroundHit()) {
SetAnm(ANM_APPEAR02, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMode++;
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_L, 0, -1);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1);
@@ -1677,7 +1677,7 @@ void daE_PM_c::BossDamageAction() {
mAction = ACT_DEATH;
mMode = 0;
mDemoMode = 0;
SetAnm(ANM_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_END, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_DEATH, -1);
mPuppetDelete = 1;
mBossLightOn = false;
@@ -1687,7 +1687,7 @@ void daE_PM_c::BossDamageAction() {
mCamEyeTarget.y += 100.0f;
} else {
SetAnm(ANM_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_DAMAGE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMode++;
mPuppetDelete = 1;
vec1.set(current.pos.x, current.pos.y + 50.0f, current.pos.z);
@@ -1698,7 +1698,7 @@ void daE_PM_c::BossDamageAction() {
case 1:
if (mpMorf->isStop()) {
SetAnm(ANM_HIDE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_HIDE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_FADEOUT, -1);
mMode++;
mCamCenterTarget.y += 200.0f;
@@ -1718,7 +1718,7 @@ void daE_PM_c::BossDamageAction() {
if (mpMorf->isStop() && mAnm == ANM_HIDE) {
SearchFarP();
SetAnm(ANM_APPEAR01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
current.pos.set(mPoint.x, mPoint.y + 10000.0f, mPoint.z);
mTimer[1] = 20;
MTXCopy(mpMorf->getModel()->getAnmMtx(JNT_WAIST), *calc_mtx);
@@ -1755,7 +1755,7 @@ void daE_PM_c::BossDamageAction() {
shape_angle.y = current.angle.y;
if (mAcch.ChkGroundHit()) {
SetAnm(ANM_APPEAR02, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMode++;
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_L, 0, -1);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1);
@@ -1783,7 +1783,7 @@ void daE_PM_c::BossDamageAction() {
break;
case 10:
SetAnm(ANM_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_DAMAGE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMode++;
break;
@@ -1802,9 +1802,9 @@ void daE_PM_c::BossWaitAction() {
switch (mMode) {
case 0:
if (mSecondEncounter) {
SetAnm(ANM_GLAD, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_GLAD, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
} else {
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
mMode++;
break;
@@ -2047,7 +2047,7 @@ void daE_PM_c::StartAction() {
mPuppetNum = 4;
if (mStage == 1) {
if (mAnm != ANM_GLAD) {
SetAnm(ANM_GLAD, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_GLAD, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
daE_PM_c* other = (daE_PM_c*)fpcM_Search(s_obj_sub, this);
@@ -2069,7 +2069,7 @@ void daE_PM_c::StartAction() {
} else if (mStage == 2) {
if (mAnm != ANM_GLAD) {
SetAnm(ANM_GLAD, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_GLAD, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
if (dComIfGs_isSwitch(0x81, fopAcM_GetRoomNo(this))
@@ -2081,7 +2081,7 @@ void daE_PM_c::StartAction() {
} else if (mStage == 3) {
if (mAnm != ANM_GLAD) {
SetAnm(ANM_GLAD, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_GLAD, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
if (dComIfGs_isSwitch(0x82, fopAcM_GetRoomNo(this))
@@ -2094,7 +2094,7 @@ void daE_PM_c::StartAction() {
} else if (mStage == 4) {
SearchNearP();
mCcStts.Init(0xFA, 0xFF, this);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mMode += 3;
for (int i = 0; i < mPuppetNum; i++) {
mPuppetID[i] = -1;
@@ -2104,12 +2104,12 @@ void daE_PM_c::StartAction() {
case 1:
if (mTimer[0] == 0 && mAcch.ChkGroundHit()) {
SetAnm(ANM_APPEAR02, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_L, 0, -1);
mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1);
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("E_PM", 0x22);
mpEyeAnm->init(mpMorf->getModel()->getModelData(), btp, TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
mMode++;
}
break;
@@ -2134,11 +2134,11 @@ void daE_PM_c::StartAction() {
shape_angle.y = s_TargetAngle;
if (mTimer[0] == 0 && mAnm != ANM_KYORO2) {
SetAnm(ANM_KYORO2, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_KYORO2, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
}
if (mpMorf->isStop()) {
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mTimer[0] = (u8)(cM_rndFX(50.0f) + 200.0f);
}
@@ -2185,10 +2185,10 @@ void daE_PM_c::GakkiLoopAction(cXyz param_0, f32 param_1) {
cXyz vec3;
if (mAnm == ANM_FOGBLOW_ST && mpMorf->isStop()) {
SetAnm(ANM_FOGBLOW_LP, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_LP, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mTimer[0] = 0;
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x19);
mpTrumpetMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
mpTrumpetMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
dBgS_LinChk lin_chk;
for (int i = 0; i < mPuppetNum; i++) {
@@ -2221,7 +2221,7 @@ void daE_PM_c::GakkiLoopAction(cXyz param_0, f32 param_1) {
}
if (mTimer[0] == 0) {
SetAnm(ANM_FOGBLOW_EN, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_EN, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMode++;
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_LAUGH, -1);
}
@@ -2244,7 +2244,7 @@ void daE_PM_c::DemoCreateAction() {
cXyz vec1, vec2, vec3;
switch (mMode) {
case 0:
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_FOGBLOW, -1);
mMode++;
speedF = 0.0f;
@@ -2296,7 +2296,7 @@ void daE_PM_c::CreateAction() {
switch (mMode) {
case 0:
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_FOGBLOW_ST, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_FOGBLOW, -1);
mMode++;
speedF = 0.0f;
@@ -2368,7 +2368,7 @@ void daE_PM_c::DamageAction() {
switch (mMode) {
case 0:
speedF = 0.0f;
SetAnm(ANM_DAMAGE, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f);
SetAnm(ANM_DAMAGE, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
mMode++;
break;
@@ -2727,7 +2727,7 @@ void daE_PM_c::SkipChk() {
mCcCyl.OffTgNoHitMark();
mAction = ACT_CREATE;
mMode = 0;
SetAnm(ANM_GLAD, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_GLAD, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
current.pos.y = mAcch.GetGroundH();
old.pos.y = current.pos.y;
mBossLightOn = true;
@@ -2744,7 +2744,7 @@ void daE_PM_c::SkipChk() {
mPoint = dPath_GetPnt(mpPath, 1)->m_position;
current.pos.set(mPoint.x, mPoint.y, mPoint.z);
old.pos = current.pos;
SetAnm(ANM_WAIT01, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f);
SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
}
}
}
src/d/actor/d_a_e_rdy.cpp
+126 -126
View File
@@ -551,7 +551,7 @@ static void ride_off(e_rdy_class* i_this) {
i_this->mRideState = 0;
if (i_this->mpBowMorf != NULL) {
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setFrame(10.0f);
}
i_this->home.pos = i_this->current.pos;
@@ -710,7 +710,7 @@ static void e_rdy_normal(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
if (i_this->field_0x5bb) {
anm_init(i_this, ANM_ARMAMENT, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ARMAMENT, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
} else {
i_this->mMode = 2;
@@ -733,7 +733,7 @@ static void e_rdy_normal(e_rdy_class* i_this) {
i_this->mMode = 0;
return;
} else if (way_check(i_this)) {
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 3;
i_this->mTimer[0] = cM_rndF(100.0f) + 100.0f;
}
@@ -747,13 +747,13 @@ static void e_rdy_normal(e_rdy_class* i_this) {
if (i_this->speedF >= 3.0f && move_gake_check(i_this, 100.0f)) {
i_this->mMode = 4;
i_this->mTimer[0] = cM_rndF(100.0f) + 50.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else if (i_this->mTimer[0] == 0
|| (i_this->speedF >= 3.0f && way_bg_check(i_this, 200.0f)))
{
i_this->mMode = 2;
i_this->mTimer[0] = cM_rndF(100.0f) + 50.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
@@ -761,7 +761,7 @@ static void e_rdy_normal(e_rdy_class* i_this) {
i_this->field_0xa98 = -1;
if (i_this->mTimer[0] == 0) {
i_this->mTargetAngleY = i_this->current.angle.y + 0x8000 + (int)cM_rndFX(4000.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 3;
i_this->mTimer[0] = cM_rndF(100.0f) + 100.0f;
}
@@ -827,7 +827,7 @@ static void e_rdy_fight_run(e_rdy_class* i_this) {
} else {
i_this->mAction = ACT_NORMAL;
i_this->mTimer[0] = cM_rndF(50.0f) + 50.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
i_this->mMode = 0;
return;
@@ -844,7 +844,7 @@ static void e_rdy_fight_run(e_rdy_class* i_this) {
break;
case -10:
anm_init(i_this, ANM_WAIT01, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[1] = cM_rndF(10.0f) + 15.0f;
i_this->mMode = -9;
break;
@@ -857,10 +857,10 @@ static void e_rdy_fight_run(e_rdy_class* i_this) {
case 0:
if (i_this->field_0x5bb) {
anm_init(i_this, ANM_ARMAMENT, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ARMAMENT, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = -20;
} else if (i_this->mTimer[1] == 0) {
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, cM_rndFX(0.05f) + 1.0f);
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::EMode_LOOP, cM_rndFX(0.05f) + 1.0f);
i_this->mMode = 1;
}
break;
@@ -868,7 +868,7 @@ static void e_rdy_fight_run(e_rdy_class* i_this) {
case 1:
target_speed = run_speed;
if (i_this->mPlayerDist < l_HIO.field_0x18) {
anm_init(i_this, ANM_KAMAE, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KAMAE, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
}
break;
@@ -903,7 +903,7 @@ static void e_rdy_fight_run(e_rdy_class* i_this) {
if (i_this->mMode < 5 && move_gake_check(i_this, 100.0f)) {
i_this->mMode = 5;
i_this->mTimer[3] = cM_rndF(15.0f) + 30.0f;
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->mMode >= 0) {
@@ -919,14 +919,14 @@ static void e_rdy_fight_run(e_rdy_class* i_this) {
i_this->mAction = ACT_NORMAL;
if (i_this->mMode == 5) {
i_this->mTargetAngleY = i_this->current.angle.y + 0x8000 + (int)cM_rndFX(4000.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 3;
i_this->mTimer[0] = cM_rndF(100.0f) + 100.0f;
i_this->mTimer[1] = 40;
} else {
i_this->mMode = 0;
i_this->mTimer[0] = cM_rndF(50.0f) + 50.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
} else {
if (i_this->mPlayerDist < l_HIO.field_0x18 && (i_this->field_0xaf0 & cc_pl_cut_bit_get())
@@ -976,7 +976,7 @@ static void e_rdy_fight(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_ATTACK01, 6.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK01, 6.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
if (l_HIO.field_0x38 == 0) {
i_this->mTimer[0] = 25;
} else if (l_HIO.field_0x38 == 1) {
@@ -996,7 +996,7 @@ static void e_rdy_fight(e_rdy_class* i_this) {
if (frame == 30) {
i_this->mpMorf->setFrame(0.0f);
} else if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_ATTACK01, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, l_HIO.mAttackAnmSpeed);
anm_init(i_this, ANM_ATTACK01, 2.0f, J3DFrameCtrl::EMode_NONE, l_HIO.mAttackAnmSpeed);
i_this->mpMorf->setFrame(30.0f);
i_this->mMode = 2;
}
@@ -1028,7 +1028,7 @@ static void e_rdy_fight(e_rdy_class* i_this) {
} else if (l_HIO.field_0x38 == 2) {
i_this->mTimer[0] = 10;
}
anm_init(i_this, ANM_KAMAE, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KAMAE, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
@@ -1075,7 +1075,7 @@ static void e_rdy_bow_run(e_rdy_class* i_this) {
break;
case -10:
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(10.0f) + 15.0f;
i_this->mMode = -9;
break;
@@ -1089,10 +1089,10 @@ static void e_rdy_bow_run(e_rdy_class* i_this) {
case 0:
if (i_this->field_0x5bb) {
anm_init(i_this, ANM_ARMAMENT, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ARMAMENT, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = -20;
} else {
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(50.0f) + 20.0f;
if (i_this->mPlayerDist < l_HIO.field_0x28 - 100.0f) {
i_this->mMode = 1;
@@ -1148,7 +1148,7 @@ static void e_rdy_bow_run(e_rdy_class* i_this) {
i_this->mAction = ACT_NORMAL;
i_this->mMode = 0;
i_this->mTimer[0] = cM_rndF(50.0f) + 50.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else if ((i_this->mCounter & 0xf) == 0 && bomb_view_check(i_this)) {
i_this->mAction = ACT_BOMB_ACTION;
i_this->mMode = 0;
@@ -1166,9 +1166,9 @@ static void e_rdy_bow(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mMode = 1;
i_this->speedF = 0.0f;
break;
@@ -1182,7 +1182,7 @@ static void e_rdy_bow(e_rdy_class* i_this) {
i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1);
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(10.0f) + 10.0f;
i_this->mMode = 2;
}
@@ -1192,9 +1192,9 @@ static void e_rdy_bow(e_rdy_class* i_this) {
i_this->field_0xa98 = 4;
if (i_this->mTimer[0] == 0) {
if (!i_this->field_0xa74 && !dMsgObject_isTalkNowCheck()) {
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mMode = 3;
} else {
i_this->mAction = ACT_BOW_RUN;
@@ -1275,7 +1275,7 @@ static s8 e_rdy_bow2(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(40.0f) + 60.0f;
}
@@ -1283,16 +1283,16 @@ static s8 e_rdy_bow2(e_rdy_class* i_this) {
case 1:
if (i_this->mTimer[0] == 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->mTimer[0] = cM_rndF(100.0f) + 100.0f;
i_this->mMode = 0;
}
break;
case 2:
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mMode = 3;
i_this->speedF = 0.0f;
break;
@@ -1306,7 +1306,7 @@ static s8 e_rdy_bow2(e_rdy_class* i_this) {
i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1);
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(10.0f);
i_this->mMode = 4;
}
@@ -1324,9 +1324,9 @@ static s8 e_rdy_bow2(e_rdy_class* i_this) {
if ((sw_bit == 0xff || (sw_bit != 0xff && bVar2)) && !dMsgObject_isTalkNowCheck()
&& !i_this->field_0xa74)
{
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mMode = 5;
}
}
@@ -1370,7 +1370,7 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) {
switch (i_this->mMode) {
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->current.pos.x = -92938.0f;
i_this->current.pos.z = 49992.0f;
@@ -1394,9 +1394,9 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) {
break;
case 4:
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mMode = 5;
break;
@@ -1408,7 +1408,7 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) {
i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1);
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 6;
i_this->mTimer[0] = 40;
}
@@ -1416,9 +1416,9 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) {
case 6:
if (i_this->mTimer[0] == 0 && !i_this->field_0xa74) {
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mMode = 7;
}
i_this->mHasArrow = true;
@@ -1433,7 +1433,7 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
i_this->mMode = 2;
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);
}
break;
}
@@ -1458,7 +1458,7 @@ static void e_rdy_avoid(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_AVOID, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_AVOID, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->speedF = -30.0f;
i_this->speed.y = 20.0f;
@@ -1529,13 +1529,13 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
i_this->mDemoMode = 10;
i_this->mDemoTimer = 0;
i_this->mMode = 2;
anm_init(i_this, ANM_WAIT01, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
switch (i_this->mMode) {
case 0:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_WALK, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(60.0f) + 60.0f;
i_this->mMode = 1;
vec.x = i_this->home.pos.x + cM_rndFX(200.0f) - i_this->current.pos.x;
@@ -1547,7 +1547,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
case 1:
target_speed = l_HIO.mWalkSpeed;
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_KYORO2, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 0;
i_this->mTimer[0] = cM_rndF(30.0f) + 60.0f;
}
@@ -1565,7 +1565,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
}
}
} else if (i_this->mDemoTimer == 110) {
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 3;
i_this->mDemoMode++;
i_this->mDemoTimer = 0;
@@ -1577,7 +1577,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
vec = grass->current.pos - i_this->current.pos;
i_this->mTargetAngleY = cM_atan2s(vec.x, vec.z);
if (vec.abs() < 160.0f) {
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = 20;
i_this->mMode = 4;
}
@@ -1585,7 +1585,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
case 4:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_PICKUP, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_PICKUP, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 5;
}
break;
@@ -1601,7 +1601,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
i_this->mDemoMode++;
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_BLOW, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_BLOW, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 6;
i_this->mTimer[0] = 220;
}
@@ -1635,11 +1635,11 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
if (i_this->mTimer[0] == 1) {
i_this->mDemoMode = 16;
i_this->mDemoTimer = 0;
anm_init(i_this, ANM_WAIT01, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
Z2GetAudioMgr()->setBattleBgmOff(false);
}
if (i_this->mDemoTimer == 309) {
anm_init(i_this, ANM_LOOKBACK, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_LOOKBACK, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mIsHoldingGrass = false;
kargarok->mMode = 4;
kargarok->speedF = 30.0f;
@@ -1662,7 +1662,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
case 8:
if (i_this->mDemoTimer == 95) {
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
vec = kargarok->current.pos - i_this->current.pos;
i_this->mTargetAngleY = cM_atan2s(vec.x, vec.z);
i_this->mDemoMode = 18;
@@ -1674,7 +1674,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
case 9:
if (i_this->mDemoTimer == 10) {
anm_init(i_this, ANM_JUMP_A, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_JUMP_A, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_JUMP_RIDING, -1);
i_this->mMode = 10;
i_this->home = i_this->current;
@@ -1684,7 +1684,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
case 10:
if (i_this->mpMorf->isStop()) {
i_this->mMode = 11;
anm_init(i_this, ANM_JUMP_B, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_JUMP_B, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mRideState = 1;
i_this->mJumpSpeed = 50.0f;
i_this->mTimer[3] = 30;
@@ -1693,7 +1693,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
case 11:
if (i_this->mJumpHeight <= 0.0f) {
anm_init(i_this, ANM_RJUMP_C, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RJUMP_C, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 12;
kargarok->field_0x698 = -27.0f;
}
@@ -1701,7 +1701,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
case 12:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_RHOVERING, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RHOVERING, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mpMorf->setFrame(kargarok->mpMorf->getFrame());
i_this->mMode = 13;
kargarok->mMode = 6;
@@ -1750,26 +1750,26 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
if (kargarok->mAnm == e_yc_class::ANM_HOVERING && i_this->mAnm != ANM_RHOVERING) {
anm_init(i_this, ANM_RHOVERING, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RHOVERING, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mpMorf->setFrame(kargarok->mpMorf->getFrame());
} else if (kargarok->mAnm == e_yc_class::ANM_FLY && i_this->mAnm != ANM_RFLY) {
anm_init(i_this, ANM_RFLY, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RFLY, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mpMorf->setFrame(kargarok->mpMorf->getFrame());
} else if (kargarok->mAnm == e_yc_class::ANM_FLY_GLIDE && i_this->mAnm != ANM_RFLY_GLIDE) {
anm_init(i_this, ANM_RFLY_GLIDE, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RFLY_GLIDE, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mpMorf->setFrame(kargarok->mpMorf->getFrame());
} else if (kargarok->mAnm == e_yc_class::ANM_HANGED && kargarok_frame == 1) {
anm_init(i_this, ANM_RHANGED, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RHANGED, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (kargarok->mAnm == e_yc_class::ANM_HANGED_WAIT
&& i_this->mAnm != ANM_RHANGED_WAIT) {
anm_init(i_this, ANM_RHANGED_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RHANGED_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mpMorf->setFrame(kargarok->mpMorf->getFrame());
} else if (kargarok->mAnm == e_yc_class::ANM_HANGED_DAMAGE && kargarok_frame == 1) {
anm_init(i_this, ANM_RHANGED_DAMAGE, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RHANGED_DAMAGE, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (kargarok->mAnm == e_yc_class::ANM_HANGED_BRUSH && kargarok_frame == 1) {
anm_init(i_this, ANM_RHANGED_BRASH, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RHANGED_BRASH, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (kargarok->mAnm == e_yc_class::ANM_HANGED_BRUSH2 && kargarok_frame == 1) {
anm_init(i_this, ANM_RHANGED_BRASH2, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RHANGED_BRASH2, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
if (i_this->mAnm == ANM_RHOVERING) {
i_this->mMode = 1;
@@ -1779,9 +1779,9 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) {
case 1:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_RSHOOT_READY, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RSHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 9);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f);
i_this->mMode = 2;
}
break;
@@ -1792,16 +1792,16 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
i_this->mMode = 3;
anm_init(i_this, ANM_RSHOOT_WAIT, 4.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_RSHOOT_WAIT, 4.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
i_this->mHasArrow = true;
break;
case 3:
if (i_this->mTimer[1] == 0 && !dComIfGp_event_runCheck()) {
anm_init(i_this, ANM_RSHOOT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RSHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mMode = 4;
}
i_this->mHasArrow = true;
@@ -1816,9 +1816,9 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
if (kargarok->mAnm == e_yc_class::ANM_HOVERING) {
anm_init(i_this, ANM_RSHOOT_READY, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RSHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 9);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f);
i_this->mMode = 2;
i_this->mTimer[1] = cM_rndF(30.0f) + 20.0f;
} else {
@@ -1855,14 +1855,14 @@ static void e_rdy_bomb_action(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mMode = 1;
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[1] = cM_rndF(10.0f) + 10.0f;
// fallthrough
case 1:
if (i_this->mTimer[1] == 0 && bomb->speedF < 0.1f) {
i_this->mMode = 2;
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, cM_rndFX(0.05f) + 1.0f);
anm_init(i_this, ANM_RUN, 5.0f, J3DFrameCtrl::EMode_LOOP, cM_rndFX(0.05f) + 1.0f);
}
break;
@@ -1880,7 +1880,7 @@ static void e_rdy_bomb_action(e_rdy_class* i_this) {
target_speed = l_HIO.mRunSpeed;
if (JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z) > 600.0f) {
i_this->mMode = 3;
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
@@ -1899,7 +1899,7 @@ static void e_rdy_bomb_action(e_rdy_class* i_this) {
} else if (JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z) < 100.0f) {
i_this->mTimer[0] = 20;
i_this->mMode = 6;
anm_init(i_this, ANM_KICK, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_KICK, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
break;
@@ -1922,7 +1922,7 @@ static void e_rdy_bomb_action(e_rdy_class* i_this) {
}
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 3;
}
break;
@@ -2072,7 +2072,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DIEB, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEB, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->speedF = 0.0f;
ride_off(i_this);
@@ -2126,7 +2126,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
i_this->mMode = 2;
s16 angle_y;
if (!i_this->mIsUpsideDown) {
anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
angle_y = i_this->field_0xadc.y;
} else {
angle_y = i_this->field_0xadc.y + 0x8000;
@@ -2166,9 +2166,9 @@ static void e_rdy_damage(e_rdy_class* i_this) {
dKy_Sound_set(i_this->current.pos, 100, fopAcM_GetID(i_this), 5);
i_this->field_0xaee = 10;
if (!i_this->mIsUpsideDown) {
anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DIEB, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEB, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
i_this->field_0xabc = 0.0f;
i_this->field_0xadc.x = -0x4000;
@@ -2212,9 +2212,9 @@ static void e_rdy_damage(e_rdy_class* i_this) {
i_this->offDownFlg();
i_this->mMode = 20;
if (!i_this->mIsUpsideDown) {
anm_init(i_this, ANM_DIEA_UP, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEA_UP, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DIEB_UP, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEB_UP, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
if (i_this->field_0x5b8 == 12) {
i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_CALLING, -1);
@@ -2230,7 +2230,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
if (i_this->mAcch.ChkGroundHit()) {
i_this->mMode = 2;
if (!i_this->mIsUpsideDown) {
anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->field_0xaf4 = -100.0f;
i_this->field_0xafc = -100.0f;
} else {
@@ -2261,7 +2261,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->field_0xadc.y = 0;
i_this->field_0xadc.x = 0;
anm_init(i_this, ANM_WAIT01, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = 5;
i_this->mMode = 21;
i_this->offDownFlg();
@@ -2271,7 +2271,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
case 21:
if (i_this->mTimer[0] == 0) {
i_this->mTimer[0] = cM_rndF(20.0f) + 20.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 22;
}
break;
@@ -2282,7 +2282,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
i_this->mAction = ACT_NORMAL;
i_this->mMode = 0;
i_this->mTimer[0] = cM_rndF(50.0f) + 50.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
@@ -2293,9 +2293,9 @@ static void e_rdy_damage(e_rdy_class* i_this) {
if (i_this->mTimer[0] == 0) {
i_this->mMode = 31;
if (!i_this->mIsUpsideDown) {
anm_init(i_this, ANM_DIEA_UP, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEA_UP, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DIEB_UP, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DIEB_UP, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
i_this->mTimer[0] = 10;
} else if (i_this->mTimer[1] == 1) {
@@ -2367,7 +2367,7 @@ static void* s_bikkuri_sub(void* i_proc, void* i_this) {
if (other != _this && other->mAction == ACT_BOW3 && other->mMode <= 2) {
cXyz delta = other->current.pos - _this->current.pos;
if (delta.abs() < 350.0f) {
anm_init(other, ANM_KYORO2, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.3f);
anm_init(other, ANM_KYORO2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.3f);
other->mMode = 3;
other->mTimer[0] = cM_rndF(20.0f) + 40.0f;
}
@@ -2383,14 +2383,14 @@ static void e_rdy_drop(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1);
anm_init(i_this, ANM_DAMAGE_S, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_S, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
break;
case 1:
i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1);
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_FURA2, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_FURA2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTargetAngleY = gake_check(i_this, 200.0f);
fpcM_Search(s_bikkuri_sub, i_this);
@@ -2453,7 +2453,7 @@ static void e_rdy_a_damage(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mMode = 1;
anm_init(i_this, ANM_DEAD_ARROW, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_ARROW, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mTimer[0] = 80;
dKy_Sound_set(i_this->current.pos, 100, fopAcM_GetID(i_this), 5);
break;
@@ -2473,7 +2473,7 @@ static void e_rdy_stand(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(40.0f) + 60.0f;
}
@@ -2481,7 +2481,7 @@ static void e_rdy_stand(e_rdy_class* i_this) {
case 1:
if (i_this->mTimer[0] == 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->mTimer[0] = cM_rndF(100.0f) + 100.0f;
i_this->mMode = 0;
}
@@ -2523,7 +2523,7 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
turn_to_player = false;
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;
break;
@@ -2539,10 +2539,10 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) {
case 5:
if (i_this->mTimer[1] == 1) {
anm_init(i_this, ANM_KYORO2, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.3f);
anm_init(i_this, ANM_KYORO2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.3f);
}
if (i_this->mTimer[0] == 10) {
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->mTimer[0] == 0) {
i_this->mAction = ACT_BOW2;
@@ -2552,9 +2552,9 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) {
case 10:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f, 0.0f, -1.0f);
i_this->mMode = 11;
i_this->speedF = 0.0f;
}
@@ -2569,7 +2569,7 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) {
i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1);
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_SHOOT_WAIT, 4.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(10.0f) + 10.0f;
i_this->mMode = 12;
}
@@ -2578,9 +2578,9 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) {
case 12:
i_this->field_0xa98 = 4;
if (i_this->mTimer[0] == 0 && !i_this->field_0xa74 && !dMsgObject_isTalkNowCheck()) {
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
i_this->mMode = 13;
}
i_this->mHasArrow = true;
@@ -2656,7 +2656,7 @@ static void e_rdy_commander(e_rdy_class* i_this) {
case 1:
bVar1 = true;
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTimer[0] = cM_rndF(40.0f) + 60.0f;
}
@@ -2665,14 +2665,14 @@ static void e_rdy_commander(e_rdy_class* i_this) {
case 2:
bVar1 = true;
if (i_this->mTimer[0] == 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->mTimer[0] = cM_rndF(100.0f) + 100.0f;
i_this->mMode = 1;
}
break;
case 5:
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = 30;
i_this->mMode = 6;
break;
@@ -2680,7 +2680,7 @@ static void e_rdy_commander(e_rdy_class* i_this) {
case 6:
turn_to_player = true;
if (i_this->mTimer[0] == 0) {
anm_init(i_this, ANM_GOSIGN, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOSIGN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
mDoAud_seStart(Z2SE_EN_RD_V_CALLING, NULL, 0, 0);
i_this->mMode = 7;
if (dComIfGp_event_runCheck()) {
@@ -2697,7 +2697,7 @@ static void e_rdy_commander(e_rdy_class* i_this) {
fpcM_Search(s_command2_sub, i_this);
}
if (i_this->mTimer[0] == 0 && i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
if (!dComIfGp_event_runCheck() && !pl_check(i_this, i_this->mPlayerCheckDist, 0x4000)) {
i_this->mMode = 10;
i_this->mTimer[1] = 350;
@@ -2713,7 +2713,7 @@ static void e_rdy_commander(e_rdy_class* i_this) {
break;
case 10:
anm_init(i_this, ANM_GOSIGN, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOSIGN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
mDoAud_seStart(Z2SE_EN_RD_V_CALLING, NULL, 0, 0);
fpcM_Search(s_command2_sub, i_this);
i_this->mMode = 11;
@@ -2722,7 +2722,7 @@ static void e_rdy_commander(e_rdy_class* i_this) {
case 11:
if (i_this->mpMorf->isStop()) {
if (i_this->mTimer[1] == 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->mTimer[0] = cM_rndF(30.0f) + 30.0f;
i_this->mMode = 1;
} else {
@@ -2751,7 +2751,7 @@ static void e_rdy_excite(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_WAIT01, 4.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT01, 4.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(20.0f) + 20.0f;
i_this->mTargetAngleY = i_this->current.angle.y;
@@ -2764,11 +2764,11 @@ static void e_rdy_excite(e_rdy_class* i_this) {
if (i_this->mTimer[0] == 0) {
if (i_this->field_0x1365) {
i_this->mMode = 3;
anm_init(i_this, ANM_KYORO2, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.3f);
anm_init(i_this, ANM_KYORO2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.3f);
i_this->mTimer[0] = cM_rndF(20.0f) + 40.0f;
} else {
i_this->mMode = 2;
anm_init(i_this, ANM_RUN, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e,
anm_init(i_this, ANM_RUN, 2.0f, J3DFrameCtrl::EMode_LOOP,
cM_rndFX(0.05f) + 1.0f);
i_this->mTimer[0] = cM_rndF(15.0f) + 30.0f;
}
@@ -2784,7 +2784,7 @@ static void e_rdy_excite(e_rdy_class* i_this) {
vec = i_this->field_0x5bc - i_this->current.pos;
if (i_this->mTimer[0] == 0 || move_gake_check(i_this, 100.0f) || vec.abs() < 100.0f) {
i_this->mMode = 3;
anm_init(i_this, ANM_KYORO2, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.3f);
anm_init(i_this, ANM_KYORO2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.3f);
i_this->mTimer[0] = cM_rndF(20.0f) + 40.0f;
}
break;
@@ -2816,9 +2816,9 @@ static void e_rdy_water(e_rdy_class* i_this) {
case 0: {
i_this->speed.y = 0.0f;
if (!i_this->mIsUpsideDown) {
anm_init(i_this, ANM_DROWNEDA, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DROWNEDA, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else {
anm_init(i_this, ANM_DROWNEDB, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DROWNEDB, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
i_this->mTimer[0] = 60;
i_this->mMode = 1;
@@ -2849,7 +2849,7 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) {
switch (i_this->mMode) {
case 0: {
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
dStage_dPnt_c* point = &i_this->mpPath->m_points[i_this->mPathIndex];
i_this->field_0x5bc = point->m_position;
@@ -2875,7 +2875,7 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) {
}
i_this->mMode = 2;
i_this->mTimer[0] = cM_rndF(100.0f) + 100.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
@@ -2887,7 +2887,7 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) {
break;
case 10:
anm_init(i_this, ANM_SHOUT, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOUT, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 11;
dKy_Sound_set(i_this->current.pos, 100, fopAcM_GetID(i_this), 3);
S_find = 20;
@@ -2927,7 +2927,7 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) {
if (bVar1) {
i_this->mMode = 2;
i_this->mTimer[0] = cM_rndF(100.0f) + 100.0f;
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else if ((i_this->mCounter & 7) == 0 && pl_check(i_this, check_dist, check_angle)) {
if (S_find == 0) {
i_this->mMode = 10;
@@ -3003,14 +3003,14 @@ static void small_damage(e_rdy_class* i_this, int i_collider) {
if (i_collider == 0) {
s16 angle_diff = i_this->shape_angle.y - i_this->mPlayerAngle;
if (angle_diff < -0x4000 || angle_diff > 0x4000) {
anm_init(i_this, ANM_DAMAGE_W, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_W, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (angle_diff < 0) {
anm_init(i_this, ANM_DAMAGE_L, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_L, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DAMAGE_R, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_R, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
} else {
anm_init(i_this, ANM_DAMAGE_W, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_W, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
i_this->mKnockback = 20.0f;
@@ -3128,7 +3128,7 @@ static void damage_check(e_rdy_class* i_this) {
if (i_this->mpBowMorf != NULL) {
J3DAnmTransform* bck =
(J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11);
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::LOOP_ONCE_e,
i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE,
1.0f, 1.0f, 0.0f, -1.0f);
break;
} else {
@@ -4206,7 +4206,7 @@ static void demo_camera(e_rdy_class* i_this) {
player->setPlayerPosAndAngle(&vec2, 0, 0);
fpcM_Search(s_adel_sub, i_this);
i_this->mMode = 2;
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);
csXyz angle(0, 0x4000, 0);
vec2.set(-93652.0f, -5875.0f, 46674.0f);
fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(i_this), 0x80000011, &vec2,
@@ -4713,7 +4713,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
_this->mpMorf = new mDoExt_McaMorfSO(
(J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 81), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes(_this->mpArcName, 76),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, &_this->mSound, 0x80000, 0x11000084);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &_this->mSound, 0x80000, 0x11000084);
if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) {
return 0;
}
@@ -4737,7 +4737,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
_this->mpBowMorf = new mDoExt_McaMorfSO(
(J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 84), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes(_this->mpArcName, 11),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, NULL, 0x80000, 0x11000084);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, NULL, 0x80000, 0x11000084);
if (_this->mpBowMorf == NULL || _this->mpBowMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_s1.cpp
+34 -34
View File
@@ -480,7 +480,7 @@ static void e_s1_wait(e_s1_class* i_this) {
i_this->mTargetAngle = a_this->current.angle.y + var_r27;
i_this->mTimers[0] = cM_rndF(100.0f) + 100.0f;
i_this->mMode = 1;
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
}
break;
@@ -489,12 +489,12 @@ static void e_s1_wait(e_s1_class* i_this) {
if (i_this->mTimers[0] == 0 || var_f30 > i_this->field_0x3068) {
i_this->mMode = 0;
i_this->mTimers[0] = cM_rndF(100.0f) + 100.0f;
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
case 2:
i_this->mMode = 3;
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
/* fallthrough */
case 3:
angle_step = 0x100;
@@ -530,7 +530,7 @@ static void e_s1_roof(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_STICK, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_STICK, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
/* fallthrough */
case 1:
@@ -554,7 +554,7 @@ static void e_s1_roof(e_s1_class* i_this) {
i_this->mDrawShadow = true;
if (i_this->mAcch.ChkGroundHit()) {
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 4;
i_this->mSound.startCreatureSound(Z2SE_EN_NS_DOSA, 0, -1);
}
@@ -584,7 +584,7 @@ static void e_s1_fight_run(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DASH_01, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DASH_01, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mpMorf->setFrame(cM_rndF(10.0f));
i_this->mMode = 1;
/* fallthrough */
@@ -614,18 +614,18 @@ static void e_s1_fight(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimers[0] = 30.0f + cM_rndF(30.0f);
i_this->mMode = 1;
break;
case 1:
if (i_this->mTimers[0] == 0) {
if (cM_rndF(1.0f) < 0.3333f) {
anm_init(i_this, ANM_ATTACK, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_EN_NS_V_ATTACK, -1);
i_this->mIsSlowAttack = 0;
} else {
anm_init(i_this, ANM_ATTACK_02, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK_02, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_EN_NS_V_ATTACK2, -1);
i_this->mIsSlowAttack = 1;
}
@@ -672,7 +672,7 @@ static void e_s1_bibiri(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_SHRINK, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f + cM_rndFX(0.1f));
anm_init(i_this, ANM_SHRINK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f + cM_rndFX(0.1f));
i_this->mpMorf->setFrame(cM_rndF(15.0f));
i_this->mTimers[0] = l_HIO.mReactionTime + cM_rndF(10.0f);
i_this->mMode = 1;
@@ -685,7 +685,7 @@ static void e_s1_bibiri(e_s1_class* i_this) {
}
if (i_this->mTimers[0] == 0) {
anm_init(i_this, ANM_SHRINK_DOWN, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHRINK_DOWN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 2;
}
break;
@@ -709,7 +709,7 @@ static void e_s1_damage(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DAMAGED, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGED, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
break;
case 1:
@@ -736,7 +736,7 @@ static void e_s1_path(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mMode = 1;
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
/* fallthrough */
case 1:
i_this->mCurrentPathPointNo += i_this->mPathDirection;
@@ -773,7 +773,7 @@ static void e_s1_path(e_s1_class* i_this) {
if (JMAFastSqrt((sp14.x * sp14.x) + (sp14.z * sp14.z)) < 4.0f * l_HIO.mMoveSpeed) {
i_this->mMode = 3;
i_this->mTimers[0] = 50.0f + cM_rndF(100.0f);
anm_init(i_this, ANM_WAIT_02, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_02, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
path_check2(i_this);
@@ -940,11 +940,11 @@ static void e_s1_failwait(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
if (cM_rndF(1.0f) < 0.3333f) {
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
i_this->mMode = 1;
@@ -954,11 +954,11 @@ static void e_s1_failwait(e_s1_class* i_this) {
i_this->mMode = 2;
if (i_this->mAnm == ANM_DEAD_02) {
anm_init(i_this, ANM_DEADWAIT_02, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DEADWAIT_02, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else if (i_this->mAnm == ANM_DEAD_03) {
anm_init(i_this, ANM_DEADWAIT_03, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DEADWAIT_03, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else {
anm_init(i_this, ANM_DEADWAIT_04, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DEADWAIT_04, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
}
break;
@@ -988,11 +988,11 @@ static void e_s1_failwait(e_s1_class* i_this) {
anm_init(i_this, ANM_DEAD_02, 2.0f, 0, 1.0f);
}
} else if (i_this->mAnm == ANM_DEADWAIT_02) {
anm_init(i_this, ANM_DEAD_02, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (i_this->mAnm == ANM_DEADWAIT_03) {
anm_init(i_this, ANM_DEAD_03, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_03, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEAD_04, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_04, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
i_this->mpMorf->setFrame(10.0f);
@@ -1011,11 +1011,11 @@ static void e_s1_fail(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
if (cM_rndF(1.0f) < 0.3333f) {
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
if (dStage_stagInfo_GetSTType(staginfo) == ST_FIELD) {
@@ -1023,7 +1023,7 @@ static void e_s1_fail(e_s1_class* i_this) {
if (all_fail_check(i_this) && !dComIfGp_event_runCheck()) {
i_this->mDemoMode = 1;
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
} else {
i_this->mMode = 30;
@@ -1073,11 +1073,11 @@ static void e_s1_fail(e_s1_class* i_this) {
case 12:
if (i_this->mTimers[0] == 0) {
if (i_this->mAnm == ANM_DEAD_02) {
anm_init(i_this, ANM_DEADWAKE_02, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEADWAKE_02, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (i_this->mAnm == ANM_DEAD_03) {
anm_init(i_this, ANM_DEADWAKE_03, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEADWAKE_03, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEADWAKE_04, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEADWAKE_04, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
a_this->health = 50;
@@ -1136,7 +1136,7 @@ static void e_s1_shout(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
a_this->health = 50;
anm_init(i_this, ANM_SHOUT, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOUT, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = KREG_S(6) + 10;
@@ -1195,7 +1195,7 @@ static void e_s1_warpappear(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 0.0f);
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f);
i_this->mMode = 1;
/* fallthrough */
case 1:
@@ -1224,11 +1224,11 @@ static void e_s1_warpappear(e_s1_class* i_this) {
/* fallthrough */
case 11:
i_this->mMode = 12;
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 12:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 13;
}
break;
src/d/actor/d_a_e_vt.cpp
+50 -50
View File
@@ -1815,7 +1815,7 @@ void daE_VA_c::executeDemoOp() {
field_0x122c = sp38;
field_0x1238.set(-0x0C03, -0x43B1, -0x195D);
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 9;
field_0x1240 = 1;
mDemoModeTimer = 60;
@@ -1833,7 +1833,7 @@ void daE_VA_c::executeDemoOp() {
cLib_chasePos(&mDemoCamEye, sp38, 15.0f);
if (mDemoModeTimer == 0) {
setBck(ANM_OP_ATTACK_A_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_OP_ATTACK_A_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 10;
}
break;
@@ -1880,7 +1880,7 @@ void daE_VA_c::executeClearWait() {
mDemoModeTimer = 60;
/* fallthrough */
case 0:
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 20.0f, 1.0f);
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::EMode_LOOP, 20.0f, 1.0f);
attention_info.flags = 4;
mMode = 2;
/* fallthrough */
@@ -1906,7 +1906,7 @@ void daE_VA_c::executeClearChase() {
switch (mMode) {
case 0:
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 1;
/* fallthrough */
case 1:
@@ -1928,11 +1928,11 @@ void daE_VA_c::executeClearChase() {
if (speedF != 0.0f) {
if (!checkBck(ANM_INVI_WALK_e)) {
setBck(ANM_INVI_WALK_e, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_INVI_WALK_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
} else {
if (!checkBck(ANM_INVI_WAIT_e)) {
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
}
}
@@ -1949,7 +1949,7 @@ void daE_VA_c::executeClearAttack() {
switch (mMode) {
case 0:
setBck(ANM_INVI_ATTACK_A_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_INVI_ATTACK_A_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureSound(Z2SE_EN_VA_SWD_ATK_T, 0, -1);
mMode = 1;
return;
@@ -1991,7 +1991,7 @@ void daE_VA_c::executeTransWait() {
attention_info.flags = 4;
speedF = 0.0f;
mMode = 1;
setBck(ANM_TRANS_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_TRANS_WAIT_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mDemoModeTimer = 5;
if (!dComIfGs_isOneZoneSwitch(5, fopAcM_GetRoomNo(this))) {
@@ -2001,7 +2001,7 @@ void daE_VA_c::executeTransWait() {
case 1:
cLib_addCalc(&current.pos.y, 0.0f, 0.1f, 10.0f, 1.0f);
if (mDemoModeTimer == 0) {
setBck(ANM_INVI_NOTICE_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_INVI_NOTICE_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_FOUND, -1);
mMode = 2;
}
@@ -2029,7 +2029,7 @@ void daE_VA_c::executeTransChase() {
switch (mMode) {
case 0:
setBck(ANM_TRANS_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_TRANS_WAIT_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mMode = 1;
/* fallthrough */
case 1:
@@ -2062,10 +2062,10 @@ void daE_VA_c::executeTransChase() {
if (speedF) {
if (!checkBck(ANM_TRANS_WALK_e)) {
setBck(ANM_TRANS_WALK_e, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_TRANS_WALK_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
} else {
setBck(ANM_TRANS_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_TRANS_WAIT_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
}
@@ -2081,7 +2081,7 @@ void daE_VA_c::executeTransAttack() {
switch (mMode) {
case 0:
setBck(ANM_TRANS_ATTACK_A1_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_ATTACK_A1_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureSound(Z2SE_EN_VA_SWD_ATK_T, 0, -1);
mSound.startCreatureVoice(Z2SE_EN_VA_V_ATK1, -1);
mSound.startCreatureSound(Z2SE_EN_VA_SWD_ATK1, 0, -1);
@@ -2113,7 +2113,7 @@ void daE_VA_c::executeTransAttack() {
}
if (mpMorf->isStop()) {
setBck(ANM_TRANS_ATTACK_A3_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_ATTACK_A3_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_ATK3, -1);
mMode = 4;
}
@@ -2149,7 +2149,7 @@ void daE_VA_c::executeTransAttack() {
Z2GetAudioMgr()->changeSubBgmStatus(1);
if (!checkBck(ANM_TRANS_ATTACK_A3_e)) {
setBck(ANM_TRANS_ATTACK_A3_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_ATTACK_A3_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_ATK3, -1);
}
@@ -2171,7 +2171,7 @@ void daE_VA_c::executeTransBiteDamage() {
switch (mMode) {
case 0:
speedF = 0.0f;
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_BITED, -1);
mMode = 1;
field_0x1324 = 0;
@@ -2211,14 +2211,14 @@ void daE_VA_c::executeTransBiteDamage() {
return;
}
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_BITED, -1);
mSound.startCollisionSE(Z2SE_HIT_WOLFBITE, 0x1E);
}
if (checkBck(ANM_TRANS_NECK_DMG_e)) {
if (mpMorf->isStop()) {
setBck(ANM_TRANS_ATTACK_A2_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_TRANS_ATTACK_A2_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
} else if (checkBck(ANM_TRANS_ATTACK_A2_e) && mpMorf->checkFrame(22.0f)) {
mSound.startCreatureVoice(Z2SE_EN_VA_V_ATK2, -1);
@@ -2233,7 +2233,7 @@ void daE_VA_c::executeTransBiteDamage() {
}
if (!player->checkWolfEnemyHangBiteOwn(this)) {
setBck(ANM_TRANS_NECK_PAT_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_NECK_PAT_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 3;
mGlowBody = 0;
}
@@ -2271,7 +2271,7 @@ void daE_VA_c::executeTransDamage() {
}
speedF = 0.0f;
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_BITED, -1);
mMode = 1;
@@ -2283,7 +2283,7 @@ void daE_VA_c::executeTransDamage() {
/* fallthrough */
case 1:
if (mpMorf->isStop()) {
setBck(ANM_TRANS_NECK_PAT_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_NECK_PAT_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 2;
}
break;
@@ -2305,7 +2305,7 @@ void daE_VA_c::executeTransThrough() {
switch (mMode) {
case 0:
speedF = 0.0f;
setBck(ANM_TRANS_THROUGH_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_THROUGH_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 1;
break;
case 1:
@@ -2367,7 +2367,7 @@ void daE_VA_c::executeOpaciWait() {
mKankyoColBlend = 1.0f;
mKankyoColType = 1;
setBck(ANM_TRANS_STRUGGLE_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_TRANS_STRUGGLE_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_VISUAL, -1);
field_0x1354 = 10;
speedF = 0.0f;
@@ -2431,7 +2431,7 @@ void daE_VA_c::executeOpaciWait() {
mFadeAwayTimer = l_HIO.mFadeAwayTime;
attention_info.flags = 4;
setBck(ANM_SUBS_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SUBS_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 15;
mDemoModeTimer = 30;
}
@@ -2462,14 +2462,14 @@ void daE_VA_c::executeOpaciFly() {
attention_info.flags = 0;
if (mMode == 0) {
setBck(ANM_FLOAT_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
} else if (mMode == 20) {
setBck(ANM_SUBS_DOWN_D_STAND_e, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_SUBS_DOWN_D_STAND_e, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_DMG_L, -1);
} else if (mMode == 21) {
setBck(ANM_SUBS_DOWN_STAND_e, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_SUBS_DOWN_STAND_e, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
} else if (mMode == 22) {
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_TRANS_NECK_DMG_e, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_BITED, -1);
}
@@ -2486,7 +2486,7 @@ void daE_VA_c::executeOpaciFly() {
/* fallthrough */
case 1:
if (mDemoModeTimer == 0 && !checkBck(ANM_FLOAT_WAIT_e)) {
setBck(ANM_FLOAT_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, nREG_F(19) + 30.0f, 1.0f);
setBck(ANM_FLOAT_WAIT_e, J3DFrameCtrl::EMode_LOOP, nREG_F(19) + 30.0f, 1.0f);
}
cLib_addCalcAngleS(&shape_angle.y, fopAcM_searchPlayerAngleY(this), 8, 0x800, 0x80);
@@ -2570,7 +2570,7 @@ void daE_VA_c::executeOpaciFly() {
/* fallthrough */
case 11:
if (mDemoModeTimer == 0) {
setBck(ANM_FLOAT_ATTACK_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_ATTACK_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 12;
}
break;
@@ -2594,7 +2594,7 @@ void daE_VA_c::executeOpaciFly() {
}
if (mpMorf->isStop()) {
setBck(ANM_FLOAT_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 2;
field_0x1348 = cM_rndF(30.0f) + 90.0f;
}
@@ -2609,7 +2609,7 @@ void daE_VA_c::executeOpaciDamage() {
mBodyCyls[0].SetTgType(0xD8FBFDFF);
mBodyCyls[1].SetTgType(0xD8FBFDFF);
setBck(ANM_FLOAT_DMG_A_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_FLOAT_DMG_A_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_DOWN, -1);
mSound.startCreatureVoice(Z2SE_EN_VA_V_DMG, -1);
mSound.startCreatureSound(Z2SE_EN_VA_DOWN, 0, -1);
@@ -2622,7 +2622,7 @@ void daE_VA_c::executeOpaciDamage() {
gravity = -5.0f;
maxFallSpeed = -50.0f;
mMode = 2;
setBck(ANM_FLOAT_DMG_B_e, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_FLOAT_DMG_B_e, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
}
break;
case 2:
@@ -2632,7 +2632,7 @@ void daE_VA_c::executeOpaciDamage() {
break;
case 10:
attention_info.flags = 0;
setBck(ANM_SUBS_STAGGER_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_STAGGER_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_NO_DMG, -1);
mMode = 11;
/* fallthrough */
@@ -2668,7 +2668,7 @@ void daE_VA_c::executeOpaciChase() {
mMode = 10;
mDownTimer = 30;
setBck(ANM_SUBS_FLY_e, J3DFrameCtrl::LOOP_REPEAT_e, 30.0f, 1.0f);
setBck(ANM_SUBS_FLY_e, J3DFrameCtrl::EMode_LOOP, 30.0f, 1.0f);
gravity = 0.0f;
field_0x1324 = 0;
@@ -2792,7 +2792,7 @@ void daE_VA_c::executeOpaciAttack() {
switch (mMode) {
case 0:
speedF = 0.0f;
setBck(ANM_SUBS_ATTACK_A1_e, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_SUBS_ATTACK_A1_e, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
mSound.startCreatureSound(Z2SE_EN_VA_SWD_ATK_T, 0, -1);
mSound.startCreatureVoice(Z2SE_EN_VA_V_ATK1, -1);
mMode = 1;
@@ -2821,7 +2821,7 @@ void daE_VA_c::executeOpaciAttack() {
}
if (mpMorf->isStop()) {
setBck(ANM_SUBS_ATTACK_A3_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_ATTACK_A3_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_ATK3, -1);
mMode = 2;
}
@@ -2857,7 +2857,7 @@ void daE_VA_c::executeOpaciDown() {
switch (mMode) {
case 0:
setBck(ANM_SUBS_DOWN_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_DOWN_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mDownTimer = l_HIO.mDownTime;
mMode = 2;
speedF = 0.0f;
@@ -2872,12 +2872,12 @@ void daE_VA_c::executeOpaciDown() {
}
if (mpMorf->isStop()) {
setBck(ANM_SUBS_DOWN_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SUBS_DOWN_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 3;
}
break;
case 1:
setBck(ANM_SUBS_DOWN_WAIT_e, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SUBS_DOWN_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 3;
/* fallthrough */
case 3:
@@ -2957,13 +2957,13 @@ void daE_VA_c::executeOpaciDownDamage() {
}
if (mMode == 0) {
setBck(ANM_SUBS_DOWN_DMG_A1_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_DOWN_DMG_A1_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_DMG, -1);
} else if (mMode == 1) {
setBck(ANM_SUBS_DOWN_DMG_A2_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_DOWN_DMG_A2_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_DMG, -1);
} else {
setBck(ANM_SUBS_DOWN_STAGGER_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_DOWN_STAGGER_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_NO_DMG, -1);
}
@@ -3027,10 +3027,10 @@ void daE_VA_c::executeOpaciFadeAway() {
break;
case 1:
if (checkBck(ANM_SUBS_INVITE_B_e)) {
setBck(ANM_SUBS_INVITE_C_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_INVITE_C_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 5;
} else {
setBck(ANM_SUBS_TO_TRANS_e, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_SUBS_TO_TRANS_e, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_VANISH, -1);
mSound.startCreatureSound(Z2SE_EN_VA_VANISH, 0, -1);
mAlphaType = 3;
@@ -3042,13 +3042,13 @@ void daE_VA_c::executeOpaciFadeAway() {
speedF = 0.0f;
break;
case 2:
setBck(ANM_SUBS_DOWN_STAND_e, J3DFrameCtrl::LOOP_ONCE_e, 10.0f, 1.0f);
setBck(ANM_SUBS_DOWN_STAND_e, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f);
mMode = 3;
speedF = 0.0f;
break;
case 3:
if (mpMorf->isStop()) {
setBck(ANM_SUBS_TO_TRANS_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_TO_TRANS_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_VANISH, -1);
mSound.startCreatureSound(Z2SE_EN_VA_VANISH, 0, -1);
mMode = 4;
@@ -3099,7 +3099,7 @@ void daE_VA_c::executeOpaciDeath() {
dComIfGs_onStageMiddleBoss();
field_0x1364 = 0;
setBck(ANM_SUBS_DOWN_DIE_e, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SUBS_DOWN_DIE_e, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_VA_V_DEAD, -1);
mMode = 10;
@@ -3857,7 +3857,7 @@ int daE_VA_c::CreateHeap() {
if (!mpWeaponBrk->init(mpWeaponModel->getModelData(),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("E_VA", 0x3B), TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1))
{
return 0;
}
@@ -3888,7 +3888,7 @@ int daE_VA_c::CreateHeap() {
if (!mpEndEfBrk->init(model->getModelData(),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("E_VA", 0x3A), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1))
{
return 0;
}
src/d/actor/d_a_e_yc.cpp
+19 -19
View File
@@ -89,7 +89,7 @@ static void e_yc_fly(e_yc_class* i_this) {
case 0:
if (i_this->mTimer[0] == 0 && frame == 14) {
i_this->mFlyAnmMode = 1;
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -97,7 +97,7 @@ static void e_yc_fly(e_yc_class* i_this) {
case 1:
if (i_this->mTimer[0] == 0) {
i_this->mFlyAnmMode = 0;
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -134,7 +134,7 @@ static void e_yc_fly(e_yc_class* i_this) {
i_this->mTargetPos = i_this->home.pos;
i_this->mMaxAngleSpeed = 200.0f;
i_this->mAngleXSpeedRatio = 0.0f;
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mFlyAnmMode = 2;
break;
@@ -151,10 +151,10 @@ static void e_yc_fly(e_yc_class* i_this) {
case 4:
accel = 0.3f;
if (rider->mDemoTimer == 30) {
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (rider->mDemoTimer == 60) {
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
i_this->mMaxAngleSpeed = 300.0f;
break;
@@ -203,7 +203,7 @@ static void e_yc_f_fly(e_yc_class* i_this) {
case 0:
if (i_this->mTimer[0] == 0 && frame == 14) {
i_this->mFlyAnmMode = 1;
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -211,7 +211,7 @@ static void e_yc_f_fly(e_yc_class* i_this) {
case 1:
if (i_this->mTimer[0] == 0) {
i_this->mFlyAnmMode = 0;
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -282,7 +282,7 @@ static void e_yc_hovering(e_yc_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(100.0f) + 200.0f;
break;
@@ -339,7 +339,7 @@ static void e_yc_attack(e_yc_class* i_this) {
target_speed = 30.0f;
if (delta.abs() < 1000.0f) {
i_this->mMode = 2;
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMaxAngleSpeed = 1000.0f;
i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_YC_V_ATTACK, -1);
}
@@ -355,7 +355,7 @@ static void e_yc_attack(e_yc_class* i_this) {
case 3:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, e_yc_class::ANM_CATCH_START, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_CATCH_START, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 4;
}
break;
@@ -376,7 +376,7 @@ static void e_yc_attack(e_yc_class* i_this) {
i_this->mMode = 0;
} else {
anm_init(i_this, e_yc_class::ANM_CATCH_MIDDLE, 5.0f,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 5;
i_this->mTimer[0] = 80;
}
@@ -385,7 +385,7 @@ static void e_yc_attack(e_yc_class* i_this) {
case 5:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, e_yc_class::ANM_CATCH_END, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_CATCH_END, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 6;
} else {
i_this->current.pos.y += 5.0f;
@@ -445,7 +445,7 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_yc_class::ANM_HANGED, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_DN_V_DRAWBACK, -1);
_this->health -= 5;
@@ -454,25 +454,25 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
case 1:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
}
break;
case 2:
if (i_this->mAnm == e_yc_class::ANM_HANGED_DAMAGE && i_this->mpMorf->isStop()) {
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->health <= 0 || i_this->checkWolfBiteDamage()) {
i_this->offWolfBiteDamage();
anm_init(i_this, e_yc_class::ANM_HANGED_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->health -= 5;
if (_this->health <= 0) {
player->offWolfEnemyHangBite();
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH2, 3.0f,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
rider->mDemoMode = 5;
dScnPly_c::setPauseTimer(7);
@@ -486,7 +486,7 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
if (i_this->mWolfBiteDamageCount >= 5) {
player->offWolfEnemyHangBite();
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
}
@@ -494,7 +494,7 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
}
if (!player->checkWolfEnemyBiteAllOwn(_this)) {
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
}
src/d/actor/d_a_horse.cpp
+1 -1
View File
@@ -534,7 +534,7 @@ int daHorse_c::createHeap() {
return 0;
}
if (!m_btp.init(m_modelData, (J3DAnmTexPattern*)dComIfG_getObjectRes(l_arcName, 0x29), FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!m_btp.init(m_modelData, (J3DAnmTexPattern*)dComIfG_getObjectRes(l_arcName, 0x29), FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_itembase.cpp
+6 -6
View File
@@ -63,7 +63,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
JUT_ASSERT(pbtk != 0);
mpBtkAnm = new mDoExt_btkAnm();
if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
}
@@ -74,7 +74,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
JUT_ASSERT(pbpk != 0);
mpBpkAnm = new mDoExt_bpkAnm();
if (mpBpkAnm == NULL || !mpBpkAnm->init(modelData, pbpk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (mpBpkAnm == NULL || !mpBpkAnm->init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
}
@@ -85,7 +85,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
JUT_ASSERT(pbck != 0);
mpBckAnm = new mDoExt_bckAnm();
if (mpBckAnm == NULL || !mpBckAnm->init(pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (mpBckAnm == NULL || !mpBckAnm->init(pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
}
@@ -102,7 +102,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
}
mpBrkAnm = new mDoExt_brkAnm();
if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, anmPlay, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, anmPlay, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
}
@@ -113,7 +113,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
JUT_ASSERT(pbtp != 0);
mpBtpAnm = new mDoExt_btpAnm();
if (mpBtpAnm == NULL || !mpBtpAnm->init(modelData, pbtp, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (mpBtpAnm == NULL || !mpBtpAnm->init(modelData, pbtp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
}
@@ -277,4 +277,4 @@ u8 daItemBase_c::getCollisionH() {
/* 801451D0-801451EC 13FB10 001C+00 1/0 1/0 8/0 .text getCollisionR__12daItemBase_cFv */
u8 daItemBase_c::getCollisionR() {
return dItem_data::getR(m_itemNo);
}
}
src/d/actor/d_a_kytag04.cpp
+2 -2
View File
@@ -241,13 +241,13 @@ static int useHeapInit(fopAc_ac_c* i_this) {
a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
if (a_this->mpModel != NULL) {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Kytag04", 14);
if (!a_this->mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!a_this->mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
OS_REPORT("\nkytag04 btk FALSE!!\n");
return 0;
}
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Kytag04", 8);
if (!a_this->mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) {
if (!a_this->mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) {
OS_REPORT("\nkytag04 brk FALSE!!\n");
return 0;
}
src/d/actor/d_a_midna.cpp
+7 -7
View File
@@ -441,7 +441,7 @@ int daMidna_c::createHeap() {
J3DLOADER_UNK_FLAG0);
J3DModelData* md_bmd = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 14);
mpMorf = new mDoExt_McaMorfSO(md_bmd, &mMorfCB, NULL, md_anm,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, NULL, 0, 0x11000284);
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, NULL, 0, 0x11000284);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
}
@@ -449,10 +449,10 @@ int daMidna_c::createHeap() {
if (!mInvModel.create(mpMorf->getModel(), 1)) {
return 0;
}
if (!mUpperBck.init(mpMorf->getAnm(), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mUpperBck.init(mpMorf->getAnm(), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
if (!mFaceBck.init(mpMorf->getAnm(), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mFaceBck.init(mpMorf->getAnm(), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
if (!mBtpHeap.mallocBuffer()) {
@@ -1568,7 +1568,7 @@ BOOL daMidna_c::setDemoAnm() {
if (mpDemoFCTmpCluster != cluster) {
mpDemoFCTmpCluster = cluster;
mpDemoFCTmpBlk->init(mpDemoFCTmpBls, mpDemoFCTmpCluster, FALSE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
mpDemoFCTmpBlk->getBlkAnm()->setFrame(0.0f);
}
ret = TRUE;
@@ -2134,7 +2134,7 @@ void daMidna_c::setAnm() {
offStateFlg0(FLG0_UNK_1);
u16 res_id = m_anmDataTable[anm].mResID;
J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(res_id);
setBckAnime(bck, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f);
setBckAnime(bck, J3DFrameCtrl::EMode_LOOP, 5.0f);
setUpperAnime(mBckHeap[0].getIdx(), 0xffff);
} else if (checkSetAnime(0, ANM_SWAITB) && mUpperBck.checkFrame(95.0f)
&& fabsf(speedF) < 0.1f && cM_rnd() < 0.5f)
@@ -2143,7 +2143,7 @@ void daMidna_c::setAnm() {
setUpperAnimeAndSe(ANM_SWAITC);
u16 res_id = m_anmDataTable[anm].mResID;
J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(res_id);
setBckAnime(bck, J3DFrameCtrl::LOOP_ONCE_e, 0.0f);
setBckAnime(bck, J3DFrameCtrl::EMode_NONE, 0.0f);
}
} else if (daPy_py_c::i_checkNowWolf() && !bVar1
&& ((mNeckAngle.y == 0 && mNeckAngle.x == 0 && anm != ANM_LEADWAIT && cM_rnd() < 0.01f)
@@ -2174,7 +2174,7 @@ void daMidna_c::setAnm() {
u16 res_id = m_anmDataTable[anm].mResID;
setUpperAnimeAndSe(anm);
J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(res_id);
setBckAnime(bck, J3DFrameCtrl::LOOP_ONCE_e, 5.0f);
setBckAnime(bck, J3DFrameCtrl::EMode_NONE, 5.0f);
}
} else if (checkStateFlg0(FLG0_UNK_2)) {
src/d/actor/d_a_myna.cpp
+6 -6
View File
@@ -1730,7 +1730,7 @@ int daMyna_c::chkPlayerInEvtArea(fopAc_ac_c* param_0, cXyz param_1) {
// NONMATCHING regswap
void daMyna_c::animeControl() {
f32 rate = 1.0f;
int attr = J3DFrameCtrl::LOOP_REPEAT_e;
int attr = J3DFrameCtrl::EMode_LOOP;
f32 morf = field_0x90C;
switch (field_0x935) {
case 1:
@@ -1739,23 +1739,23 @@ void daMyna_c::animeControl() {
}
break;
case 2:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case 3:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case 4:
rate = l_HOSTIO.field_0x08;
break;
case 7:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
morf = 6.0f;
break;
case 8:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case 14:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
}
src/d/actor/d_a_nbomb.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ int daNbomb_c::createHeap() {
return 0;
}
if (!mpBck->init(trans, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
if (!mpBck->init(trans, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) {
return 0;
}
}
src/d/actor/d_a_ni.cpp
+24 -24
View File
@@ -361,7 +361,7 @@ static void damage_check(ni_class* i_this) {
i_this->field_0x60c = 6;
i_this->mAtInfo.mpCollider = i_this->mCcSph.GetTgHitObj();
anm_init(i_this, BCK_MOGAKU, 1.5f, J3DFrameCtrl::LOOP_REPEAT_e, 1.5f);
anm_init(i_this, BCK_MOGAKU, 1.5f, J3DFrameCtrl::EMode_LOOP, 1.5f);
if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) {
i_this->mAction = ACTION_WINDSPIN_e;
@@ -614,7 +614,7 @@ static void ni_normal(ni_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mTimers[0] = cM_rndF(70) + 50.0f;
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, move_speed);
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, move_speed);
i_this->mMode++;
break;
case 1:
@@ -634,7 +634,7 @@ static void ni_normal(ni_class* i_this) {
}
i_this->mTimers[0] = cM_rndF(60) + 30.0f;
anm_init(i_this, BCK_WALK_A, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.mMotionSpeed);
anm_init(i_this, BCK_WALK_A, 5.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.mMotionSpeed);
}
break;
case 10:
@@ -733,7 +733,7 @@ static void ni_away(ni_class* i_this) {
switch (a_this->mMode) {
case 0:
anm_init(a_this, BCK_WALK_B, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.5f);
anm_init(a_this, BCK_WALK_B, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.5f);
a_this->mMode++;
if (target == NULL) {
@@ -755,7 +755,7 @@ static void ni_away(ni_class* i_this) {
} else if (a_this->mAcch.ChkGroundHit() &&
(target != NULL || a_this->mDistToPlayer < l_HIO.mRecognizeRange - 100.0f))
{
anm_init(a_this, BCK_FLY, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(a_this, BCK_FLY, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
a_this->speed.y = l_HIO.mFleeJumpPower;
a_this->mMode++;
hane_set(a_this, 5.0f, 25.0f);
@@ -801,7 +801,7 @@ static void ni_swim(ni_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, move_speed);
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, move_speed);
i_this->mMode++;
i_this->field_0x9e8 = move_speed;
case 1:
@@ -849,7 +849,7 @@ static void ni_swim(ni_class* i_this) {
if (i_this->mTimers[2] == 0) {
i_this->mMode = 1;
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f);
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, 0.0f);
}
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mMoveAngle, 4, 0x400);
@@ -862,7 +862,7 @@ static void ni_swim(ni_class* i_this) {
i_this->mAction = ACTION_AWAY_e;
i_this->mMode = 2;
anm_init(i_this, BCK_FLY, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, BCK_FLY, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->speed.y = 20.0f;
hane_set(i_this, 5.0f, 25.0f);
i_this->field_0x9e4 = 30;
@@ -883,7 +883,7 @@ static int ni_carry(ni_class* i_this) {
BOOL update_position = false;
switch (i_this->mMode) {
case 0:
anm_init(i_this, BCK_MOGAKU, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, BCK_MOGAKU, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode++;
// fallthrough
case 1:
@@ -933,7 +933,7 @@ static void ni_fly(ni_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, BCK_FALL, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, BCK_FALL, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode++;
i_this->mTimers[0] = 40;
i_this->field_0x5c0 = player->current.pos;
@@ -1004,7 +1004,7 @@ static void ni_return(ni_class* i_this) {
case 0:
i_this->mMode++;
i_this->mTimers[0] = 200;
anm_init(i_this, BCK_FLY, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 2.0f);
anm_init(i_this, BCK_FLY, 2.0f, J3DFrameCtrl::EMode_LOOP, 2.0f);
break;
}
@@ -1036,7 +1036,7 @@ static void ni_damage(ni_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, BCK_WALK_B, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, BCK_WALK_B, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode++;
i_this->mTimers[0] = cM_rndF(20.0f) + 40.0f;
@@ -1086,7 +1086,7 @@ static void ni_windspin(ni_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, BCK_FALL, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, BCK_FALL, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode++;
hane_set(i_this, 0.1f, 20.0f);
@@ -1183,7 +1183,7 @@ static int ni_demo0(ni_class* i_this) {
cLib_addCalc2(&i_this->current.pos.z, i_this->field_0x5c0.z, 0.1f, 5.0f);
if (i_this->mTimers[1] == 1) {
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f);
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, 0.0f);
}
} else {
i_this->current.pos = i_this->field_0x5c0;
@@ -1208,7 +1208,7 @@ static void ni_message(ni_class* i_this) {
case 1:
break;
case 0:
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f);
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, 0.0f);
i_this->mMode++;
break;
}
@@ -1295,7 +1295,7 @@ static int ni_play(ni_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mPlayAnmSpeed = 0.0f;
anm_init(i_this, BCK_WALK_A, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, i_this->mPlayAnmSpeed);
anm_init(i_this, BCK_WALK_A, 5.0f, J3DFrameCtrl::EMode_LOOP, i_this->mPlayAnmSpeed);
i_this->mMode++;
// fallthrough
case 1:
@@ -1305,7 +1305,7 @@ static int ni_play(ni_class* i_this) {
if (i_this->speedF > 10.0f) {
i_this->mPlayAnmSpeed = 1.0f;
anm_init(i_this, BCK_WALK_B, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, i_this->mPlayAnmSpeed);
anm_init(i_this, BCK_WALK_B, 3.0f, J3DFrameCtrl::EMode_LOOP, i_this->mPlayAnmSpeed);
i_this->mMode++;
}
break;
@@ -1316,7 +1316,7 @@ static int ni_play(ni_class* i_this) {
if (i_this->speedF < 10.0f) {
i_this->mPlayAnmSpeed = 1.5f;
anm_init(i_this, BCK_WALK_A, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, i_this->mPlayAnmSpeed);
anm_init(i_this, BCK_WALK_A, 5.0f, J3DFrameCtrl::EMode_LOOP, i_this->mPlayAnmSpeed);
i_this->mMode = 1;
}
break;
@@ -1358,7 +1358,7 @@ static int ni_play(ni_class* i_this) {
if (i_this->field_0x60c == 0) {
i_this->mMode = 1;
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f);
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, 0.0f);
}
break;
}
@@ -1421,21 +1421,21 @@ static int ni_play(ni_class* i_this) {
if (i_this->speed.y <= -15.0f) {
i_this->speed.y = 0.0f;
i_this->mMode = 10;
anm_init(i_this, BCK_MOGAKU, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, BCK_MOGAKU, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
hane_set(i_this, 5.0f, 25.0f);
}
}
if (i_this->mMode < 20 && i_this->field_0x848 != 0) {
i_this->mMode = 20;
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f);
anm_init(i_this, BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, 0.0f);
i_this->speedF *= 0.5f;
}
if ((var_r29 != 0 || var_r30 != 0) && mDoCPd_c::getTrigA(PAD_1)) {
i_this->speed.y = 20.0f;
i_this->mMode = 10;
anm_init(i_this, BCK_MOGAKU, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, BCK_MOGAKU, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
hane_set(i_this, 5.0f, 25.0f);
}
@@ -1445,7 +1445,7 @@ static int ni_play(ni_class* i_this) {
if (i_this->field_0x60c == 0) {
i_this->field_0x60c = cM_rndF(10.0f) + 5.0f;
i_this->mMode = 30;
anm_init(i_this, BCK_MOGAKU, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, BCK_MOGAKU, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mSound.startSound(Z2SE_CHICKEN_CRY, 0, -1);
hane_set(i_this, 5.0f, 25.0f);
}
@@ -2203,7 +2203,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
if (!a_this->mpBtk->init(a_this->mpMorf->getModel()->getModelData(),
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Ni", 0x13), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1))
{
return false;
}
src/d/actor/d_a_npc_the.cpp
+31 -31
View File
@@ -531,7 +531,7 @@ int daNpcThe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
*/
bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
J3DAnmTransform* anm = NULL;
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
if (l_bckGetParamList[i_idx].fileIdx >= 0) {
@@ -555,7 +555,7 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
break;
case ANM_F_TALK_B:
res = setExpressionBtp(4);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_TALK_C:
res = setExpressionBtp(5);
@@ -568,27 +568,27 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
break;
case ANM_FH_SMILE:
res = setExpressionBtp(8);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_CHUCKLE:
res = setExpressionBtp(9);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_TALK_B:
res = setExpressionBtp(10);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_TALK_C:
res = setExpressionBtp(11);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_LAUGH:
res = setExpressionBtp(12);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_TALK_R:
res = setExpressionBtp(13);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
default:
anm = NULL;
@@ -621,10 +621,10 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
l_btpGetParamList[i_idx].fileIdx);
}
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
switch (i_idx) {
case 0:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 1:
break;
@@ -633,7 +633,7 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
case 3:
break;
case 4:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 5:
break;
@@ -642,22 +642,22 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
case 7:
break;
case 8:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 9:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 10:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 11:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 12:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 13:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
default:
anm = NULL;
@@ -682,7 +682,7 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
bool daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* anm_trans = NULL;
J3DAnmTextureSRTKey* anm_tex = NULL;
int attr = J3DFrameCtrl::LOOP_REPEAT_e;
int attr = J3DFrameCtrl::EMode_LOOP;
mAnmFlags &= ~ANM_MOTION_FLAGS;
if (l_bckGetParamList[i_idx].fileIdx >= 0) {
@@ -692,43 +692,43 @@ bool daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
switch (i_idx) {
case ANM_WAIT_A:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_WAIT_LOOKING:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_TO_WAIT_B:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_WAIT_B:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_WAIT_LOOKUP:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_TALK_R:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_TALKING_R:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_LOOK_A:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_LOOK:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_KUNE_WAIT_A:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_KUNE_TALK:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_KUNE_WAIT_B:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_KUNE_SHISHI:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
default:
anm_trans = NULL;
src/d/actor/d_a_npc_yelia.cpp
+63 -63
View File
@@ -66,73 +66,73 @@ static s8* l_loadResPtrnList[10] = {
/* 80B525B0-80B528C0 0000D4 0310+00 0/1 0/0 0/0 .data l_faceMotionAnmData */
static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[] = {
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, 19, J3DFrameCtrl::LOOP_REPEAT_e, 2, TRUE},
{7, J3DFrameCtrl::LOOP_ONCE_e, 2, 19, J3DFrameCtrl::LOOP_REPEAT_e, 2, TRUE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{5, J3DFrameCtrl::LOOP_ONCE_e, 3, 18, J3DFrameCtrl::LOOP_ONCE_e, 3, FALSE},
{6, J3DFrameCtrl::LOOP_ONCE_e, 3, 19, J3DFrameCtrl::LOOP_ONCE_e, 3, FALSE},
{6, J3DFrameCtrl::LOOP_REPEAT_e, 5, 20, J3DFrameCtrl::LOOP_REPEAT_e, 5, FALSE},
{5, J3DFrameCtrl::LOOP_ONCE_e, 5, 19, J3DFrameCtrl::LOOP_ONCE_e, 5, FALSE},
{7, J3DFrameCtrl::LOOP_REPEAT_e, 5, 19, J3DFrameCtrl::LOOP_REPEAT_e, 2, TRUE},
{8, J3DFrameCtrl::LOOP_ONCE_e, 5, 19, J3DFrameCtrl::LOOP_REPEAT_e, 2, TRUE},
{14, J3DFrameCtrl::LOOP_ONCE_e, 6, 49, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{16, J3DFrameCtrl::LOOP_ONCE_e, 6, 51, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{15, J3DFrameCtrl::LOOP_ONCE_e, 6, 50, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{12, J3DFrameCtrl::LOOP_ONCE_e, 6, 47, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{13, J3DFrameCtrl::LOOP_ONCE_e, 6, 48, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{10, J3DFrameCtrl::LOOP_ONCE_e, 6, 45, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{21, J3DFrameCtrl::LOOP_REPEAT_e, 6, 56, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{22, J3DFrameCtrl::LOOP_REPEAT_e, 6, 57, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{18, J3DFrameCtrl::LOOP_REPEAT_e, 6, 53, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{20, J3DFrameCtrl::LOOP_REPEAT_e, 6, 55, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{9, J3DFrameCtrl::LOOP_ONCE_e, 6, 44, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{17, J3DFrameCtrl::LOOP_REPEAT_e, 6, 52, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{11, J3DFrameCtrl::LOOP_ONCE_e, 6, 46, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{19, J3DFrameCtrl::LOOP_REPEAT_e, 6, 54, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{5, J3DFrameCtrl::LOOP_ONCE_e, 2, 20, J3DFrameCtrl::LOOP_ONCE_e, 2, FALSE},
{8, J3DFrameCtrl::LOOP_REPEAT_e, 2, 22, J3DFrameCtrl::LOOP_REPEAT_e, 2, FALSE},
{6, J3DFrameCtrl::LOOP_REPEAT_e, 2, 21, J3DFrameCtrl::LOOP_REPEAT_e, 2, FALSE},
{9, J3DFrameCtrl::LOOP_REPEAT_e, 2, 23, J3DFrameCtrl::LOOP_REPEAT_e, 2, FALSE},
{-1, J3DFrameCtrl::EMode_NONE, 0, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE},
{7, J3DFrameCtrl::EMode_NONE, 2, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{5, J3DFrameCtrl::EMode_NONE, 3, 18, J3DFrameCtrl::EMode_NONE, 3, FALSE},
{6, J3DFrameCtrl::EMode_NONE, 3, 19, J3DFrameCtrl::EMode_NONE, 3, FALSE},
{6, J3DFrameCtrl::EMode_LOOP, 5, 20, J3DFrameCtrl::EMode_LOOP, 5, FALSE},
{5, J3DFrameCtrl::EMode_NONE, 5, 19, J3DFrameCtrl::EMode_NONE, 5, FALSE},
{7, J3DFrameCtrl::EMode_LOOP, 5, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE},
{8, J3DFrameCtrl::EMode_NONE, 5, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE},
{14, J3DFrameCtrl::EMode_NONE, 6, 49, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{16, J3DFrameCtrl::EMode_NONE, 6, 51, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{15, J3DFrameCtrl::EMode_NONE, 6, 50, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{12, J3DFrameCtrl::EMode_NONE, 6, 47, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{13, J3DFrameCtrl::EMode_NONE, 6, 48, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{10, J3DFrameCtrl::EMode_NONE, 6, 45, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{21, J3DFrameCtrl::EMode_LOOP, 6, 56, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{22, J3DFrameCtrl::EMode_LOOP, 6, 57, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{18, J3DFrameCtrl::EMode_LOOP, 6, 53, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{20, J3DFrameCtrl::EMode_LOOP, 6, 55, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{9, J3DFrameCtrl::EMode_NONE, 6, 44, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{17, J3DFrameCtrl::EMode_LOOP, 6, 52, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{11, J3DFrameCtrl::EMode_NONE, 6, 46, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{19, J3DFrameCtrl::EMode_LOOP, 6, 54, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{5, J3DFrameCtrl::EMode_NONE, 2, 20, J3DFrameCtrl::EMode_NONE, 2, FALSE},
{8, J3DFrameCtrl::EMode_LOOP, 2, 22, J3DFrameCtrl::EMode_LOOP, 2, FALSE},
{6, J3DFrameCtrl::EMode_LOOP, 2, 21, J3DFrameCtrl::EMode_LOOP, 2, FALSE},
{9, J3DFrameCtrl::EMode_LOOP, 2, 23, J3DFrameCtrl::EMode_LOOP, 2, FALSE},
};
/* 80B528C0-80B52C94 0003E4 03D4+00 0/1 0/0 0/0 .data l_motionAnmData */
static daNpcT_motionAnmData_c l_motionAnmData[] = {
{13, J3DFrameCtrl::LOOP_REPEAT_e, 2, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{10, J3DFrameCtrl::LOOP_REPEAT_e, 3, 15, J3DFrameCtrl::LOOP_REPEAT_e, 3, FALSE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{11, J3DFrameCtrl::LOOP_REPEAT_e, 3, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{9, J3DFrameCtrl::LOOP_ONCE_e, 3, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{-1, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, J3DFrameCtrl::LOOP_ONCE_e, 0, FALSE},
{7, J3DFrameCtrl::LOOP_ONCE_e, 3, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{8, J3DFrameCtrl::LOOP_ONCE_e, 3, 14, J3DFrameCtrl::LOOP_ONCE_e, 3, FALSE},
{10, J3DFrameCtrl::LOOP_REPEAT_e, 5, 15, J3DFrameCtrl::LOOP_REPEAT_e, 5, FALSE},
{9, J3DFrameCtrl::LOOP_ONCE_e, 5, 14, J3DFrameCtrl::LOOP_ONCE_e, 5, FALSE},
{11, J3DFrameCtrl::LOOP_REPEAT_e, 5, 16, J3DFrameCtrl::LOOP_REPEAT_e, 5, FALSE},
{35, J3DFrameCtrl::LOOP_REPEAT_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{34, J3DFrameCtrl::LOOP_REPEAT_e, 6, 41, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{33, J3DFrameCtrl::LOOP_REPEAT_e, 6, 40, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{31, J3DFrameCtrl::LOOP_ONCE_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{30, J3DFrameCtrl::LOOP_REPEAT_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{27, J3DFrameCtrl::LOOP_ONCE_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{28, J3DFrameCtrl::LOOP_REPEAT_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{25, J3DFrameCtrl::LOOP_ONCE_e, 6, 38, J3DFrameCtrl::LOOP_ONCE_e, 6, FALSE},
{26, J3DFrameCtrl::LOOP_REPEAT_e, 6, 39, J3DFrameCtrl::LOOP_REPEAT_e, 6, FALSE},
{6, J3DFrameCtrl::LOOP_ONCE_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{8, J3DFrameCtrl::LOOP_REPEAT_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{12, J3DFrameCtrl::LOOP_ONCE_e, 2, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{5, J3DFrameCtrl::LOOP_REPEAT_e, 7, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{32, J3DFrameCtrl::LOOP_ONCE_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, FALSE},
{29, J3DFrameCtrl::LOOP_REPEAT_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{7, J3DFrameCtrl::LOOP_ONCE_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, FALSE},
{23, J3DFrameCtrl::LOOP_ONCE_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, FALSE},
{24, J3DFrameCtrl::LOOP_REPEAT_e, 6, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, FALSE},
{10, J3DFrameCtrl::LOOP_ONCE_e, 2, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{11, J3DFrameCtrl::LOOP_ONCE_e, 2, 16, J3DFrameCtrl::LOOP_ONCE_e, 2, TRUE},
{13, J3DFrameCtrl::EMode_LOOP, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{10, J3DFrameCtrl::EMode_LOOP, 3, 15, J3DFrameCtrl::EMode_LOOP, 3, FALSE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{11, J3DFrameCtrl::EMode_LOOP, 3, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{9, J3DFrameCtrl::EMode_NONE, 3, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
{7, J3DFrameCtrl::EMode_NONE, 3, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{8, J3DFrameCtrl::EMode_NONE, 3, 14, J3DFrameCtrl::EMode_NONE, 3, FALSE},
{10, J3DFrameCtrl::EMode_LOOP, 5, 15, J3DFrameCtrl::EMode_LOOP, 5, FALSE},
{9, J3DFrameCtrl::EMode_NONE, 5, 14, J3DFrameCtrl::EMode_NONE, 5, FALSE},
{11, J3DFrameCtrl::EMode_LOOP, 5, 16, J3DFrameCtrl::EMode_LOOP, 5, FALSE},
{35, J3DFrameCtrl::EMode_LOOP, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{34, J3DFrameCtrl::EMode_LOOP, 6, 41, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{33, J3DFrameCtrl::EMode_LOOP, 6, 40, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{31, J3DFrameCtrl::EMode_NONE, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{30, J3DFrameCtrl::EMode_LOOP, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{27, J3DFrameCtrl::EMode_NONE, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{28, J3DFrameCtrl::EMode_LOOP, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{25, J3DFrameCtrl::EMode_NONE, 6, 38, J3DFrameCtrl::EMode_NONE, 6, FALSE},
{26, J3DFrameCtrl::EMode_LOOP, 6, 39, J3DFrameCtrl::EMode_LOOP, 6, FALSE},
{6, J3DFrameCtrl::EMode_NONE, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{8, J3DFrameCtrl::EMode_LOOP, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{12, J3DFrameCtrl::EMode_NONE, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{5, J3DFrameCtrl::EMode_LOOP, 7, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{32, J3DFrameCtrl::EMode_NONE, 6, 16, J3DFrameCtrl::EMode_NONE, 2, FALSE},
{29, J3DFrameCtrl::EMode_LOOP, 6, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{7, J3DFrameCtrl::EMode_NONE, 6, 16, J3DFrameCtrl::EMode_NONE, 2, FALSE},
{23, J3DFrameCtrl::EMode_NONE, 6, 16, J3DFrameCtrl::EMode_NONE, 2, FALSE},
{24, J3DFrameCtrl::EMode_LOOP, 6, 16, J3DFrameCtrl::EMode_NONE, 2, FALSE},
{10, J3DFrameCtrl::EMode_NONE, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
{11, J3DFrameCtrl::EMode_NONE, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
};
/* 80B52C94-80B52E44 0007B8 01B0+00 0/1 0/0 0/0 .data l_faceMotionSequenceData */
src/d/actor/d_a_npc_zra.cpp
+15 -15
View File
@@ -1298,7 +1298,7 @@ void daNpc_zrA_c::setMtx() {
*/
bool daNpc_zrA_c::setExpressionAnm(int i_idx, bool i_modify) {
J3DAnmTransform* bck_anm = NULL;
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
if (l_bckGetParamList[i_idx].fileIdx >= 0) {
@@ -1325,41 +1325,41 @@ bool daNpc_zrA_c::setExpressionAnm(int i_idx, bool i_modify) {
break;
case ANM_FH_TALK_NOMAL:
res = setExpressionBtp(0);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_SADSIT_A:
res = setExpressionBtp(1);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_SADSIT_B:
res = setExpressionBtp(2);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_SADSIT_C:
res = setExpressionBtp(3);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_SADSIT_D:
res = setExpressionBtp(4);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_SADSIT_E:
res = setExpressionBtp(5);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_LOOKING_SP:
res = setExpressionBtp(0);
break;
case ANM_FH_LOOKING_SP:
res = setExpressionBtp(0);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_LOOKUP:
res = setExpressionBtp(0);
break;
case ANM_FH_LOOKUP:
res = setExpressionBtp(0);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_TALK_SWIM_SP:
res = setExpressionBtp(0);
@@ -1372,14 +1372,14 @@ bool daNpc_zrA_c::setExpressionAnm(int i_idx, bool i_modify) {
break;
case ANM_FH_SPA_WAIT_A:
res = setExpressionBtp(0);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_SPA_TALK_B:
res = setExpressionBtp(6);
break;
case ANM_FH_SPA_WAIT_B:
res = setExpressionBtp(7);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
default:
bck_anm = NULL;
@@ -1407,7 +1407,7 @@ bool daNpc_zrA_c::setExpressionAnm(int i_idx, bool i_modify) {
*/
bool daNpc_zrA_c::setExpressionBtp(int i_idx) {
J3DAnmTexPattern* btp_anm = NULL;
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
mAnmFlags &= ~(ANM_PLAY_BTP | ANM_PAUSE_BTP | ANM_FLAG_800);
if (l_btpGetParamList[i_idx].fileIdx >= 0) {
@@ -1423,7 +1423,7 @@ bool daNpc_zrA_c::setExpressionBtp(int i_idx) {
case 4:
case 5:
case 7:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 6:
break;
@@ -1462,7 +1462,7 @@ bool daNpc_zrA_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* bck_anm = NULL;
J3DAnmTextureSRTKey* btk_anm = NULL;
int btk_idx = 0;
int attr = J3DFrameCtrl::LOOP_REPEAT_e;
int attr = J3DFrameCtrl::EMode_LOOP;
mBaseMotionAnm = i_idx;
if (mAcch.ChkWaterIn()) {
@@ -1500,7 +1500,7 @@ bool daNpc_zrA_c::setMotionAnm(int i_idx, f32 i_morf) {
case ANM_FLOAT_SP:
case ANM_FLOAT_B_SP:
case ANM_STEP_SP:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_FALLSWIM:
case ANM_SADSIT_A:
src/d/actor/d_a_npc_zrc.cpp
+26 -26
View File
@@ -628,7 +628,7 @@ void daNpc_zrC_c::setAttnPos() {
*/
bool daNpc_zrC_c::setExpressionAnm(int i_idx, bool i_modify) {
J3DAnmTransform* bck_anm = NULL;
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
if (l_bckGetParamList[i_idx].fileIdx >= 0) {
@@ -640,7 +640,7 @@ bool daNpc_zrC_c::setExpressionAnm(int i_idx, bool i_modify) {
switch (i_idx) {
case ANM_F_WAIT_A:
res = setExpressionBtp(0);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_SIT_TALK:
res = setExpressionBtp(1);
@@ -671,33 +671,33 @@ bool daNpc_zrC_c::setExpressionAnm(int i_idx, bool i_modify) {
break;
case ANM_F_PRAY:
res = setExpressionBtp(9);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_GETUP:
res = setExpressionBtp(10);
break;
case ANM_F_SIT:
res = setExpressionBtp(0);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_STEP:
res = setExpressionBtp(11);
break;
case ANM_FH_SAD:
res = setExpressionBtp(12);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_SMILE:
res = setExpressionBtp(13);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_KIZUKU:
res = setExpressionBtp(0);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_SICK_DEMO_WAIT:
res = setExpressionBtp(14);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
default:
bck_anm = NULL;
@@ -725,7 +725,7 @@ bool daNpc_zrC_c::setExpressionAnm(int i_idx, bool i_modify) {
*/
bool daNpc_zrC_c::setExpressionBtp(int i_idx) {
J3DAnmTexPattern* btp_anm = NULL;
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
mAnmFlags &= ~(ANM_PLAY_BTP | ANM_PAUSE_BTP | ANM_FLAG_800);
if (l_btpGetParamList[i_idx].fileIdx >= 0) {
@@ -735,19 +735,19 @@ bool daNpc_zrC_c::setExpressionBtp(int i_idx) {
switch (i_idx) {
case 0:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 9:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 12:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 13:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 14:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 1:
case 2:
@@ -796,8 +796,8 @@ bool daNpc_zrC_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* bck_anm = NULL;
J3DAnmTextureSRTKey* btk_anm = NULL;
int btk_idx = 0;
int attr = J3DFrameCtrl::LOOP_REPEAT_e;
int btk_attr = J3DFrameCtrl::LOOP_REPEAT_e;
int attr = J3DFrameCtrl::EMode_LOOP;
int btk_attr = J3DFrameCtrl::EMode_LOOP;
mAnmFlags &= ~ANM_MOTION_FLAGS;
if (l_bckGetParamList[i_idx].fileIdx >= 0) {
@@ -809,42 +809,42 @@ bool daNpc_zrC_c::setMotionAnm(int i_idx, f32 i_morf) {
case ANM_WAIT_A:
break;
case ANM_TOPRAY:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_PRAY:
break;
case ANM_GETUP:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_STEP:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_SIT:
break;
case ANM_SIT_TALK:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_SAD_TALK:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
btk_idx = 1;
btk_attr = J3DFrameCtrl::LOOP_ONCE_e;
btk_attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_SAD_WAIT:
btk_idx = 2;
break;
case ANM_TALK_A:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_KIZUKU:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
btk_idx = 3;
btk_attr = J3DFrameCtrl::LOOP_ONCE_e;
btk_attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_KIZUKU_WAIT:
btk_idx = 4;
break;
case ANM_SMILE_TALK:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_SICK_DEMO_WAIT:
break;
src/d/actor/d_a_npc_zrz.cpp
+5 -5
View File
@@ -863,7 +863,7 @@ bool daNpc_zrZ_c::setExpressionAnm(int i_idx, bool i_modify) {
return true;
}
if (setBckAnm(bck_anm, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 0, -1, i_modify)) {
if (setBckAnm(bck_anm, 1.0f, J3DFrameCtrl::EMode_NONE, 0, -1, i_modify)) {
mAnmFlags |= ANM_PLAY_BCK | ANM_PAUSE_BCK;
mExpressionLoops = 0;
return true;
@@ -876,7 +876,7 @@ bool daNpc_zrZ_c::setExpressionAnm(int i_idx, bool i_modify) {
*/
bool daNpc_zrZ_c::setExpressionBtp(int i_idx) {
J3DAnmTexPattern* btp_anm = NULL;
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
mAnmFlags &= ~(ANM_PLAY_BTP | ANM_PAUSE_BTP | ANM_FLAG_800);
if (mType == 1) {
@@ -893,7 +893,7 @@ bool daNpc_zrZ_c::setExpressionBtp(int i_idx) {
switch (i_idx) {
case 0:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
default:
btp_anm = NULL;
@@ -929,7 +929,7 @@ void daNpc_zrZ_c::setExpression(int i_expression, f32 i_morf) {
bool daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* bck_anm = NULL;
J3DAnmTextureSRTKey* btk_anm = NULL;
int attr = J3DFrameCtrl::LOOP_REPEAT_e;
int attr = J3DFrameCtrl::EMode_LOOP;
mAnmFlags &= ~ANM_MOTION_FLAGS;
if (mType == 1) {
@@ -949,7 +949,7 @@ bool daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) {
case 3:
break;
case 4:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
default:
bck_anm = NULL;
src/d/actor/d_a_obj_Lv5Key.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ int daObjLv5Key_c::CreateHeap() {
return 0;
}
if (!mBck.init(pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
if (!mBck.init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) {
return 0;
}
src/d/actor/d_a_obj_dan.cpp
+11 -11
View File
@@ -61,7 +61,7 @@ int daObjDAN_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("I_Dan", 11);
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 8)),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1,
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1,
&mCreatureSound, 0, 0x11000284);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
@@ -75,13 +75,13 @@ int daObjDAN_c::CreateHeap() {
if (mSex == SEX_FEMALE) {
J3DAnmTevRegKey* tev_anm = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("I_Dan", 14));
if (!mpBrkAnm->init(model->getModelData(), tev_anm, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
} else {
J3DAnmTevRegKey* tev_anm = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("I_Dan", 15));
if (!mpBrkAnm->init(model->getModelData(), tev_anm, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
}
@@ -94,7 +94,7 @@ int daObjDAN_c::CreateHeap() {
J3DAnmTextureSRTKey* tex_anm =
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("I_Dan", 18));
if (!mpBtkAnm->init(model->getModelData(), tex_anm, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
} else {
@@ -102,7 +102,7 @@ int daObjDAN_c::CreateHeap() {
J3DAnmTextureSRTKey* tex_anm =
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("I_Dan", 19));
if (!mpBtkAnm->init(model->getModelData(), tex_anm, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
}
@@ -166,7 +166,7 @@ void daObjDAN_c::DamageAction() {
mMode++;
mTargetSpeed = 0.0f;
mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)),
J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f);
mTimer[0] = 100;
gravity = -3.0f;
speed.y = player->speedF * 0.5f;
@@ -212,7 +212,7 @@ void daObjDAN_c::DamageAction() {
if (mTimer[0] == 0 && fopAcM_searchPlayerDistanceXZ(this) > 50.0f) {
shape_angle.x = 0;
mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 7)),
J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f);
mMode++;
speed.y = 0.0f;
speedF = 0.0f;
@@ -231,7 +231,7 @@ void daObjDAN_c::DamageAction() {
mMode = 0;
mTargetSpeed = 0.5f;
mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 8)),
J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f);
}
break;
}
@@ -337,7 +337,7 @@ void daObjDAN_c::ObjHit() {
mAction = ACT_DAMAGE;
mMode = 1;
mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)),
J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f);
mTimer[0] = 100;
}
mCcSph.ClrTgHit();
@@ -365,7 +365,7 @@ void daObjDAN_c::BoomChk() {
mBoomerangHit = false;
gravity = -3.0f;
mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)),
J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f);
mTimer[0] = 100;
mAction = ACT_DAMAGE;
mMode = 1;
@@ -585,7 +585,7 @@ cPhs__Step daObjDAN_c::create() {
mAction = ACT_DAMAGE;
mMode = 1;
mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)),
J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f);
mTimer[0] = 100;
}
src/d/actor/d_a_obj_glowSphere.cpp
+2 -2
View File
@@ -100,11 +100,11 @@ int daGlwSph_c::CreateHeap() {
}
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("glwSphere", 8);
int res = mBrk.init(modelData, brk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
int res = mBrk.init(modelData, brk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
JUT_ASSERT(0x106, res == 1);
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("glwSphere", 11);
res = mBtk.init(modelData, btk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
res = mBtk.init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
JUT_ASSERT(0x10F, res == 1);
return 1;
src/d/actor/d_a_obj_iceleaf.cpp
+1 -1
View File
@@ -181,7 +181,7 @@ int daObjIceLeaf_c::CreateHeap() {
JUT_ASSERT(0x196, pbck != 0);
mpBck = new mDoExt_bckAnm();
if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) {
return 0;
}
src/d/actor/d_a_obj_lv3Water.cpp
+2 -2
View File
@@ -100,7 +100,7 @@ int daLv3Water_c::CreateHeap() {
J3DAnmTextureSRTKey* btk =
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_resNameIdx[mType], l_btkIdx[mType]);
mBtk1.init(modelData, btk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
mBtk1.init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
if (l_bmdIdrIdx[mType] != -1) {
J3DModelData* modelData =
@@ -114,7 +114,7 @@ int daLv3Water_c::CreateHeap() {
J3DAnmTextureSRTKey* btk =
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_resNameIdx[mType], l_btkIdrIdx[mType]);
mBtk2.init(modelData, btk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
mBtk2.init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
} else {
mpModel2 = NULL;
}
src/d/actor/d_a_obj_lv3WaterB.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("L3_bwater", 8);
if (!a_this->mpBWaterBtk->init(a_this->mpBWaterModel->getModelData(), btk, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1))
{
return 0;
}
src/d/actor/d_a_obj_lv5yiblltray.cpp
+9 -9
View File
@@ -82,7 +82,7 @@ int daObjYIblltray_c::CreateHeap() {
}
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5);
if (!mBck.init(bck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mBck.init(bck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
@@ -124,24 +124,24 @@ int daObjYIblltray_c::Create() {
current.angle.x = 0x1A4F;
mMode = MODE_FRONT_WAIT;
mBck.setFrame(mBck.getEndFrame());
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_NONE);
} else {
current.angle.x = -0x1A4F;
mMode = MODE_BACK_RIDE;
mBck.setFrame(mBck.getStartFrame());
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_RESET);
}
} else {
if (!fopAcM_isSwitch(this, getSwNo())) {
current.angle.x = -0x1A4F;
mMode = MODE_BACK_RIDE;
mBck.setFrame(mBck.getStartFrame());
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_RESET);
} else {
current.angle.x = 0x1A4F;
mMode = MODE_FRONT_WAIT;
mBck.setFrame(mBck.getEndFrame());
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_NONE);
}
}
@@ -331,7 +331,7 @@ int daObjYIblltray_c::Execute(Mtx** param_0) {
if (getType() == 0) {
if (!fopAcM_isSwitch(this, getSwNo())) {
mBck.setPlaySpeed(1.0f);
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_NONE);
if (current.angle.x < 0x19EB) {
mRotAmount += 100;
@@ -352,7 +352,7 @@ int daObjYIblltray_c::Execute(Mtx** param_0) {
}
} else {
mBck.setPlaySpeed(-1.0f);
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_RESET);
if (current.angle.x > -0x19EB) {
mRotAmount -= 100;
@@ -372,7 +372,7 @@ int daObjYIblltray_c::Execute(Mtx** param_0) {
} else {
if (fopAcM_isSwitch(this, getSwNo())) {
mBck.setPlaySpeed(1.0f);
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_NONE);
if (current.angle.x < 0x19EB) {
mRotAmount += 100;
@@ -392,7 +392,7 @@ int daObjYIblltray_c::Execute(Mtx** param_0) {
}
} else {
mBck.setPlaySpeed(-1.0f);
mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e);
mBck.setPlayMode(J3DFrameCtrl::EMode_RESET);
if (current.angle.x > -0x19EB) {
mRotAmount -= 100;
src/d/actor/d_a_obj_lv8OptiLift.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ int daOptiLift_c::CreateHeap() {
}
int res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Lv8Lift", 8), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
JUT_ASSERT(0xD4, res == 1);
return 1;
}
src/d/actor/d_a_obj_magLiftRot.cpp
+2 -2
View File
@@ -383,13 +383,13 @@ int daMagLiftRot_c::CreateHeap() {
if (l_btkIdx[mType] != -1) {
J3DAnmTextureSRTKey* res =
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mType], l_btkIdx[mType]);
mBtk.init(modelData, res, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
mBtk.init(modelData, res, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
}
if (l_brkIdx[mType] != -1) {
J3DAnmTevRegKey* res =
(J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[mType], l_brkIdx[mType]);
mBrk.init(modelData, res, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
mBrk.init(modelData, res, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
}
return 1;
src/d/actor/d_a_obj_master_sword.cpp
+2 -2
View File
@@ -75,12 +75,12 @@ int daObjMasterSword_c::CreateHeap() {
}
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 11);
if (!mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 8);
if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_obj_mirror_6pole.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ int daObjMirror6Pole_c::CreateHeap() {
speed = 0.0f;
}
if (mpBck == NULL || !mpBck->init(bck, FALSE, J3DFrameCtrl::LOOP_ONCE_e, speed, 0, -1, false)) {
if (mpBck == NULL || !mpBck->init(bck, FALSE, J3DFrameCtrl::EMode_NONE, speed, 0, -1, false)) {
return 0;
}
src/d/actor/d_a_obj_mirror_sand.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ int daObjMirrorSand_c::createHeap() {
speed = 0.0f;
}
if (mpBck == NULL || !mpBck->init(bck, FALSE, J3DFrameCtrl::LOOP_ONCE_e, speed, 0, -1, false)) {
if (mpBck == NULL || !mpBck->init(bck, FALSE, J3DFrameCtrl::EMode_NONE, speed, 0, -1, false)) {
return 0;
}
src/d/actor/d_a_obj_myogan.cpp
+2 -2
View File
@@ -106,7 +106,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("S_YOGAN", 9);
if (!a_this->mpBrk->init(a_this->mpModel->getModelData(), brk, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1))
{
return 0;
}
@@ -118,7 +118,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("S_YOGAN", 12);
if (!a_this->mpBtk->init(a_this->mpModel->getModelData(), btk, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1))
{
return 0;
}
src/d/actor/d_a_obj_oiltubo.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ int daObj_Oiltubo_c::CreateHeap() {
}
mBtk.init(mdlBData_p, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getResName(), l_bbtkFileName),
TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
mSound.init(&current.pos, 1);
return 1;
}
src/d/actor/d_a_swhit0.cpp
+2 -2
View File
@@ -74,11 +74,11 @@ int daSwhit0_c::CreateHeap() {
return 0;
}
if (!mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 11), FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 11), FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_tag_Lv6Gate.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ int daTagLv6Gate_c::createHeap() {
btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19);
mpBtk[0] = new mDoExt_btkAnm();
if (mpBtk[0] == NULL ||
!mpBtk[0]->init(model_data, btk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1))
!mpBtk[0]->init(model_data, btk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1))
{
return 0;
}
@@ -48,7 +48,7 @@ int daTagLv6Gate_c::createHeap() {
btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 20);
mpBtk[1] = new mDoExt_btkAnm();
if (mpBtk[1] == NULL ||
!mpBtk[1]->init(model_data, btk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1))
!mpBtk[1]->init(model_data, btk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1))
{
return 0;
}
src/d/actor/d_a_tag_Lv7Gate.cpp
+6 -6
View File
@@ -28,7 +28,7 @@ int daTagLv7Gate_c::createHeap() {
mpBck = new mDoExt_bckAnm();
if (mpBck == NULL || !mpBck->init(bck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (mpBck == NULL || !mpBck->init(bck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
@@ -184,7 +184,7 @@ void daTagLv7Gate_c::flyAnime() {
J3DAnmTransform* bck_anm_3 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7);
J3DAnmTransform* bck_anm_4 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 8);
s32 attribute = J3DFrameCtrl::LOOP_REPEAT_e;
s32 attribute = J3DFrameCtrl::EMode_LOOP;
mLastFrame = mpBck->getFrame();
@@ -195,13 +195,13 @@ void daTagLv7Gate_c::flyAnime() {
field_0x5ac += 1;
if (field_0x5ac >= 150) {
bck = bck_anm_4;
attribute = J3DFrameCtrl::LOOP_ONCE_e;
attribute = J3DFrameCtrl::EMode_NONE;
}
}
} else if (bck_anm == bck_anm_1) {
if (mLastFrame > mpBck->getFrame()) {
bck = bck_anm_2;
attribute = J3DFrameCtrl::LOOP_ONCE_e;
attribute = J3DFrameCtrl::EMode_NONE;
}
} else {
// } else if (mpBck->isStop()) {
@@ -210,10 +210,10 @@ void daTagLv7Gate_c::flyAnime() {
if (tmp->isStop()) {
if (bck_anm == bck_anm_2) {
bck = bck_anm_3;
attribute = J3DFrameCtrl::LOOP_REPEAT_e;
attribute = J3DFrameCtrl::EMode_LOOP;
} else if (bck_anm == bck_anm_4) {
bck = bck_anm_1;
attribute = J3DFrameCtrl::LOOP_REPEAT_e;
attribute = J3DFrameCtrl::EMode_LOOP;
}
}
}
src/d/actor/d_a_tag_Lv8Gate.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ int daTagLv8Gate_c::createHeap() {
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5);
mpBck = new mDoExt_bckAnm();
if (mpBck == NULL ||
!mpBck->init(bck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false))
!mpBck->init(bck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false))
{
return 0;
}
src/d/actor/d_a_tbox.cpp
+3 -3
View File
@@ -113,7 +113,7 @@ cPhs__Step daTbox_c::commonShapeSet() {
}
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(model_info->mArcName, model_info->mBckResNo);
if (!mpAnm->init(bck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
if (!mpAnm->init(bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) {
return cPhs_ERROR_e;
}
@@ -152,7 +152,7 @@ cPhs__Step daTbox_c::commonShapeSet() {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(model_info->mArcName, model_info->mBrkResNo);
JUT_ASSERT(0x1E1, brk != 0);
if (!mpEffectAnm->init(modelData, brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1)) {
if (!mpEffectAnm->init(modelData, brk, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1)) {
return cPhs_ERROR_e;
}
}
@@ -1002,7 +1002,7 @@ void daTbox_c::OpenInit_com() {
if (getShapeType() == SHAPE_LARGE) {
J3DAnmTransform* bck =
(J3DAnmTransform*)dComIfG_getObjectRes(getModelInfo()->mArcName, 9);
mpAnm->init(bck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, bck->getFrameMax(), true);
mpAnm->init(bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, bck->getFrameMax(), true);
mOpenSeId = Z2SE_OBJ_TBOX_OPEN_B_SLOW;
}
}
src/d/actor/d_a_tbox2.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ int daTbox2_c::CreateHeap() {
(J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bck_no);
JUT_ASSERT(pbck != 0);
mpBck = new mDoExt_bckAnm();
if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) {
return false;
}
src/d/actor/d_a_vrbox2.cpp
+1 -1
View File
@@ -619,7 +619,7 @@ static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) {
a_this->model2_und = mDoExt_J3DModel__create(sun_modelData, 0x80000, 0x11020202);
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes("vrbox_sun.btk");
if (!a_this->mSunBtk.init(sun_modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, FLOAT_LABEL(lit_3627), 0, -1)) {
if (!a_this->mSunBtk.init(sun_modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, FLOAT_LABEL(lit_3627), 0, -1)) {
return 0;
}
}
src/d/d_k_wpillar.cpp
+3 -3
View File
@@ -51,13 +51,13 @@ int dkWpillar_c::create() {
J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 0xB);
JUT_ASSERT(106, bckAnm);
var_r30 = mBck.init(bckAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
var_r30 = mBck.init(bckAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false);
J3DAnmTextureSRTKey* btkAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x3B);
var_r30 &= mBtk.init(modelData, btkAnm, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
var_r30 &= mBtk.init(modelData, btkAnm, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
J3DAnmTevRegKey* brkAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x2E);
var_r30 &= mBrk.init(modelData, brkAnm, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
var_r30 &= mBrk.init(modelData, brkAnm, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
mDoExt_restoreCurrentHeap();
mDoExt_adjustSolidHeap(mpHeap);
src/d/d_kankyo.cpp
+1 -1
View File
@@ -1116,7 +1116,7 @@ static void undwater_init() {
if (g_env_light.undwater_btk != NULL) {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x3C);
if (!g_env_light.undwater_btk->init(modelData2, pbtk, TRUE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1))
{
JUT_ASSERT(1898, 0);
}
src/d/d_menu_window.cpp
+80
View File
@@ -22,6 +22,86 @@
#include "f_op/f_op_overlap_mng.h"
#include "m_Do/m_Do_controller_pad.h"
class dDlst_MENU_CAPTURE_c : public dDlst_base_c {
public:
virtual void draw() {
if (getDrawFlag() == 1) {
setDrawFlag();
dComIfGp_onPauseFlag();
GXSetTexCopySrc(0, 0, 608, 448);
GXSetTexCopyDst(304, 224, (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_ENABLE);
GXCopyTex(mDoGph_gInf_c::getFrameBufferTex(), GX_FALSE);
GXPixModeSync();
} else {
GXTexObj tex;
GXInitTexObj(&tex, mDoGph_gInf_c::getFrameBufferTex(), 304, 224,
(GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObjLOD(&tex, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
GXLoadTexObj(&tex, GX_TEXMAP0);
GXSetNumChans(0);
GXSetNumTexGens(1);
GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125);
GXSetNumTevStages(1);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_TEXC);
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
const GXColor color = {0, 0, 0, mAlpha};
GXSetTevColor(GX_TEVREG0, color);
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0);
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
GXSetZCompLoc(GX_TRUE);
GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_OR);
GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor);
GXSetFogRangeAdj(GX_FALSE, 0, NULL);
GXSetCullMode(GX_CULL_NONE);
GXSetDither(GX_TRUE);
GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0);
GXSetCurrentMtx(0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY(), 0);
GXTexCoord2s8(0, 0);
GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY(), 0);
GXTexCoord2s8(1, 0);
GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY(), 0);
GXTexCoord2s8(1, 1);
GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY(), 0);
GXTexCoord2s8(0, 1);
GXEnd();
}
}
virtual ~dDlst_MENU_CAPTURE_c() {}
dDlst_MENU_CAPTURE_c() {
mFlag = 0;
mAlpha = 255;
mTopFlag = 0;
}
void setCaptureFlag() { mFlag = 1; }
bool checkDraw() { return mFlag; }
u8 getAlpha() { return mAlpha; }
u8 getTopFlag() { return mTopFlag; }
u8 getDrawFlag() { return mFlag; }
void setDrawFlag() { mFlag = 3; }
private:
/* 0x4 */ u8 mFlag;
/* 0x5 */ u8 mAlpha;
/* 0x6 */ u8 mTopFlag;
};
BOOL dMw_UP_TRIGGER() {
return mDoCPd_c::getTrigUp(PAD_1) != 0;
}
tools/decompctx.py
+29 -22
View File
@@ -18,65 +18,63 @@ from typing import List
script_dir = os.path.dirname(os.path.realpath(__file__))
root_dir = os.path.abspath(os.path.join(script_dir, ".."))
src_dir = os.path.join(root_dir, "src")
include_dirs = [
os.path.join(root_dir, "include"),
os.path.join(root_dir, "include/dolphin"),
os.path.join(root_dir, "src"),
os.path.join(root_dir, "src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include"),
os.path.join(root_dir, "src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include"),
os.path.join(root_dir, "src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include"),
os.path.join(root_dir, "src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include"),
os.path.join(root_dir, "src/PowerPC_EABI_Support/Runtime/Inc"),
# Add additional include directories here
]
include_dirs: List[str] = [] # Set with -I flag
include_pattern = re.compile(r'^#\s*include\s*[<"](.+?)[>"]')
guard_pattern = re.compile(r"^#\s*ifndef\s+(.*)$")
once_pattern = re.compile(r"^#\s*pragma\s+once$")
defines = set()
deps = []
def import_h_file(in_file: str, r_path: str, deps: List[str]) -> str:
def import_h_file(in_file: str, r_path: str) -> str:
rel_path = os.path.join(root_dir, r_path, in_file)
if os.path.exists(rel_path):
return import_c_file(rel_path, deps)
return import_c_file(rel_path)
for include_dir in include_dirs:
inc_path = os.path.join(include_dir, in_file)
if os.path.exists(inc_path):
return import_c_file(inc_path, deps)
return import_c_file(inc_path)
else:
print("Failed to locate", in_file)
return ""
def import_c_file(in_file: str, deps: List[str]) -> str:
def import_c_file(in_file: str) -> str:
in_file = os.path.relpath(in_file, root_dir)
deps.append(in_file)
out_text = ""
try:
with open(in_file, encoding="utf-8") as file:
out_text += process_file(in_file, list(file), deps)
out_text += process_file(in_file, list(file))
except Exception:
with open(in_file) as file:
out_text += process_file(in_file, list(file), deps)
out_text += process_file(in_file, list(file))
return out_text
def process_file(in_file: str, lines: List[str], deps: List[str]) -> str:
def process_file(in_file: str, lines: List[str]) -> str:
out_text = ""
for idx, line in enumerate(lines):
guard_match = guard_pattern.match(line.strip())
if idx == 0:
guard_match = guard_pattern.match(line.strip())
if guard_match:
if guard_match[1] in defines:
break
defines.add(guard_match[1])
else:
once_match = once_pattern.match(line.strip())
if once_match:
if in_file in defines:
break
defines.add(in_file)
print("Processing file", in_file)
include_match = include_pattern.match(line.strip())
if include_match and not include_match[1].endswith(".s"):
out_text += f'/* "{in_file}" line {idx} "{include_match[1]}" */\n'
out_text += import_h_file(include_match[1], os.path.dirname(in_file), deps)
out_text += import_h_file(include_match[1], os.path.dirname(in_file))
out_text += f'/* end "{include_match[1]}" */\n'
else:
out_text += line
@@ -107,10 +105,19 @@ def main():
"--depfile",
help="""Dependency file""",
)
parser.add_argument(
"-I",
"--include",
help="""Include directory""",
action="append",
)
args = parser.parse_args()
deps = []
output = import_c_file(args.c_file, deps)
if args.include is None:
exit("No include directories specified")
global include_dirs
include_dirs = args.include
output = import_c_file(args.c_file)
with open(os.path.join(root_dir, args.output), "w", encoding="utf-8") as f:
f.write(output)
tools/download_tool.py
+30 -16
View File
@@ -91,6 +91,21 @@ TOOLS: Dict[str, Callable[[str], str]] = {
"wibo": wibo_url,
}
def download(url, response, output) -> None:
if url.endswith(".zip"):
data = io.BytesIO(response.read())
with zipfile.ZipFile(data) as f:
f.extractall(output)
# Make all files executable
for root, _, files in os.walk(output):
for name in files:
os.chmod(os.path.join(root, name), 0o755)
output.touch(mode=0o755) # Update dir modtime
else:
with open(output, "wb") as f:
shutil.copyfileobj(response, f)
st = os.stat(output)
os.chmod(output, st.st_mode | stat.S_IEXEC)
def main() -> None:
parser = argparse.ArgumentParser()
@@ -104,22 +119,21 @@ def main() -> None:
print(f"Downloading {url} to {output}")
req = urllib.request.Request(url, headers={"User-Agent": "Mozilla/5.0"})
with urllib.request.urlopen(req) as response:
if url.endswith(".zip"):
data = io.BytesIO(response.read())
with zipfile.ZipFile(data) as f:
f.extractall(output)
# Make all files executable
for root, _, files in os.walk(output):
for name in files:
os.chmod(os.path.join(root, name), 0o755)
output.touch(mode=0o755) # Update dir modtime
else:
with open(output, "wb") as f:
shutil.copyfileobj(response, f)
st = os.stat(output)
os.chmod(output, st.st_mode | stat.S_IEXEC)
try:
with urllib.request.urlopen(req) as response:
download(url, response, output)
except urllib.error.URLError as e:
if str(e).find("CERTIFICATE_VERIFY_FAILED") == -1:
raise e
try:
import certifi
import ssl
except:
print("\"certifi\" module not found. Please install it using \"python -m pip install certifi\".")
return
with urllib.request.urlopen(req, context=ssl.create_default_context(cafile=certifi.where())) as response:
download(url, response, output)
if __name__ == "__main__":
main()
tools/project.py
+111 -36
View File
@@ -17,7 +17,20 @@ import os
import platform
import sys
from pathlib import Path
from typing import IO, Any, Dict, Iterable, List, Optional, Set, Tuple, Union, cast
from typing import (
Any,
Callable,
cast,
Dict,
IO,
Iterable,
List,
Optional,
Set,
Tuple,
TypedDict,
Union,
)
from . import ninja_syntax
from .ninja_syntax import serialize_path
@@ -48,6 +61,7 @@ class Object:
"lib": None,
"mw_version": None,
"progress_category": None,
"scratch_preset_id": None,
"shift_jis": None,
"source": name,
"src_dir": None,
@@ -79,6 +93,7 @@ class Object:
set_default("asm_dir", config.asm_dir)
set_default("host", False)
set_default("mw_version", config.linker_version)
set_default("scratch_preset_id", config.scratch_preset_id)
set_default("shift_jis", config.shift_jis)
set_default("src_dir", config.src_dir)
@@ -174,6 +189,12 @@ class ProjectConfig:
True # Generate compile_commands.json for clangd
)
self.extra_clang_flags: List[str] = [] # Extra flags for clangd
self.scratch_preset_id: Optional[int] = (
None # Default decomp.me preset ID for scratches
)
self.link_order_callback: Optional[Callable[[int, List[str]], List[str]]] = (
None # Callback to add/remove/reorder units within a module
)
# Progress output, progress.json and report.json config
self.progress = True # Enable report.json generation and CLI progress output
@@ -289,10 +310,38 @@ def make_flags_str(flags: Optional[List[str]]) -> str:
return " ".join(flags)
# Unit configuration
class BuildConfigUnit(TypedDict):
object: Optional[str]
name: str
autogenerated: bool
# Module configuration
class BuildConfigModule(TypedDict):
name: str
module_id: int
ldscript: str
entry: str
units: List[BuildConfigUnit]
# Module link configuration
class BuildConfigLink(TypedDict):
modules: List[str]
# Build configuration generated by decomp-toolkit
class BuildConfig(BuildConfigModule):
version: str
modules: List[BuildConfigModule]
links: List[BuildConfigLink]
# Load decomp-toolkit generated config.json
def load_build_config(
config: ProjectConfig, build_config_path: Path
) -> Optional[Dict[str, Any]]:
) -> Optional[BuildConfig]:
if not build_config_path.is_file():
return None
@@ -300,7 +349,7 @@ def load_build_config(
return tuple(map(int, (v.split("."))))
f = open(build_config_path, "r", encoding="utf-8")
build_config: Dict[str, Any] = json.load(f)
build_config: BuildConfig = json.load(f)
config_version = build_config.get("version")
if config_version is None:
print("Invalid config.json, regenerating...")
@@ -316,6 +365,24 @@ def load_build_config(
return None
f.close()
# Apply link order callback
if config.link_order_callback:
modules: List[BuildConfigModule] = [build_config, *build_config["modules"]]
for module in modules:
unit_names = list(map(lambda u: u["name"], module["units"]))
unit_names = config.link_order_callback(module["module_id"], unit_names)
units: List[BuildConfigUnit] = []
for unit_name in unit_names:
units.append(
# Find existing unit or create a new one
next(
(u for u in module["units"] if u["name"] == unit_name),
{"object": None, "name": unit_name, "autogenerated": False},
)
)
module["units"] = units
return build_config
@@ -333,7 +400,7 @@ def generate_build(config: ProjectConfig) -> None:
def generate_build_ninja(
config: ProjectConfig,
objects: Dict[str, Object],
build_config: Optional[Dict[str, Any]],
build_config: Optional[BuildConfig],
) -> None:
out = io.StringIO()
n = ninja_syntax.Writer(out)
@@ -377,7 +444,7 @@ def generate_build_ninja(
decompctx = config.tools_dir / "decompctx.py"
n.rule(
name="decompctx",
command=f"$python {decompctx} $in -o $out -d $out.d",
command=f"$python {decompctx} $in -o $out -d $out.d $includes",
description="CTX $in",
depfile="$out.d",
deps="gcc",
@@ -694,9 +761,9 @@ def generate_build_ninja(
return path.parent / (path.name + ".MAP")
class LinkStep:
def __init__(self, config: Dict[str, Any]) -> None:
self.name: str = config["name"]
self.module_id: int = config["module_id"]
def __init__(self, config: BuildConfigModule) -> None:
self.name = config["name"]
self.module_id = config["module_id"]
self.ldscript: Optional[Path] = Path(config["ldscript"])
self.entry = config["entry"]
self.inputs: List[str] = []
@@ -806,10 +873,8 @@ def generate_build_ninja(
else:
extra_cflags.insert(0, "-lang=c")
cflags_str = make_flags_str(cflags)
if len(extra_cflags) > 0:
extra_cflags_str = make_flags_str(extra_cflags)
cflags_str += " " + extra_cflags_str
all_cflags = cflags + extra_cflags
cflags_str = make_flags_str(all_cflags)
used_compiler_versions.add(obj.options["mw_version"])
# Add MWCC build rule
@@ -833,11 +898,21 @@ def generate_build_ninja(
# Add ctx build rule
if obj.ctx_path is not None:
include_dirs = []
for flag in all_cflags:
if (
flag.startswith("-i ")
or flag.startswith("-I ")
or flag.startswith("-I+")
):
include_dirs.append(flag[3:])
includes = " ".join([f"-I {d}" for d in include_dirs])
n.build(
outputs=obj.ctx_path,
rule="decompctx",
inputs=src_path,
implicit=decompctx,
variables={"includes": includes},
)
# Add host build rule
@@ -894,13 +969,14 @@ def generate_build_ninja(
return obj_path
def add_unit(build_obj, link_step: LinkStep):
def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep):
obj_path, obj_name = build_obj["object"], build_obj["name"]
obj = objects.get(obj_name)
if obj is None:
if config.warn_missing_config and not build_obj["autogenerated"]:
print(f"Missing configuration for {obj_name}")
link_step.add(obj_path)
if obj_path is not None:
link_step.add(Path(obj_path))
return
link_built_obj = obj.completed
@@ -929,12 +1005,7 @@ def generate_build_ninja(
link_step.add(built_obj_path)
elif obj_path is not None:
# Use the original (extracted) object
link_step.add(obj_path)
else:
lib_name = obj.options["lib"]
sys.exit(
f"Missing object for {obj_name}: {obj.src_path} {lib_name} {obj}"
)
link_step.add(Path(obj_path))
# Add DOL link step
link_step = LinkStep(build_config)
@@ -1255,7 +1326,7 @@ def generate_build_ninja(
def generate_objdiff_config(
config: ProjectConfig,
objects: Dict[str, Object],
build_config: Optional[Dict[str, Any]],
build_config: Optional[BuildConfig],
) -> None:
if build_config is None:
return
@@ -1320,7 +1391,7 @@ def generate_objdiff_config(
}
def add_unit(
build_obj: Dict[str, Any], module_name: str, progress_categories: List[str]
build_obj: BuildConfigUnit, module_name: str, progress_categories: List[str]
) -> None:
obj_path, obj_name = build_obj["object"], build_obj["name"]
base_object = Path(obj_name).with_suffix("")
@@ -1355,9 +1426,21 @@ def generate_objdiff_config(
unit_config["base_path"] = obj.src_obj_path
unit_config["metadata"]["source_path"] = obj.src_path
cflags = obj.options["cflags"]
# Filter out include directories
def keep_flag(flag):
return (
not flag.startswith("-i ")
and not flag.startswith("-i-")
and not flag.startswith("-I ")
and not flag.startswith("-I+")
and not flag.startswith("-I-")
)
all_cflags = list(
filter(keep_flag, obj.options["cflags"] + obj.options["extra_cflags"])
)
reverse_fn_order = False
for flag in cflags:
for flag in all_cflags:
if not flag.startswith("-inline "):
continue
for value in flag.split(" ")[1].split(","):
@@ -1366,24 +1449,16 @@ def generate_objdiff_config(
elif value == "nodeferred":
reverse_fn_order = False
# Filter out include directories
def keep_flag(flag):
return not flag.startswith("-i ") and not flag.startswith("-I ")
cflags = list(filter(keep_flag, cflags))
compiler_version = COMPILER_MAP.get(obj.options["mw_version"])
if compiler_version is None:
print(f"Missing scratch compiler mapping for {obj.options['mw_version']}")
else:
cflags_str = make_flags_str(cflags)
if len(obj.options["extra_cflags"]) > 0:
extra_cflags_str = make_flags_str(obj.options["extra_cflags"])
cflags_str += " " + extra_cflags_str
cflags_str = make_flags_str(all_cflags)
unit_config["scratch"] = {
"platform": "gc_wii",
"compiler": compiler_version,
"c_flags": cflags_str,
"preset_id": obj.options["scratch_preset_id"],
}
if src_exists:
unit_config["scratch"].update(
@@ -1464,7 +1539,7 @@ def generate_objdiff_config(
def generate_compile_commands(
config: ProjectConfig,
objects: Dict[str, Object],
build_config: Optional[Dict[str, Any]],
build_config: Optional[BuildConfig],
) -> None:
if build_config is None or not config.generate_compile_commands:
return
@@ -1553,7 +1628,7 @@ def generate_compile_commands(
clangd_config = []
def add_unit(build_obj: Dict[str, Any]) -> None:
def add_unit(build_obj: BuildConfigUnit) -> None:
obj = objects.get(build_obj["name"])
if obj is None:
return