From a0ab26ff6b169b2b5f81844080e61854a502f7db Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Apr 2001 07:47:49 +0000
Subject: [PATCH] merge screen.h

---
 {nq/include => include/QF}/screen.h | 18 ++++----
 qw/include/screen.h                 | 65 -----------------------------
 2 files changed, 9 insertions(+), 74 deletions(-)
 rename {nq/include => include/QF}/screen.h (88%)
 delete mode 100644 qw/include/screen.h

diff --git a/nq/include/screen.h b/include/QF/screen.h
similarity index 88%
rename from nq/include/screen.h
rename to include/QF/screen.h
index 28eab996a..b55c74dff 100644
--- a/nq/include/screen.h
+++ b/include/QF/screen.h
@@ -1,7 +1,7 @@
 /*
 	screen.h
 
-	@description@
+	(description)
 
 	Copyright (C) 1996-1997  Id Software, Inc.
 
@@ -25,6 +25,7 @@
 
 	$Id$
 */
+// screen.h
 
 #ifndef __screen_h
 #define __screen_h
@@ -32,11 +33,11 @@
 #include "QF/qtypes.h"
 #include "QF/cvar.h"
 
+void SCR_Init_Cvars (void);
 void SCR_Init (void);
-void SCR_InitCvars (void);
 
 void SCR_UpdateScreen (void);
-
+void SCR_UpdateWholeScreen (void);
 
 void SCR_SizeUp (void);
 void SCR_SizeDown (void);
@@ -58,16 +59,15 @@ extern	int			clearnotify;	// set to 0 whenever notify text is drawn
 extern	qboolean	scr_disabled_for_loading;
 extern	qboolean	scr_skipupdate;
 
-extern	cvar_t	*scr_viewsize;
-extern	cvar_t	*scr_fov;
-extern	cvar_t	*scr_viewsize;
+extern cvar_t		*scr_viewsize;
+extern cvar_t		*scr_fov;
+extern cvar_t		*scr_viewsize;
+extern cvar_t		*scr_consize;
 
 // only the refresh window will be updated unless these variables are flagged 
 extern	int			scr_copytop;
 extern	int			scr_copyeverything;
 
-extern qboolean		block_drawing;
-
-void SCR_UpdateWholeScreen (void);
+extern qboolean        block_drawing;
 
 #endif // __screen_h
diff --git a/qw/include/screen.h b/qw/include/screen.h
deleted file mode 100644
index b1995da75..000000000
--- a/qw/include/screen.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-	screen.h
-
-	(description)
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-	$Id$
-*/
-// screen.h
-
-#ifndef _SCREEN_H
-#define _SCREEN_H
-
-#include "QF/cvar.h"
-
-void SCR_Init_Cvars (void);
-void SCR_Init (void);
-
-void SCR_UpdateScreen (void);
-void SCR_UpdateWholeScreen (void);
-
-void SCR_SizeUp (void);
-void SCR_SizeDown (void);
-void SCR_CenterPrint (char *str);
-
-extern	float		scr_con_current;
-extern	float		scr_conlines;		// lines of console to display
-
-extern	int			scr_fullupdate;	// set to 0 to force full redraw
-extern	int			sb_lines;
-
-extern	int			clearnotify;	// set to 0 whenever notify text is drawn
-extern	qboolean	scr_disabled_for_loading;
-
-extern cvar_t		*scr_viewsize;
-extern cvar_t		*scr_consize;
-
-// only the refresh window will be updated unless these variables are flagged 
-extern	int			scr_copytop;
-extern	int			scr_copyeverything;
-
-extern qboolean        scr_skipupdate;
-
-extern qboolean        block_drawing;
-
-#endif // _SCREEN_H