From 1b430471290d5c0a938a6936c3174ab5dab5e804 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 6 May 2005 20:00:53 +0000 Subject: [PATCH] renamed VID_Open to VID_Start, inlined VID_Close ito eliminate the only call to it git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5239 d7cf8633-e32d-0410-b094-e92efae38249 --- host.c | 3 +-- vid.h | 3 +-- vid_shared.c | 12 ++++-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/host.c b/host.c index 8d3389ff..fc4d8696 100644 --- 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 cd4a04ef..e8cb35a5 100644 --- 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 diff --git a/vid_shared.c b/vid_shared.c index a2dfc9a6..849313b8 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -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(); -} - -- 2.39.2