backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

format common sound engine folder

Browse source
This commit is contained in:
Tropical 2026-03-22 02:29:12 -05:00
parent ce57edff9d
commit da3d403b29
5 changed files with 1571 additions and 1618 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Minecraft.Client/Platform/Common/Audio/Consoles_SoundEngine.cpp
View file

@ -1,38 +1,25 @@
#include "../../Minecraft.World/Platform/stdafx.h" #include "../../Minecraft.World/Platform/stdafx.h"
#include "Consoles_SoundEngine.h" #include "Consoles_SoundEngine.h"
bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() {
bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() return m_bIsPlayingStreamingCDMusic;
{
return m_bIsPlayingStreamingCDMusic;
} }
bool ConsoleSoundEngine::GetIsPlayingStreamingGameMusic() bool ConsoleSoundEngine::GetIsPlayingStreamingGameMusic() {
{ return m_bIsPlayingStreamingGameMusic;
return m_bIsPlayingStreamingGameMusic;
} }
void ConsoleSoundEngine::SetIsPlayingStreamingCDMusic(bool bVal) void ConsoleSoundEngine::SetIsPlayingStreamingCDMusic(bool bVal) {
{ m_bIsPlayingStreamingCDMusic = bVal;
m_bIsPlayingStreamingCDMusic=bVal;
} }
void ConsoleSoundEngine::SetIsPlayingStreamingGameMusic(bool bVal) void ConsoleSoundEngine::SetIsPlayingStreamingGameMusic(bool bVal) {
{ m_bIsPlayingStreamingGameMusic = bVal;
m_bIsPlayingStreamingGameMusic=bVal;
} }
bool ConsoleSoundEngine::GetIsPlayingEndMusic() bool ConsoleSoundEngine::GetIsPlayingEndMusic() { return m_bIsPlayingEndMusic; }
{ bool ConsoleSoundEngine::GetIsPlayingNetherMusic() {
return m_bIsPlayingEndMusic; return m_bIsPlayingNetherMusic;
} }
bool ConsoleSoundEngine::GetIsPlayingNetherMusic() void ConsoleSoundEngine::SetIsPlayingEndMusic(bool bVal) {
{ m_bIsPlayingEndMusic = bVal;
return m_bIsPlayingNetherMusic;
} }
void ConsoleSoundEngine::SetIsPlayingEndMusic(bool bVal) void ConsoleSoundEngine::SetIsPlayingNetherMusic(bool bVal) {
{ m_bIsPlayingNetherMusic = bVal;
m_bIsPlayingEndMusic=bVal;
} }
void ConsoleSoundEngine::SetIsPlayingNetherMusic(bool bVal)
{
m_bIsPlayingNetherMusic=bVal;
}

109
Minecraft.Client/Platform/Common/Audio/Consoles_SoundEngine.h
View file

@ -4,81 +4,86 @@
#ifdef _XBOX #ifdef _XBOX
#elif defined (__PS3__) #elif defined(__PS3__)
#undef __in #undef __in
#undef __out #undef __out
#include "../../Minecraft.Client/Platform/PS3/Miles/include/mss.h" #include "../../Minecraft.Client/Platform/PS3/Miles/include/mss.h"
#elif defined (__PSVITA__) #elif defined(__PSVITA__)
#include "../../PSVITA/Miles/include/mss.h" #include "../../PSVITA/Miles/include/mss.h"
#elif defined _DURANGO #elif defined _DURANGO
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles // 4J Stu - Temp define to get Miles to link, can likely be removed when we get
// a new version of Miles
#define _SEKRIT #define _SEKRIT
#include "../../Minecraft.Client/Platform/Durango/Miles/include/mss.h" #include "../../Minecraft.Client/Platform/Durango/Miles/include/mss.h"
#elif defined _WINDOWS64 #elif defined _WINDOWS64
#include "../../windows64/Miles/include/mss.h" #include "../../windows64/Miles/include/mss.h"
#elif defined(__linux__) #elif defined(__linux__)
// (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones // (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but
// for now I'm using Win64 ones
#include "../../Minecraft.Client/Platform/Windows64/Miles/include/mss.h" #include "../../Minecraft.Client/Platform/Windows64/Miles/include/mss.h"
#else // PS4 #else // PS4
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles // 4J Stu - Temp define to get Miles to link, can likely be removed when we get
// a new version of Miles
#define _SEKRIT2 #define _SEKRIT2
#include "../../Minecraft.Client/Platform/Orbis/Miles/include/mss.h" #include "../../Minecraft.Client/Platform/Orbis/Miles/include/mss.h"
#endif #endif
typedef struct typedef struct {
{ float x, y, z;
float x,y,z; } AUDIO_VECTOR;
}
AUDIO_VECTOR;
typedef struct typedef struct {
{ bool bValid;
bool bValid; AUDIO_VECTOR vPosition;
AUDIO_VECTOR vPosition; AUDIO_VECTOR vOrientFront;
AUDIO_VECTOR vOrientFront; } AUDIO_LISTENER;
}
AUDIO_LISTENER;
class Options; class Options;
class ConsoleSoundEngine class ConsoleSoundEngine {
{
public: public:
ConsoleSoundEngine()
: m_bIsPlayingStreamingCDMusic(false),
m_bIsPlayingStreamingGameMusic(false),
m_bIsPlayingEndMusic(false),
m_bIsPlayingNetherMusic(false) {};
virtual void tick(std::shared_ptr<Mob>* players, float a) = 0;
virtual void destroy() = 0;
virtual void play(int iSound, float x, float y, float z, float volume,
float pitch) = 0;
virtual void playStreaming(const std::wstring& name, float x, float y,
float z, float volume, float pitch,
bool bMusicDelay = true) = 0;
virtual void playUI(int iSound, float volume, float pitch) = 0;
virtual void updateMusicVolume(float fVal) = 0;
virtual void updateSystemMusicPlaying(bool isPlaying) = 0;
virtual void updateSoundEffectVolume(float fVal) = 0;
virtual void init(Options*) = 0;
virtual void add(const std::wstring& name, File* file) = 0;
virtual void addMusic(const std::wstring& name, File* file) = 0;
virtual void addStreaming(const std::wstring& name, File* file) = 0;
virtual char* ConvertSoundPathToName(const std::wstring& name,
bool bConvertSpaces) = 0;
virtual void playMusicTick() = 0;
ConsoleSoundEngine() : m_bIsPlayingStreamingCDMusic(false),m_bIsPlayingStreamingGameMusic(false), m_bIsPlayingEndMusic(false),m_bIsPlayingNetherMusic(false){}; virtual bool GetIsPlayingStreamingCDMusic();
virtual void tick(std::shared_ptr<Mob> *players, float a) =0; virtual bool GetIsPlayingStreamingGameMusic();
virtual void destroy()=0; virtual void SetIsPlayingStreamingCDMusic(bool bVal);
virtual void play(int iSound, float x, float y, float z, float volume, float pitch) =0; virtual void SetIsPlayingStreamingGameMusic(bool bVal);
virtual void playStreaming(const std::wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true) =0; virtual bool GetIsPlayingEndMusic();
virtual void playUI(int iSound, float volume, float pitch) =0; virtual bool GetIsPlayingNetherMusic();
virtual void updateMusicVolume(float fVal) =0; virtual void SetIsPlayingEndMusic(bool bVal);
virtual void updateSystemMusicPlaying(bool isPlaying) = 0; virtual void SetIsPlayingNetherMusic(bool bVal);
virtual void updateSoundEffectVolume(float fVal) =0; static const WCHAR* wchSoundNames[eSoundType_MAX];
virtual void init(Options *) =0 ; static const WCHAR* wchUISoundNames[eSFX_MAX];
virtual void add(const std::wstring& name, File *file) =0;
virtual void addMusic(const std::wstring& name, File *file) =0;
virtual void addStreaming(const std::wstring& name, File *file) =0;
virtual char *ConvertSoundPathToName(const std::wstring& name, bool bConvertSpaces) =0;
virtual void playMusicTick() =0;
virtual bool GetIsPlayingStreamingCDMusic() ;
virtual bool GetIsPlayingStreamingGameMusic() ;
virtual void SetIsPlayingStreamingCDMusic(bool bVal) ;
virtual void SetIsPlayingStreamingGameMusic(bool bVal) ;
virtual bool GetIsPlayingEndMusic() ;
virtual bool GetIsPlayingNetherMusic() ;
virtual void SetIsPlayingEndMusic(bool bVal) ;
virtual void SetIsPlayingNetherMusic(bool bVal) ;
static const WCHAR *wchSoundNames[eSoundType_MAX];
static const WCHAR *wchUISoundNames[eSFX_MAX];
private: private:
// platform specific functions // platform specific functions
virtual int initAudioHardware(int iMinSpeakers)=0; virtual int initAudioHardware(int iMinSpeakers) = 0;
bool m_bIsPlayingStreamingCDMusic; bool m_bIsPlayingStreamingCDMusic;
bool m_bIsPlayingStreamingGameMusic; bool m_bIsPlayingStreamingGameMusic;
bool m_bIsPlayingEndMusic; bool m_bIsPlayingEndMusic;
bool m_bIsPlayingNetherMusic; bool m_bIsPlayingNetherMusic;
}; };

2466
Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
View file

File diff suppressed because it is too large Load diff

269
Minecraft.Client/Platform/Common/Audio/SoundEngine.h
View file

@ -4,166 +4,167 @@ class Options;
using namespace std; using namespace std;
#include "../../Minecraft.World/Util/SoundTypes.h" #include "../../Minecraft.World/Util/SoundTypes.h"
enum eMUSICFILES enum eMUSICFILES {
{ eStream_Overworld_Calm1 = 0,
eStream_Overworld_Calm1 = 0, eStream_Overworld_Calm2,
eStream_Overworld_Calm2, eStream_Overworld_Calm3,
eStream_Overworld_Calm3, eStream_Overworld_hal1,
eStream_Overworld_hal1, eStream_Overworld_hal2,
eStream_Overworld_hal2, eStream_Overworld_hal3,
eStream_Overworld_hal3, eStream_Overworld_hal4,
eStream_Overworld_hal4, eStream_Overworld_nuance1,
eStream_Overworld_nuance1, eStream_Overworld_nuance2,
eStream_Overworld_nuance2,
#ifndef _XBOX #ifndef _XBOX
// Add the new music tracks // Add the new music tracks
eStream_Overworld_Creative1, eStream_Overworld_Creative1,
eStream_Overworld_Creative2, eStream_Overworld_Creative2,
eStream_Overworld_Creative3, eStream_Overworld_Creative3,
eStream_Overworld_Creative4, eStream_Overworld_Creative4,
eStream_Overworld_Creative5, eStream_Overworld_Creative5,
eStream_Overworld_Creative6, eStream_Overworld_Creative6,
eStream_Overworld_Menu1, eStream_Overworld_Menu1,
eStream_Overworld_Menu2, eStream_Overworld_Menu2,
eStream_Overworld_Menu3, eStream_Overworld_Menu3,
eStream_Overworld_Menu4, eStream_Overworld_Menu4,
#endif #endif
eStream_Overworld_piano1, eStream_Overworld_piano1,
eStream_Overworld_piano2, eStream_Overworld_piano2,
eStream_Overworld_piano3, // <-- make piano3 the last overworld one eStream_Overworld_piano3, // <-- make piano3 the last overworld one
// Nether // Nether
eStream_Nether1, eStream_Nether1,
eStream_Nether2, eStream_Nether2,
eStream_Nether3, eStream_Nether3,
eStream_Nether4, eStream_Nether4,
// The End // The End
eStream_end_dragon, eStream_end_dragon,
eStream_end_end, eStream_end_end,
eStream_CD_1, eStream_CD_1,
eStream_CD_2, eStream_CD_2,
eStream_CD_3, eStream_CD_3,
eStream_CD_4, eStream_CD_4,
eStream_CD_5, eStream_CD_5,
eStream_CD_6, eStream_CD_6,
eStream_CD_7, eStream_CD_7,
eStream_CD_8, eStream_CD_8,
eStream_CD_9, eStream_CD_9,
eStream_CD_10, eStream_CD_10,
eStream_CD_11, eStream_CD_11,
eStream_CD_12, eStream_CD_12,
eStream_Max, eStream_Max,
}; };
enum eMUSICTYPE enum eMUSICTYPE {
{ eMusicType_None,
eMusicType_None, eMusicType_Game,
eMusicType_Game, eMusicType_CD,
eMusicType_CD,
}; };
enum MUSIC_STREAMSTATE {
enum MUSIC_STREAMSTATE eMusicStreamState_Idle = 0,
{ eMusicStreamState_Stop,
eMusicStreamState_Idle=0, eMusicStreamState_Stopping,
eMusicStreamState_Stop, eMusicStreamState_Opening,
eMusicStreamState_Stopping, eMusicStreamState_OpeningCancel,
eMusicStreamState_Opening, eMusicStreamState_Play,
eMusicStreamState_OpeningCancel, eMusicStreamState_Playing,
eMusicStreamState_Play, eMusicStreamState_Completed
eMusicStreamState_Playing,
eMusicStreamState_Completed
}; };
typedef struct typedef struct {
{ F32 x, y, z, volume, pitch;
F32 x,y,z,volume,pitch; int iSound;
int iSound; bool bIs3D;
bool bIs3D; bool bUseSoundsPitchVal;
bool bUseSoundsPitchVal;
#ifdef _DEBUG #ifdef _DEBUG
char chName[64]; char chName[64];
#endif #endif
} } AUDIO_INFO;
AUDIO_INFO;
class SoundEngine : public ConsoleSoundEngine class SoundEngine : public ConsoleSoundEngine {
{ static const int MAX_SAME_SOUNDS_PLAYING = 8; // 4J added
static const int MAX_SAME_SOUNDS_PLAYING = 8; // 4J added
public: public:
SoundEngine(); SoundEngine();
virtual void destroy(); virtual void destroy();
#ifdef _DEBUG #ifdef _DEBUG
void GetSoundName(char *szSoundName,int iSound); void GetSoundName(char* szSoundName, int iSound);
#endif #endif
virtual void play(int iSound, float x, float y, float z, float volume, float pitch); virtual void play(int iSound, float x, float y, float z, float volume,
virtual void playStreaming(const std::wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true); float pitch);
virtual void playUI(int iSound, float volume, float pitch); virtual void playStreaming(const std::wstring& name, float x, float y,
virtual void playMusicTick(); float z, float volume, float pitch,
virtual void updateMusicVolume(float fVal); bool bMusicDelay = true);
virtual void updateSystemMusicPlaying(bool isPlaying); virtual void playUI(int iSound, float volume, float pitch);
virtual void updateSoundEffectVolume(float fVal); virtual void playMusicTick();
virtual void init(Options *); virtual void updateMusicVolume(float fVal);
virtual void tick(std::shared_ptr<Mob> *players, float a); // 4J - updated to take array of local players rather than single one virtual void updateSystemMusicPlaying(bool isPlaying);
virtual void add(const std::wstring& name, File *file); virtual void updateSoundEffectVolume(float fVal);
virtual void addMusic(const std::wstring& name, File *file); virtual void init(Options*);
virtual void addStreaming(const std::wstring& name, File *file); virtual void tick(std::shared_ptr<Mob>* players,
virtual char *ConvertSoundPathToName(const std::wstring& name, bool bConvertSpaces=false); float a); // 4J - updated to take array of local players
bool isStreamingWavebankReady(); // 4J Added // rather than single one
int getMusicID(int iDomain); virtual void add(const std::wstring& name, File* file);
int getMusicID(const std::wstring& name); virtual void addMusic(const std::wstring& name, File* file);
void SetStreamingSounds(int iOverworldMin, int iOverWorldMax, int iNetherMin, int iNetherMax, int iEndMin, int iEndMax, int iCD1); virtual void addStreaming(const std::wstring& name, File* file);
void updateMiles(); // AP added so Vita can update all the Miles functions during the mixer callback virtual char* ConvertSoundPathToName(const std::wstring& name,
void playMusicUpdate(); bool bConvertSpaces = false);
bool isStreamingWavebankReady(); // 4J Added
int getMusicID(int iDomain);
int getMusicID(const std::wstring& name);
void SetStreamingSounds(int iOverworldMin, int iOverWorldMax,
int iNetherMin, int iNetherMax, int iEndMin,
int iEndMax, int iCD1);
void updateMiles(); // AP added so Vita can update all the Miles functions
// during the mixer callback
void playMusicUpdate();
private: private:
float getMasterMusicVolume(); float getMasterMusicVolume();
// platform specific functions // platform specific functions
#ifdef __PS3__ #ifdef __PS3__
int initAudioHardware(int iMinSpeakers); int initAudioHardware(int iMinSpeakers);
#else #else
int initAudioHardware(int iMinSpeakers) { return iMinSpeakers;} int initAudioHardware(int iMinSpeakers) { return iMinSpeakers; }
#endif #endif
int GetRandomishTrack(int iStart,int iEnd);
HMSOUNDBANK m_hBank; int GetRandomishTrack(int iStart, int iEnd);
HDIGDRIVER m_hDriver;
HSTREAM m_hStream;
static char m_szSoundPath[]; HMSOUNDBANK m_hBank;
static char m_szMusicPath[]; HDIGDRIVER m_hDriver;
static char m_szRedistName[]; HSTREAM m_hStream;
static char *m_szStreamFileA[eStream_Max];
AUDIO_LISTENER m_ListenerA[MAX_LOCAL_PLAYERS]; static char m_szSoundPath[];
int m_validListenerCount; static char m_szMusicPath[];
static char m_szRedistName[];
static char* m_szStreamFileA[eStream_Max];
AUDIO_LISTENER m_ListenerA[MAX_LOCAL_PLAYERS];
int m_validListenerCount;
Random *random; Random* random;
int m_musicID; int m_musicID;
int m_iMusicDelay; int m_iMusicDelay;
int m_StreamState; int m_StreamState;
int m_MusicType; int m_MusicType;
AUDIO_INFO m_StreamingAudioInfo; AUDIO_INFO m_StreamingAudioInfo;
std::wstring m_CDMusic; std::wstring m_CDMusic;
bool m_bSystemMusicPlaying; bool m_bSystemMusicPlaying;
float m_MasterMusicVolume; float m_MasterMusicVolume;
float m_MasterEffectsVolume; float m_MasterEffectsVolume;
C4JThread *m_openStreamThread; C4JThread* m_openStreamThread;
static int OpenStreamThreadProc( void* lpParameter ); static int OpenStreamThreadProc(void* lpParameter);
char m_szStreamName[255]; char m_szStreamName[255];
int CurrentSoundsPlaying[static_cast<int>(eSoundType_MAX) + int CurrentSoundsPlaying[static_cast<int>(eSoundType_MAX) +
static_cast<int>(eSFX_MAX)]; static_cast<int>(eSFX_MAX)];
// streaming music files - will be different for mash-up packs // streaming music files - will be different for mash-up packs
int m_iStream_Overworld_Min,m_iStream_Overworld_Max; int m_iStream_Overworld_Min, m_iStream_Overworld_Max;
int m_iStream_Nether_Min,m_iStream_Nether_Max; int m_iStream_Nether_Min, m_iStream_Nether_Max;
int m_iStream_End_Min,m_iStream_End_Max; int m_iStream_End_Min, m_iStream_End_Max;
int m_iStream_CD_1; int m_iStream_CD_1;
bool *m_bHeardTrackA; bool* m_bHeardTrackA;
#ifdef __ORBIS__ #ifdef __ORBIS__
int32_t m_hBGMAudio; int32_t m_hBGMAudio;
#endif #endif
}; };

302
Minecraft.Client/Platform/Common/Audio/SoundNames.cpp
View file

@ -2,164 +2,156 @@
#include "Consoles_SoundEngine.h" #include "Consoles_SoundEngine.h"
const WCHAR* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = {
L"mob.chicken", // eSoundType_MOB_CHICKEN_AMBIENT
const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]= L"mob.chickenhurt", // eSoundType_MOB_CHICKEN_HURT
{ L"mob.chickenplop", // eSoundType_MOB_CHICKENPLOP
L"mob.chicken", // eSoundType_MOB_CHICKEN_AMBIENT L"mob.cow", // eSoundType_MOB_COW_AMBIENT
L"mob.chickenhurt", // eSoundType_MOB_CHICKEN_HURT L"mob.cowhurt", // eSoundType_MOB_COW_HURT
L"mob.chickenplop", // eSoundType_MOB_CHICKENPLOP L"mob.pig", // eSoundType_MOB_PIG_AMBIENT
L"mob.cow", // eSoundType_MOB_COW_AMBIENT L"mob.pigdeath", // eSoundType_MOB_PIG_DEATH
L"mob.cowhurt", // eSoundType_MOB_COW_HURT L"mob.sheep", // eSoundType_MOB_SHEEP_AMBIENT
L"mob.pig", // eSoundType_MOB_PIG_AMBIENT L"mob.wolf.growl", // eSoundType_MOB_WOLF_GROWL
L"mob.pigdeath", // eSoundType_MOB_PIG_DEATH L"mob.wolf.whine", // eSoundType_MOB_WOLF_WHINE
L"mob.sheep", // eSoundType_MOB_SHEEP_AMBIENT L"mob.wolf.panting", // eSoundType_MOB_WOLF_PANTING
L"mob.wolf.growl", // eSoundType_MOB_WOLF_GROWL L"mob.wolf.bark", // eSoundType_MOB_WOLF_BARK
L"mob.wolf.whine", // eSoundType_MOB_WOLF_WHINE L"mob.wolf.hurt", // eSoundType_MOB_WOLF_HURT
L"mob.wolf.panting", // eSoundType_MOB_WOLF_PANTING L"mob.wolf.death", // eSoundType_MOB_WOLF_DEATH
L"mob.wolf.bark", // eSoundType_MOB_WOLF_BARK L"mob.wolf.shake", // eSoundType_MOB_WOLF_SHAKE
L"mob.wolf.hurt", // eSoundType_MOB_WOLF_HURT L"mob.blaze.breathe", // eSoundType_MOB_BLAZE_BREATHE
L"mob.wolf.death", // eSoundType_MOB_WOLF_DEATH L"mob.blaze.hit", // eSoundType_MOB_BLAZE_HURT
L"mob.wolf.shake", // eSoundType_MOB_WOLF_SHAKE L"mob.blaze.death", // eSoundType_MOB_BLAZE_DEATH
L"mob.blaze.breathe", // eSoundType_MOB_BLAZE_BREATHE L"mob.ghast.moan", // eSoundType_MOB_GHAST_MOAN
L"mob.blaze.hit", // eSoundType_MOB_BLAZE_HURT L"mob.ghast.scream", // eSoundType_MOB_GHAST_SCREAM
L"mob.blaze.death", // eSoundType_MOB_BLAZE_DEATH L"mob.ghast.death", // eSoundType_MOB_GHAST_DEATH
L"mob.ghast.moan", // eSoundType_MOB_GHAST_MOAN L"mob.ghast.fireball", // eSoundType_MOB_GHAST_FIREBALL
L"mob.ghast.scream", // eSoundType_MOB_GHAST_SCREAM L"mob.ghast.charge", // eSoundType_MOB_GHAST_CHARGE
L"mob.ghast.death", // eSoundType_MOB_GHAST_DEATH L"mob.endermen.idle", // eSoundType_MOB_ENDERMEN_IDLE
L"mob.ghast.fireball", // eSoundType_MOB_GHAST_FIREBALL L"mob.endermen.hit", // eSoundType_MOB_ENDERMEN_HIT
L"mob.ghast.charge", // eSoundType_MOB_GHAST_CHARGE L"mob.endermen.death", // eSoundType_MOB_ENDERMEN_DEATH
L"mob.endermen.idle", // eSoundType_MOB_ENDERMEN_IDLE L"mob.endermen.portal", // eSoundType_MOB_ENDERMEN_PORTAL
L"mob.endermen.hit", // eSoundType_MOB_ENDERMEN_HIT L"mob.zombiepig.zpig", // eSoundType_MOB_ZOMBIEPIG_AMBIENT
L"mob.endermen.death", // eSoundType_MOB_ENDERMEN_DEATH L"mob.zombiepig.zpighurt", // eSoundType_MOB_ZOMBIEPIG_HURT
L"mob.endermen.portal", // eSoundType_MOB_ENDERMEN_PORTAL L"mob.zombiepig.zpigdeath", // eSoundType_MOB_ZOMBIEPIG_DEATH
L"mob.zombiepig.zpig", // eSoundType_MOB_ZOMBIEPIG_AMBIENT L"mob.zombiepig.zpigangry", // eSoundType_MOB_ZOMBIEPIG_ZPIGANGRY
L"mob.zombiepig.zpighurt", // eSoundType_MOB_ZOMBIEPIG_HURT L"mob.silverfish.say", // eSoundType_MOB_SILVERFISH_AMBIENT,
L"mob.zombiepig.zpigdeath", // eSoundType_MOB_ZOMBIEPIG_DEATH L"mob.silverfish.hit", // eSoundType_MOB_SILVERFISH_HURT
L"mob.zombiepig.zpigangry", // eSoundType_MOB_ZOMBIEPIG_ZPIGANGRY L"mob.silverfish.kill", // eSoundType_MOB_SILVERFISH_DEATH,
L"mob.silverfish.say", // eSoundType_MOB_SILVERFISH_AMBIENT, L"mob.silverfish.step", // eSoundType_MOB_SILVERFISH_STEP,
L"mob.silverfish.hit", // eSoundType_MOB_SILVERFISH_HURT L"mob.skeleton", // eSoundType_MOB_SKELETON_AMBIENT,
L"mob.silverfish.kill", // eSoundType_MOB_SILVERFISH_DEATH, L"mob.skeletonhurt", // eSoundType_MOB_SKELETON_HURT,
L"mob.silverfish.step", // eSoundType_MOB_SILVERFISH_STEP, L"mob.spider", // eSoundType_MOB_SPIDER_AMBIENT,
L"mob.skeleton", // eSoundType_MOB_SKELETON_AMBIENT, L"mob.spiderdeath", // eSoundType_MOB_SPIDER_DEATH,
L"mob.skeletonhurt", // eSoundType_MOB_SKELETON_HURT, L"mob.slime", // eSoundType_MOB_SLIME,
L"mob.spider", // eSoundType_MOB_SPIDER_AMBIENT, L"mob.slimeattack", // eSoundType_MOB_SLIME_ATTACK,
L"mob.spiderdeath", // eSoundType_MOB_SPIDER_DEATH, L"mob.creeper", // eSoundType_MOB_CREEPER_HURT,
L"mob.slime", // eSoundType_MOB_SLIME, L"mob.creeperdeath", // eSoundType_MOB_CREEPER_DEATH,
L"mob.slimeattack", // eSoundType_MOB_SLIME_ATTACK, L"mob.zombie", // eSoundType_MOB_ZOMBIE_AMBIENT,
L"mob.creeper", // eSoundType_MOB_CREEPER_HURT, L"mob.zombiehurt", // eSoundType_MOB_ZOMBIE_HURT,
L"mob.creeperdeath", // eSoundType_MOB_CREEPER_DEATH, L"mob.zombiedeath", // eSoundType_MOB_ZOMBIE_DEATH,
L"mob.zombie", // eSoundType_MOB_ZOMBIE_AMBIENT, L"mob.zombie.wood", // eSoundType_MOB_ZOMBIE_WOOD,
L"mob.zombiehurt", // eSoundType_MOB_ZOMBIE_HURT, L"mob.zombie.woodbreak", // eSoundType_MOB_ZOMBIE_WOOD_BREAK,
L"mob.zombiedeath", // eSoundType_MOB_ZOMBIE_DEATH, L"mob.zombie.metal", // eSoundType_MOB_ZOMBIE_METAL,
L"mob.zombie.wood", // eSoundType_MOB_ZOMBIE_WOOD, L"mob.magmacube.big", // eSoundType_MOB_MAGMACUBE_BIG,
L"mob.zombie.woodbreak", // eSoundType_MOB_ZOMBIE_WOOD_BREAK, L"mob.magmacube.small", // eSoundType_MOB_MAGMACUBE_SMALL,
L"mob.zombie.metal", // eSoundType_MOB_ZOMBIE_METAL, L"mob.cat.purr", // eSoundType_MOB_CAT_PURR
L"mob.magmacube.big", // eSoundType_MOB_MAGMACUBE_BIG, L"mob.cat.purreow", // eSoundType_MOB_CAT_PURREOW
L"mob.magmacube.small", // eSoundType_MOB_MAGMACUBE_SMALL, L"mob.cat.meow", // eSoundType_MOB_CAT_MEOW
L"mob.cat.purr", // eSoundType_MOB_CAT_PURR // 4J-PB - correct the name of the event for hitting ocelots
L"mob.cat.purreow", // eSoundType_MOB_CAT_PURREOW L"mob.cat.hit", // eSoundType_MOB_CAT_HITT
L"mob.cat.meow", // eSoundType_MOB_CAT_MEOW // L"mob.irongolem.throw", //
// 4J-PB - correct the name of the event for hitting ocelots //eSoundType_MOB_IRONGOLEM_THROW L"mob.irongolem.hit",
L"mob.cat.hit", // eSoundType_MOB_CAT_HITT //// eSoundType_MOB_IRONGOLEM_HIT L"mob.irongolem.death",
// L"mob.irongolem.throw", // eSoundType_MOB_IRONGOLEM_THROW //// eSoundType_MOB_IRONGOLEM_DEATH L"mob.irongolem.walk",
// L"mob.irongolem.hit", // eSoundType_MOB_IRONGOLEM_HIT //// eSoundType_MOB_IRONGOLEM_WALK
// L"mob.irongolem.death", // eSoundType_MOB_IRONGOLEM_DEATH L"random.bow", // eSoundType_RANDOM_BOW,
// L"mob.irongolem.walk", // eSoundType_MOB_IRONGOLEM_WALK L"random.bowhit", // eSoundType_RANDOM_BOW_HIT,
L"random.bow", // eSoundType_RANDOM_BOW, L"random.explode", // eSoundType_RANDOM_EXPLODE,
L"random.bowhit", // eSoundType_RANDOM_BOW_HIT, L"random.fizz", // eSoundType_RANDOM_FIZZ,
L"random.explode", // eSoundType_RANDOM_EXPLODE, L"random.pop", // eSoundType_RANDOM_POP,
L"random.fizz", // eSoundType_RANDOM_FIZZ, L"random.fuse", // eSoundType_RANDOM_FUSE,
L"random.pop", // eSoundType_RANDOM_POP, L"random.drink", // eSoundType_RANDOM_DRINK,
L"random.fuse", // eSoundType_RANDOM_FUSE, L"random.eat", // eSoundType_RANDOM_EAT,
L"random.drink", // eSoundType_RANDOM_DRINK, L"random.burp", // eSoundType_RANDOM_BURP,
L"random.eat", // eSoundType_RANDOM_EAT, L"random.splash", // eSoundType_RANDOM_SPLASH,
L"random.burp", // eSoundType_RANDOM_BURP, L"random.click", // eSoundType_RANDOM_CLICK,
L"random.splash", // eSoundType_RANDOM_SPLASH, L"random.glass", // eSoundType_RANDOM_GLASS,
L"random.click", // eSoundType_RANDOM_CLICK, L"random.orb", // eSoundType_RANDOM_ORB,
L"random.glass", // eSoundType_RANDOM_GLASS, L"random.break", // eSoundType_RANDOM_BREAK,
L"random.orb", // eSoundType_RANDOM_ORB, L"random.chestopen", // eSoundType_RANDOM_CHEST_OPEN,
L"random.break", // eSoundType_RANDOM_BREAK, L"random.chestclosed", // eSoundType_RANDOM_CHEST_CLOSE,
L"random.chestopen", // eSoundType_RANDOM_CHEST_OPEN, L"random.door_open", // eSoundType_RANDOM_DOOR_OPEN,
L"random.chestclosed", // eSoundType_RANDOM_CHEST_CLOSE, L"random.door_close", // eSoundType_RANDOM_DOOR_CLOSE,
L"random.door_open", // eSoundType_RANDOM_DOOR_OPEN, L"ambient.weather.rain", // eSoundType_AMBIENT_WEATHER_RAIN,
L"random.door_close", // eSoundType_RANDOM_DOOR_CLOSE, L"ambient.weather.thunder", // eSoundType_AMBIENT_WEATHER_THUNDER,
L"ambient.weather.rain", // eSoundType_AMBIENT_WEATHER_RAIN, L"ambient.cave.cave", // eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!!
L"ambient.weather.thunder", // eSoundType_AMBIENT_WEATHER_THUNDER,
L"ambient.cave.cave", // eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!!
#ifdef _XBOX #ifdef _XBOX
L"ambient.cave.cave2", // eSoundType_CAVE_CAVE2 - removed the two sounds that were at 192k in the first ambient cave event L"ambient.cave.cave2", // eSoundType_CAVE_CAVE2 - removed the two sounds
//that were at 192k in the first ambient cave event
#endif #endif
L"portal.portal", // eSoundType_PORTAL_PORTAL, L"portal.portal", // eSoundType_PORTAL_PORTAL,
// 4J-PB - added a couple that were still using std::wstring // 4J-PB - added a couple that were still using std::wstring
L"portal.trigger", // eSoundType_PORTAL_TRIGGER L"portal.trigger", // eSoundType_PORTAL_TRIGGER
L"portal.travel", // eSoundType_PORTAL_TRAVEL L"portal.travel", // eSoundType_PORTAL_TRAVEL
L"fire.ignite", // eSoundType_FIRE_IGNITE,
L"fire.fire", // eSoundType_FIRE_FIRE,
L"damage.hurtflesh", // eSoundType_DAMAGE_HURT,
L"damage.fallsmall", // eSoundType_DAMAGE_FALL_SMALL,
L"damage.fallbig", // eSoundType_DAMAGE_FALL_BIG,
L"note.harp", // eSoundType_NOTE_HARP,
L"note.bd", // eSoundType_NOTE_BD,
L"note.snare", // eSoundType_NOTE_SNARE,
L"note.hat", // eSoundType_NOTE_HAT,
L"note.bassattack", // eSoundType_NOTE_BASSATTACK,
L"tile.piston.in", // eSoundType_TILE_PISTON_IN,
L"tile.piston.out", // eSoundType_TILE_PISTON_OUT,
L"liquid.water", // eSoundType_LIQUID_WATER,
L"liquid.lavapop", // eSoundType_LIQUID_LAVA_POP,
L"liquid.lava", // eSoundType_LIQUID_LAVA,
L"step.stone", // eSoundType_STEP_STONE,
L"step.wood", // eSoundType_STEP_WOOD,
L"step.gravel", // eSoundType_STEP_GRAVEL,
L"step.grass", // eSoundType_STEP_GRASS,
L"step.metal", // eSoundType_STEP_METAL,
L"step.cloth", // eSoundType_STEP_CLOTH,
L"step.sand", // eSoundType_STEP_SAND,
// below this are the additional sounds from the second soundbank
L"mob.enderdragon.end", // eSoundType_MOB_ENDERDRAGON_END
L"mob.enderdragon.growl", // eSoundType_MOB_ENDERDRAGON_GROWL
L"mob.enderdragon.hit", // eSoundType_MOB_ENDERDRAGON_HIT
L"mob.enderdragon.wings", // eSoundType_MOB_ENDERDRAGON_MOVE
L"mob.irongolem.throw", // eSoundType_MOB_IRONGOLEM_THROW
L"mob.irongolem.hit", // eSoundType_MOB_IRONGOLEM_HIT
L"mob.irongolem.death", // eSoundType_MOB_IRONGOLEM_DEATH
L"mob.irongolem.walk", // eSoundType_MOB_IRONGOLEM_WALK
// TU14 L"fire.ignite", // eSoundType_FIRE_IGNITE,
L"damage.thorns", // eSoundType_DAMAGE_THORNS L"fire.fire", // eSoundType_FIRE_FIRE,
L"random.anvil_break", // eSoundType_RANDOM_ANVIL_BREAK L"damage.hurtflesh", // eSoundType_DAMAGE_HURT,
L"random.anvil_land", // eSoundType_RANDOM_ANVIL_LAND L"damage.fallsmall", // eSoundType_DAMAGE_FALL_SMALL,
L"random.anvil_use", // eSoundType_RANDOM_ANVIL_USE L"damage.fallbig", // eSoundType_DAMAGE_FALL_BIG,
L"mob.villager.haggle", // eSoundType_MOB_VILLAGER_HAGGLE L"note.harp", // eSoundType_NOTE_HARP,
L"mob.villager.idle", // eSoundType_MOB_VILLAGER_IDLE L"note.bd", // eSoundType_NOTE_BD,
L"mob.villager.hit", // eSoundType_MOB_VILLAGER_HIT L"note.snare", // eSoundType_NOTE_SNARE,
L"mob.villager.death", // eSoundType_MOB_VILLAGER_DEATH L"note.hat", // eSoundType_NOTE_HAT,
L"mob.villager.yes", // eSoundType_MOB_VILLAGER_YES L"note.bassattack", // eSoundType_NOTE_BASSATTACK,
L"mob.villager.no", // eSoundType_MOB_VILLAGER_NO L"tile.piston.in", // eSoundType_TILE_PISTON_IN,
L"mob.zombie.infect", // eSoundType_MOB_ZOMBIE_INFECT L"tile.piston.out", // eSoundType_TILE_PISTON_OUT,
L"mob.zombie.unfect", // eSoundType_MOB_ZOMBIE_UNFECT L"liquid.water", // eSoundType_LIQUID_WATER,
L"mob.zombie.remedy", // eSoundType_MOB_ZOMBIE_REMEDY L"liquid.lavapop", // eSoundType_LIQUID_LAVA_POP,
L"step.snow", // eSoundType_STEP_SNOW L"liquid.lava", // eSoundType_LIQUID_LAVA,
L"step.ladder", // eSoundType_STEP_LADDER L"step.stone", // eSoundType_STEP_STONE,
L"dig.cloth", // eSoundType_DIG_CLOTH L"step.wood", // eSoundType_STEP_WOOD,
L"dig.grass", // eSoundType_DIG_GRASS L"step.gravel", // eSoundType_STEP_GRAVEL,
L"dig.gravel", // eSoundType_DIG_GRAVEL L"step.grass", // eSoundType_STEP_GRASS,
L"dig.sand", // eSoundType_DIG_SAND L"step.metal", // eSoundType_STEP_METAL,
L"dig.snow", // eSoundType_DIG_SNOW L"step.cloth", // eSoundType_STEP_CLOTH,
L"dig.stone", // eSoundType_DIG_STONE L"step.sand", // eSoundType_STEP_SAND,
L"dig.wood", // eSoundType_DIG_WOOD
// below this are the additional sounds from the second soundbank
L"mob.enderdragon.end", // eSoundType_MOB_ENDERDRAGON_END
L"mob.enderdragon.growl", // eSoundType_MOB_ENDERDRAGON_GROWL
L"mob.enderdragon.hit", // eSoundType_MOB_ENDERDRAGON_HIT
L"mob.enderdragon.wings", // eSoundType_MOB_ENDERDRAGON_MOVE
L"mob.irongolem.throw", // eSoundType_MOB_IRONGOLEM_THROW
L"mob.irongolem.hit", // eSoundType_MOB_IRONGOLEM_HIT
L"mob.irongolem.death", // eSoundType_MOB_IRONGOLEM_DEATH
L"mob.irongolem.walk", // eSoundType_MOB_IRONGOLEM_WALK
// TU14
L"damage.thorns", // eSoundType_DAMAGE_THORNS
L"random.anvil_break", // eSoundType_RANDOM_ANVIL_BREAK
L"random.anvil_land", // eSoundType_RANDOM_ANVIL_LAND
L"random.anvil_use", // eSoundType_RANDOM_ANVIL_USE
L"mob.villager.haggle", // eSoundType_MOB_VILLAGER_HAGGLE
L"mob.villager.idle", // eSoundType_MOB_VILLAGER_IDLE
L"mob.villager.hit", // eSoundType_MOB_VILLAGER_HIT
L"mob.villager.death", // eSoundType_MOB_VILLAGER_DEATH
L"mob.villager.yes", // eSoundType_MOB_VILLAGER_YES
L"mob.villager.no", // eSoundType_MOB_VILLAGER_NO
L"mob.zombie.infect", // eSoundType_MOB_ZOMBIE_INFECT
L"mob.zombie.unfect", // eSoundType_MOB_ZOMBIE_UNFECT
L"mob.zombie.remedy", // eSoundType_MOB_ZOMBIE_REMEDY
L"step.snow", // eSoundType_STEP_SNOW
L"step.ladder", // eSoundType_STEP_LADDER
L"dig.cloth", // eSoundType_DIG_CLOTH
L"dig.grass", // eSoundType_DIG_GRASS
L"dig.gravel", // eSoundType_DIG_GRAVEL
L"dig.sand", // eSoundType_DIG_SAND
L"dig.snow", // eSoundType_DIG_SNOW
L"dig.stone", // eSoundType_DIG_STONE
L"dig.wood", // eSoundType_DIG_WOOD
}; };
const WCHAR* ConsoleSoundEngine::wchUISoundNames[eSFX_MAX] = {
const WCHAR *ConsoleSoundEngine::wchUISoundNames[eSFX_MAX]= L"back", L"craft", L"craftfail", L"focus", L"press", L"scroll",
{
L"back",
L"craft",
L"craftfail",
L"focus",
L"press",
L"scroll",
}; };