summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-26 14:39:10 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-26 14:50:21 +0200
commit8fb71e2555f2f1744f00f85e1fdb8f54503712f0 (patch)
tree9c7cb0bfc356d1627397e90148da57de6268d73e
parentAudio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode (diff)
downloadre3-8fb71e2555f2f1744f00f85e1fdb8f54503712f0.tar
re3-8fb71e2555f2f1744f00f85e1fdb8f54503712f0.tar.gz
re3-8fb71e2555f2f1744f00f85e1fdb8f54503712f0.tar.bz2
re3-8fb71e2555f2f1744f00f85e1fdb8f54503712f0.tar.lz
re3-8fb71e2555f2f1744f00f85e1fdb8f54503712f0.tar.xz
re3-8fb71e2555f2f1744f00f85e1fdb8f54503712f0.tar.zst
re3-8fb71e2555f2f1744f00f85e1fdb8f54503712f0.zip
-rw-r--r--src/audio/DMAudio.h2
-rw-r--r--src/audio/MusicManager.h2
-rw-r--r--src/audio/audio_enums.h (renamed from src/audio/audio.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 4111f64f..a6910b58 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -1,6 +1,6 @@
#pragma once
-#include "audio.h"
+#include "audio_enums.h"
#include "Wanted.h"
enum eSound : int16
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 7753d638..709fe56a 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -1,6 +1,6 @@
#pragma once
-#include "audio.h"
+#include "audio_enums.h"
class tMP3Sample
{
diff --git a/src/audio/audio.h b/src/audio/audio_enums.h
index 55bc5b70..55bc5b70 100644
--- a/src/audio/audio.h
+++ b/src/audio/audio_enums.h