renamed VID_Open to VID_Start, inlined VID_Close ito eliminate the only call to it
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 6 May 2005 20:00:53 +0000 (20:00 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 6 May 2005 20:00:53 +0000 (20:00 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5239 d7cf8633-e32d-0410-b094-e92efae38249

host.c
vid.h
vid_shared.c

diff --git a/host.c b/host.c
index 8d3389f..fc4d869 100644 (file)
--- a/host.c
+++ b/host.c
@@ -868,11 +868,10 @@ void Host_StartVideo(void)
        if (!vid_opened && cls.state != ca_dedicated)
        {
                vid_opened = true;
-               VID_Open();
+               VID_Start();
                CDAudio_Startup();
                CL_InitTEnts();  // We must wait after sound startup to load tent sounds
                MR_Init();
-               SCR_BeginLoadingPlaque();
        }
 }
 
diff --git a/vid.h b/vid.h
index cd4a04e..e8cb35a 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -140,8 +140,7 @@ void VID_Finish (void);
 
 void VID_Restart_f(void);
 
-void VID_Open (void);
-void VID_Close (void);
+void VID_Start(void);
 
 #endif
 
index a2dfc9a..849313b 100644 (file)
@@ -1033,7 +1033,8 @@ void VID_Restart_f(void)
        Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp, to %s %dx%dx%dbpp.\n",
                current_vid_fullscreen ? "fullscreen" : "window", current_vid_width, current_vid_height, current_vid_bitsperpixel,
                vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer);
-       VID_Close();
+       VID_CloseSystems();
+       VID_Shutdown();
        if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer))
        {
                Con_Print("Video mode change failed\n");
@@ -1043,7 +1044,8 @@ void VID_Restart_f(void)
        VID_OpenSystems();
 }
 
-void VID_Open(void)
+// this is only called once by Host_StartVideo
+void VID_Start(void)
 {
        int i, width, height, success;
        if (vid_commandlinecheck)
@@ -1094,9 +1096,3 @@ void VID_Open(void)
        VID_OpenSystems();
 }
 
-void VID_Close(void)
-{
-       VID_CloseSystems();
-       VID_Shutdown();
-}
-