Merge branch 'master' into SQC-15_online
This commit is contained in:
commit
8e77565bb4
Binary file not shown.
@ -88,7 +88,7 @@ private:
|
||||
char SimulateKeyboard(unsigned char key);
|
||||
void HandlePlayerInput(float elapsedTime);
|
||||
|
||||
Audio m_audio = Audio(AUDIO_PATH "music01.wav", AUDIO_PATH "menumusic01.mp3");
|
||||
Audio m_audio = Audio(AUDIO_PATH "music01.wav", AUDIO_PATH "menumusic01.wav");
|
||||
irrklang::ISound* m_powpow, * m_scream;
|
||||
irrklang::ISound* m_whoosh[MAX_BULLETS];
|
||||
|
||||
|
Binary file not shown.
BIN
SQCSim2021/media/audio/menumusic01.wav
Normal file
BIN
SQCSim2021/media/audio/menumusic01.wav
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user