X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cd_win.c;h=76ac51edec3ca461dd9db7b54e61131c4f36454c;hb=438bc57b1be1f24b067056c8d26c1cf9e0cab26b;hp=495fe02091dd97e6cc5ac341e26868db9940a87e;hpb=a19dce25671ecfa28e4eb3861f8636750bf3ba68;p=xonotic%2Fdarkplaces.git diff --git a/cd_win.c b/cd_win.c index 495fe020..76ac51ed 100644 --- a/cd_win.c +++ b/cd_win.c @@ -20,13 +20,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All // rights reserved. +#include "quakedef.h" #include #include -#include "quakedef.h" #include "cdaudio.h" -#if _MSC_VER < 1300 +#if defined(_MSC_VER) && (_MSC_VER < 1300) typedef DWORD DWORD_PTR; #endif @@ -99,7 +99,7 @@ void CDAudio_SysSetVolume (float volume) } -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; }