screen: rename screen_common.c back to screen.c

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>

Makefile

@@ -481,7 +481,7 @@ CL_OBJS := \
 	r_model.o	\
 	r_part.o	\
 	sbar.o		\
-	screen_common.o	\
+	screen.o	\
 	snd_dma.o	\
 	snd_mem.o	\
 	snd_mix.o	\
@@ -544,8 +544,7 @@ SW_OBJS := \
 	r_sky.o		\
 	r_sprite.o	\
 	r_surf.o	\
-	r_vars.o	\
-	screen.o
+	r_vars.o
 
 GL_OBJS := \
 	drawhulls.o	\
@@ -555,7 +554,6 @@ GL_OBJS := \
 	gl_rmain.o	\
 	gl_rmisc.o	\
 	gl_rsurf.o	\
-	gl_screen.o	\
 	gl_warp.o
 
 NQSW_OBJS :=

common/gl_screen.c

@@ -1,42 +0,0 @@
-/*
-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 the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-// screen.c -- master for refresh, status bar, console, chat, notify, etc
-
-#include "client.h"
-#include "cmd.h"
-#include "console.h"
-#include "draw.h"
-#include "glquake.h"
-#include "keys.h"
-#include "menu.h"
-#include "quakedef.h"
-#include "sbar.h"
-#include "screen.h"
-#include "sound.h"
-#include "sys.h"
-#include "vid.h"
-#include "view.h"
-#include "wad.h"
-
-#ifdef NQ_HACK
-#include "host.h"
-#endif
-