X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid_wgl.c;h=08f7cdd435feb24b747eddd0e964d4107ec10fac;hb=0fd6ba6decb661516e054a41e796eed450218df0;hp=9ce018a8146810931427c880e05c8e428d01fa5b;hpb=c2995f2c4c030b1c3adb163fd84b4ea5b3d2b104;p=xonotic%2Fdarkplaces.git diff --git a/vid_wgl.c b/vid_wgl.c index 9ce018a8..08f7cdd4 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -66,7 +66,7 @@ qboolean scr_skipupdate; static vmode_t modelist[MAX_MODE_LIST]; static int nummodes; -static vmode_t *pcurrentmode; +//static vmode_t *pcurrentmode; static vmode_t badmode; static DEVMODE gdevmode; @@ -97,8 +97,6 @@ HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow); viddef_t vid; // global video state -float gldepthmin, gldepthmax; - modestate_t modestate = MS_UNINIT; void VID_MenuDraw (void); @@ -251,16 +249,17 @@ qboolean VID_SetFullDIBMode (int modenum) int VID_SetMode (int modenum) { - int original_mode, temp; - qboolean stat; + int original_mode; + //int temp; + qboolean stat = 0; MSG msg; if ((windowed && (modenum != 0)) || (!windowed && (modenum < 1)) || (!windowed && (modenum >= nummodes))) Sys_Error ("Bad video mode\n"); // so Con_Printfs don't mess us up by forcing vid and snd updates - temp = scr_disabled_for_loading; - scr_disabled_for_loading = true; +// temp = scr_disabled_for_loading; +// scr_disabled_for_loading = true; CDAudio_Pause (); @@ -303,7 +302,7 @@ int VID_SetMode (int modenum) VID_UpdateWindowStatus (); CDAudio_Resume (); - scr_disabled_for_loading = temp; +// scr_disabled_for_loading = temp; if (!stat) Sys_Error ("Couldn't set video mode"); @@ -503,7 +502,7 @@ BOOL bSetupPixelFormat(HDC hDC) -byte scantokey[128] = +qbyte scantokey[128] = { // 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 ,27 ,'1' ,'2' ,'3' ,'4' ,'5' ,'6' ,'7' ,'8' ,'9' ,'0' ,'-' ,'=' ,K_BACKSPACE,9 , // 0 @@ -517,7 +516,7 @@ byte scantokey[128] = }; /* -byte shiftscantokey[128] = +qbyte shiftscantokey[128] = { // 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 ,27 ,'!' ,'@' ,'#' ,'$' ,'%' ,'^' ,'&' ,'*' ,'(' ,')' ,'_' ,'+' ,K_BACKSPACE,9 , // 0 @@ -1178,7 +1177,7 @@ void VID_InitFullDIB (HINSTANCE hInstance) Con_SafePrintf ("No fullscreen DIB modes found\n"); } -static int grabsysgamma = true; +//static int grabsysgamma = true; WORD systemgammaramps[3][256], currentgammaramps[3][256]; int VID_SetGamma(float prescale, float gamma, float scale, float base) @@ -1231,7 +1230,7 @@ void VID_Init (void) { int i; // int existingmode; - int basenummodes, width, height, bpp, findbpp, done; + int basenummodes, width, height = 0, bpp, findbpp, done; HDC hdc; DEVMODE devmode; @@ -1457,7 +1456,7 @@ extern void M_PrintWhite (int cx, int cy, char *str); extern void M_DrawCharacter (int cx, int line, int num); extern void M_DrawPic (int x, int y, char *picname); -static int vid_line, vid_wmodes; +static int vid_wmodes; typedef struct {