Fixed 2 warnings found by MSVC6

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3601 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cd_win.c b/cd_win.c
index 52bcf13d89327a4e4bc1c972d89b108afed350c6..e3359487ff4365be89808dde7d0da11ee3d4e802 100644 (file)
--- a/cd_win.c
+++ b/cd_win.c
@@ -360,7 +360,7 @@ static void CD_f (void)
 
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

-       if (lParam != wDeviceID)
+       if (lParam != (LPARAM)wDeviceID)

                return 1;
 
        switch (wParam)
                return 1;
 
        switch (wParam)

diff --git a/vid_wgl.c b/vid_wgl.c
index d7f8f946d57f35232dd0acf19e12dd4d847b4d32..2f98be1f892a09de617dceec9834be36167f3ee6 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -547,7 +547,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                        vkey = MapKey(lParam, wParam);
                        GetKeyboardState (state);
                        ToAscii (wParam, vkey, state, &ascchar, 0);
                        vkey = MapKey(lParam, wParam);
                        GetKeyboardState (state);
                        ToAscii (wParam, vkey, state, &ascchar, 0);

-                       Key_Event (vkey, ascchar & 0xFF, down);
+                       Key_Event (vkey, (char)(ascchar & 0xFF), down);

                        break;
 
                case WM_SYSCHAR:
                        break;
 
                case WM_SYSCHAR: