X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cd_win.c;h=ec94e560831e9d3b0ef38faed905c2f50d478536;hb=477b95bb0bd3ee638ceefd2fc3251a43ff4212d0;hp=2cc716133e12c7c4a77df297d06df6f6cf9b9235;hpb=d1a66b1504773e5da10463fd15d524697b0c2ba2;p=xonotic%2Fdarkplaces.git diff --git a/cd_win.c b/cd_win.c index 2cc71613..ec94e560 100644 --- a/cd_win.c +++ b/cd_win.c @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cdaudio.h" -#if _MSC_VER < 1300 +#if defined(_MSC_VER) && (_MSC_VER < 1300) typedef DWORD DWORD_PTR; #endif @@ -93,13 +93,13 @@ float CDAudio_SysGetVolume (void) } -void CDAudio_SysSetVolume (float volume) +void CDAudio_SysSetVolume (float fvolume) { // IMPLEMENTME } -int CDAudio_SysPlay (unsigned char track) +int CDAudio_SysPlay (int track) { DWORD dwReturn; MCI_PLAY_PARMS mciPlayParms; @@ -218,7 +218,7 @@ LONG CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; default: - Con_Printf("Unexpected MM_MCINOTIFY type (%i)\n", wParam); + Con_Printf("Unexpected MM_MCINOTIFY type (%i)\n", (int)wParam); return 1; }