rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index b1417868d4904aba53c8bf8492234d15456921f9..5da80a2cae5672018f788f61793ab437b7ca476e 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -62,7 +62,6 @@ const char *gl_renderer;
 const char *gl_version;
 const char *gl_extensions;
 
-qboolean               DDActive;
 qboolean               scr_skipupdate;
 
 static vmode_t modelist[MAX_MODE_LIST];
@@ -94,8 +93,6 @@ unsigned char vid_curpal[256*3];
 HGLRC  baseRC;
 HDC            maindc;
 
-glvert_t glv;
-
 HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
 
 viddef_t       vid;                            // global video state
@@ -164,7 +161,7 @@ qboolean VID_SetWindowedMode (int modenum)
        height = rect.bottom - rect.top;
 
        // Create the DIB window
-       mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlaces", "DarkPlacesGL", WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
+       mainwindow = CreateWindowEx (ExWindowStyle, gamename, gamename, WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
 
        if (!mainwindow)
                Sys_Error ("Couldn't create DIB window");
@@ -181,8 +178,6 @@ qboolean VID_SetWindowedMode (int modenum)
                vid.conheight = modelist[modenum].height;
        if (vid.conwidth > modelist[modenum].width)
                vid.conwidth = modelist[modenum].width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
 
        SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
        SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
@@ -230,7 +225,7 @@ qboolean VID_SetFullDIBMode (int modenum)
        height = rect.bottom - rect.top;
 
        // Create the DIB window
-       mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlaces", "DarkPlacesGL", WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
+       mainwindow = CreateWindowEx (ExWindowStyle, gamename, gamename, WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
 
        if (!mainwindow)
                Sys_Error ("Couldn't create DIB window");
@@ -242,8 +237,6 @@ qboolean VID_SetFullDIBMode (int modenum)
                vid.conheight = modelist[modenum].height;
        if (vid.conwidth > modelist[modenum].width)
                vid.conwidth = modelist[modenum].width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
 
 // needed because we're not getting WM_MOVE messages fullscreen on NT
        window_x = 0;
@@ -279,7 +272,7 @@ int VID_SetMode (int modenum)
        // Set either the fullscreen or windowed mode
        if (modelist[modenum].type == MS_WINDOWED)
        {
-//             if (vid_mouse.value && key_dest == key_game)
+//             if (vid_mouse.integer && key_dest == key_game)
 //             {
 //                     stat = VID_SetWindowedMode(modenum);
 //                     usingmouse = true;
@@ -343,7 +336,7 @@ int VID_SetMode (int modenum)
        if (!msg_suppress_1)
                Con_SafePrintf ("Video mode %s initialized.\n", VID_GetModeDescription (vid_modenum));
 
-       vid.recalc_refdef = 1;
+//     vid.recalc_refdef = 1;
 
        return true;
 }
@@ -370,57 +363,6 @@ void VID_UpdateWindowStatus (void)
 
 //====================================
 
-void VID_CheckMultitexture(void) 
-{
-       qglMTexCoord2f = NULL;
-       qglSelectTexture = NULL;
-       gl_mtexable = false;
-       // Check to see if multitexture is disabled
-       if (COM_CheckParm("-nomtex"))
-       {
-               Con_Printf("...multitexture disabled\n");
-               return;
-       }
-       // Test for ARB_multitexture
-       if (!COM_CheckParm("-SGISmtex") && strstr(gl_extensions, "GL_ARB_multitexture "))
-       {
-               Con_Printf("...using GL_ARB_multitexture\n");
-               qglMTexCoord2f = (void *) wglGetProcAddress("glMultiTexCoord2fARB");
-               qglSelectTexture = (void *) wglGetProcAddress("glActiveTextureARB");
-               gl_mtexable = true;
-               gl_mtex_enum = GL_TEXTURE0_ARB;
-       }
-       else if (strstr(gl_extensions, "GL_SGIS_multitexture ")) // Test for SGIS_multitexture (if ARB_multitexture not found)
-       {
-               Con_Printf("...using GL_SGIS_multitexture\n");
-               qglMTexCoord2f = (void *) wglGetProcAddress("glMTexCoord2fSGIS");
-               qglSelectTexture = (void *) wglGetProcAddress("glSelectTextureSGIS");
-               gl_mtexable = true;
-               gl_mtex_enum = TEXTURE0_SGIS;
-       }
-       else
-               Con_Printf("...multitexture disabled (not detected)\n");
-}
-
-void VID_CheckCVA(void)
-{
-       qglLockArraysEXT = NULL;
-       qglUnlockArraysEXT = NULL;
-       gl_supportslockarrays = false;
-       if (COM_CheckParm("-nocva"))
-       {
-               Con_Printf("...compiled vertex arrays disabled\n");
-               return;
-       }
-       if (strstr(gl_extensions, "GL_EXT_compiled_vertex_array"))
-       {
-               Con_Printf("...using compiled vertex arrays\n");
-               qglLockArraysEXT = (void *) wglGetProcAddress("glLockArraysEXT");
-               qglUnlockArraysEXT = (void *) wglGetProcAddress("glUnlockArraysEXT");
-               gl_supportslockarrays = true;
-       }
-}
-
 /*
 =================
 GL_BeginRendering
@@ -443,12 +385,12 @@ void GL_BeginRendering (int *x, int *y, int *width, int *height)
 void GL_EndRendering (void)
 {
        int usemouse;
-       if (r_render.value && !scr_skipupdate)
+       if (r_render.integer && !scr_skipupdate)
                SwapBuffers(maindc);
 
 // handle the mouse state when windowed if that's changed
        usemouse = false;
-       if (vid_mouse.value && key_dest == key_game)
+       if (vid_mouse.integer && key_dest == key_game)
                usemouse = true;
        if (modestate == MS_FULLDIB)
                usemouse = true;
@@ -639,6 +581,7 @@ void ClearAllStates (void)
 }
 
 void VID_RestoreGameGamma(void);
+extern qboolean host_loopactive;
 
 void AppActivate(BOOL fActive, BOOL minimize)
 /****************************************************************************
@@ -686,13 +629,14 @@ void AppActivate(BOOL fActive, BOOL minimize)
                        // LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers
                        MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
                }
-//             else if ((modestate == MS_WINDOWED) && vid_mouse.value && key_dest == key_game)
+//             else if ((modestate == MS_WINDOWED) && vid_mouse.integer && key_dest == key_game)
 //             {
 //                     usingmouse = true;
 //                     IN_ActivateMouse ();
 //                     IN_HideMouse ();
 //             }
-               VID_RestoreGameGamma();
+               if (host_loopactive)
+                       VID_RestoreGameGamma();
        }
 
        if (!fActive)
@@ -711,7 +655,7 @@ void AppActivate(BOOL fActive, BOOL minimize)
                                vid_wassuspended = true;
                        }
                }
-//             else if ((modestate == MS_WINDOWED) && vid_mouse.value)
+//             else if ((modestate == MS_WINDOWED) && vid_mouse.integer)
 //             {
 //                     usingmouse = false;
 //                     IN_DeactivateMouse ();
@@ -724,11 +668,7 @@ void AppActivate(BOOL fActive, BOOL minimize)
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* main window procedure */
-LONG WINAPI MainWndProc (
-    HWND    hWnd,
-    UINT    uMsg,
-    WPARAM  wParam,
-    LPARAM  lParam)
+LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
     LONG    lRet = 1;
        int             fActive, fMinimized, temp;
@@ -1044,7 +984,7 @@ void VID_InitDIB (HINSTANCE hInstance)
     wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
        wc.hbrBackground = NULL;
     wc.lpszMenuName  = 0;
-    wc.lpszClassName = "DarkPlaces";
+    wc.lpszClassName = gamename;
 
     if (!RegisterClass (&wc) )
                Sys_Error ("Couldn't register window class");