Import JASCmdStack, std-vector work, Z2StatusMgr OK (#2029)

* Import JASCmdStack

* Work on std-vector

* Z2StatusMgr OK
This commit is contained in:
hatal175
2024-01-11 01:16:40 +02:00
committed by GitHub
parent 99f0efe975
commit f342bd7171
43 changed files with 483 additions and 1277 deletions
+1
View File
@@ -80,6 +80,7 @@ public:
bool isRiding() const { return mRiding; }
void i_setLinkState(u8 i_state) { mLinkState = i_state; }
Z2SoundObjSimple& getKantera() { return mKantera; }
u8 getLinkHp() const { return mLinkHp; }
static Z2CreatureLink* mLinkPtr;
+5
View File
@@ -42,4 +42,9 @@ struct Z2Param {
static f32 ENEMY_LASTHIT_MUTE_VOLUME;
};
extern u8 struct_80450860;
extern u8 struct_80450861;
extern u8 struct_80450862;
extern u8 struct_80450863;
#endif /* Z2PARAM_H */
+1
View File
@@ -30,6 +30,7 @@ public:
bool isSceneExist() const { return sceneExist; }
int getCurrentSceneNum() const { return sceneNum; }
bool isInGame() const { return inGame; }
private:
/* 0x00 */ long BGM_ID;
+10 -2
View File
@@ -13,8 +13,12 @@ struct TTransition {
struct Z2SoundFader {
void move(f32 vol, u32 count) {
mIntensity = vol;
mTransition.zero();
if (count != 0) {
mTransition.set(vol, mIntensity, count);
} else {
mIntensity = vol;
mTransition.zero();
}
}
/* 0x0 */ float mIntensity;
@@ -85,6 +89,10 @@ public:
void i_bgmAllUnMute(u32 count) { mAllBgmMaster.move(1.0f, count); }
void i_muteSceneBgm(u32 count, f32 vol) {
field_0x44.move(vol, count);
}
void i_unMuteSceneBgm(u32 count) {
mBgmPause.move(1.0f, 0);
field_0x44.move(1.0f, count);