mirror of
https://github.com/OpenMW/openmw.git
synced 2025-07-05 13:41:34 +00:00
Merge branch 'fix_explore_music' into 'master'
Fix playing explore music after loading the game from main menu (#6769) Closes #6769 See merge request OpenMW/openmw!1907
This commit is contained in:
commit
02cfb7e258
1 changed files with 2 additions and 1 deletions
|
@ -183,6 +183,7 @@ namespace MWMechanics
|
||||||
private:
|
private:
|
||||||
enum class MusicType
|
enum class MusicType
|
||||||
{
|
{
|
||||||
|
Title,
|
||||||
Explore,
|
Explore,
|
||||||
Battle
|
Battle
|
||||||
};
|
};
|
||||||
|
@ -198,7 +199,7 @@ namespace MWMechanics
|
||||||
float mSneakSkillTimer = 0; // Times sneak skill progress from "avoid notice"
|
float mSneakSkillTimer = 0; // Times sneak skill progress from "avoid notice"
|
||||||
float mActorsProcessingRange;
|
float mActorsProcessingRange;
|
||||||
bool mSmoothMovement;
|
bool mSmoothMovement;
|
||||||
MusicType mCurrentMusic = MusicType::Explore;
|
MusicType mCurrentMusic = MusicType::Title;
|
||||||
|
|
||||||
void updateVisibility (const MWWorld::Ptr& ptr, CharacterController& ctrl);
|
void updateVisibility (const MWWorld::Ptr& ptr, CharacterController& ctrl);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue