[client] Merge sbar into hud

This cleans up a lot of the twisted code between the two files. With the
rewrite of hud/sbar last year, there's really no separation between the
two.

include/Makemodule.am

@@ -89,7 +89,6 @@ EXTRA_DIST += \
 	include/client/input.h \
 	include/client/locs.h \
 	include/client/particles.h \
-	include/client/sbar.h \
 	include/client/screen.h \
 	include/client/state.h \
 	include/client/temp_entities.h \

include/client/hud.h

@@ -49,8 +49,34 @@ struct ecs_registry_s;
 struct canvas_system_s;
 
 void HUD_Init (struct ecs_registry_s *reg);
-void HUD_Init_Cvars (void);
 void HUD_CreateCanvas (struct canvas_system_s canvas_sys);
-void HUD_Calc_sb_lines (int view_size);
+
+extern bool sbar_showscores;
+
+struct player_info_s;
+void Sbar_Init (int *stats, float *item_gettime);
+void Sbar_SetPlayers (struct player_info_s *players, int maxplayers);
+void Sbar_SetLevelName (const char *levelname, const char *servername);
+void Sbar_SetPlayerNum (int playernum, int spectator);
+void Sbar_SetAutotrack (int autotrack);
+void Sbar_SetViewEntity (int viewentity);
+void Sbar_SetTeamplay (int teamplay);
+void Sbar_SetGameType (int gametype);
+void Sbar_SetActive (int active);
+
+void Sbar_Update (double time);
+void Sbar_UpdatePings (void);
+void Sbar_UpdatePL (int pl);
+void Sbar_UpdateFrags (int playernum);
+void Sbar_UpdateInfo (int playernum);
+void Sbar_UpdateStats (int stat);
+void Sbar_Damage (double time);
+
+void Sbar_Intermission (int mode, double completed_time);
+
+void Sbar_DrawCenterPrint (void);
+void Sbar_CenterPrint (const char *str);
+
+void Sbar_LogFrags (double time);
 
 #endif//__client_hud_h

include/client/sbar.h

@@ -1,62 +0,0 @@
-/*
-	sbar.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
-
-*/
-
-// the status bar is redrawn only if something has changed, but if anything
-// does, the entire thing will be redrawn for the next vid.numpages frames.
-
-#ifndef __client_sbar_h
-#define __client_sbar_h
-
-extern bool sbar_showscores;
-
-struct player_info_s;
-void Sbar_Init (int *stats, float *item_gettime);
-void Sbar_SetPlayers (struct player_info_s *players, int maxplayers);
-void Sbar_SetLevelName (const char *levelname, const char *servername);
-void Sbar_SetPlayerNum (int playernum, int spectator);
-void Sbar_SetAutotrack (int autotrack);
-void Sbar_SetViewEntity (int viewentity);
-void Sbar_SetTeamplay (int teamplay);
-void Sbar_SetGameType (int gametype);
-void Sbar_SetActive (int active);
-
-void Sbar_Update (double time);
-void Sbar_UpdatePings (void);
-void Sbar_UpdatePL (int pl);
-void Sbar_UpdateFrags (int playernum);
-void Sbar_UpdateInfo (int playernum);
-void Sbar_UpdateStats (int stat);
-void Sbar_Damage (double time);
-
-void Sbar_Intermission (int mode, double completed_time);
-
-void Sbar_DrawCenterPrint (void);
-void Sbar_CenterPrint (const char *str);
-
-void Sbar_LogFrags (double time);
-
-#endif//__client_sbar_h

libs/client/Makemodule.am

@@ -26,8 +26,7 @@ libs_client_libQFclient_la_SOURCES= \
 		libs/client/cl_world.c \
 		libs/client/hud.c \
 		libs/client/locs.c \
-		libs/client/old_keys.c \
-		libs/client/sbar.c
+		libs/client/old_keys.c
 
 default_input_src = libs/client/default_input.plist
 default_input_gen = libs/client/default_input.plc

libs/client/cl_screen.c

@@ -55,7 +55,6 @@
 #include "r_local.h"	//FIXME for r_cache_thrash
 
 #include "client/hud.h"
-#include "client/sbar.h"
 #include "client/screen.h"
 #include "client/view.h"
 #include "client/world.h"

nq/source/cl_main.c

@@ -61,7 +61,7 @@
 #include "client/chase.h"
 #include "client/effects.h"
 #include "client/particles.h"
-#include "client/sbar.h"
+#include "client/hud.h"
 #include "client/screen.h"
 #include "client/temp_entities.h"
 #include "client/world.h"

nq/source/cl_parse.c

@@ -57,7 +57,7 @@
 #include "QF/scene/entity.h"
 
 #include "client/particles.h"
-#include "client/sbar.h"
+#include "client/hud.h"
 #include "client/temp_entities.h"
 #include "client/world.h"
 

qw/source/cl_cam.c

@@ -47,7 +47,7 @@
 
 #include "compat.h"
 
-#include "client/sbar.h"
+#include "client/hud.h"
 
 #include "qw/include/cl_cam.h"
 #include "qw/include/cl_input.h"

qw/source/cl_main.c

@@ -99,7 +99,7 @@
 
 #include "client/effects.h"
 #include "client/particles.h"
-#include "client/sbar.h"
+#include "client/hud.h"
 #include "client/screen.h"
 #include "client/temp_entities.h"
 #include "client/view.h"

qw/source/cl_ngraph.c

@@ -50,7 +50,7 @@
 
 #include "qw/include/cl_parse.h"
 #include "qw/include/client.h"
-#include "client/sbar.h"
+#include "client/hud.h"
 
 int cl_netgraph;
 static cvar_t cl_netgraph_cvar = {

qw/source/cl_parse.c

@@ -67,7 +67,7 @@
 
 #include "client/effects.h"
 #include "client/particles.h"
-#include "client/sbar.h"
+#include "client/hud.h"
 #include "client/screen.h"
 #include "client/temp_entities.h"
 #include "client/view.h"