ref: 270a249e5e1d15a17c2f7b91c7cf53e28d342229
parent: e62bc4cee05ddb2d2fcf0f04aee90c9158188ca6
author: khokh2001 <alexeytf2@gmail.com>
date: Mon Mar 9 22:05:33 EDT 2015
OPL code guideline style fix
--- a/src/i_oplmusic.c
+++ b/src/i_oplmusic.c
@@ -297,7 +297,7 @@
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 @@
// 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)
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -66,7 +66,7 @@
// 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 @@
#endif
}
-void I_SetOPLDriverVer(opl_driver_ver ver)
+void I_SetOPLDriverVer(opl_driver_ver_t ver)
{opl_drv_ver = ver;
}
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -237,9 +237,9 @@
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