summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/i_oplmusic.c6
-rw-r--r--src/i_sound.c4
-rw-r--r--src/i_sound.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/i_oplmusic.c b/src/i_oplmusic.c
index c3e4df27..ae102982 100644
--- a/src/i_oplmusic.c
+++ b/src/i_oplmusic.c
@@ -297,7 +297,7 @@ static const unsigned int volume_mapping_table[] = {
124, 124, 125, 125, 126, 126, 127, 127
};
-opl_driver_ver opl_drv_ver = opl_v_new;
+opl_driver_ver_t opl_drv_ver = opl_v_new;
static boolean music_initialized = false;
//static boolean musicpaused = false;
@@ -534,8 +534,8 @@ static void SetVoiceInstrument(opl_voice_t *voice,
// Calculate voice priority.
- voice->priority = 0x0f - (data->carrier.attack>>4)
- + 0x0f - (data->carrier.sustain & 0x0f);
+ voice->priority = 0x0f - (data->carrier.attack >> 4)
+ + 0x0f - (data->carrier.sustain & 0x0f);
}
static void SetVoiceVolume(opl_voice_t *voice, unsigned int volume)
diff --git a/src/i_sound.c b/src/i_sound.c
index eac21307..6763fa37 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -66,7 +66,7 @@ extern music_module_t music_opl_module;
// For OPL module:
-extern opl_driver_ver opl_drv_ver;
+extern opl_driver_ver_t opl_drv_ver;
extern int opl_io_port;
// For native music module:
@@ -473,7 +473,7 @@ void I_BindSoundVariables(void)
#endif
}
-void I_SetOPLDriverVer(opl_driver_ver ver)
+void I_SetOPLDriverVer(opl_driver_ver_t ver)
{
opl_drv_ver = ver;
}
diff --git a/src/i_sound.h b/src/i_sound.h
index 0808ac87..a240c48b 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -237,9 +237,9 @@ void I_BindSoundVariables(void);
typedef enum {
opl_v_old, // hexen heretic
opl_v_new // doom strife
-} opl_driver_ver;
+} opl_driver_ver_t;
-void I_SetOPLDriverVer(opl_driver_ver ver);
+void I_SetOPLDriverVer(opl_driver_ver_t ver);
#endif