Merge branch 'master' into SQC-15_online

This commit is contained in:
MarcEricMartel 2023-12-14 19:17:37 -05:00
commit 8e77565bb4
4 changed files with 1 additions and 1 deletions

Binary file not shown.

View File

@ -88,7 +88,7 @@ private:
char SimulateKeyboard(unsigned char key); char SimulateKeyboard(unsigned char key);
void HandlePlayerInput(float elapsedTime); 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_powpow, * m_scream;
irrklang::ISound* m_whoosh[MAX_BULLETS]; irrklang::ISound* m_whoosh[MAX_BULLETS];

Binary file not shown.