diff --git a/common/sbar.c b/common/sbar.c index 7e3c4b1..3bf52ed 100644 --- a/common/sbar.c +++ b/common/sbar.c @@ -100,20 +100,6 @@ void Sbar_MiniDeathmatchOverlay (void); static qboolean largegame = false; #endif -/* - Sbar_Items - - Return a target-independant items list -int -Sbar_Items ( void ) -{ -#ifdef QUAKEWORLD - return cl.stats[STAT_ITEMS]; -#else - return cl.items; -#endif // QUAKEWORLD -} -*/ /* =============== Sbar_ShowScores @@ -1210,9 +1196,11 @@ void Sbar_Draw (void) char st[512]; #endif - headsup = !(cl_sbar->value || scr_viewsize->value<100); - if ((sb_updates >= vid.numpages) && !headsup) - return; + headsup = !(cl_sbar->value || rogue || hipnotic + || scr_viewsize->value<100); + +// if ((sb_updates >= vid.numpages) && !headsup) +// return; if (scr_con_current == vid.height) return; // console is full screen @@ -1220,15 +1208,6 @@ void Sbar_Draw (void) if (!headsup && sb_lines && vid.width > 320) Draw_TileClear (0, vid.height - sb_lines, vid.width, sb_lines); -#ifdef UQUAKE - if (sb_lines > 24) - { - Sbar_DrawInventory (); - if (cl.maxclients != 1) - Sbar_DrawFrags (); - } -#endif // !QUAKEWORLD - scr_copyeverything = 1; sb_updates++; diff --git a/uquake/sv_phys.c b/uquake/sv_phys.c index e1530b6..0d4b252 100644 --- a/uquake/sv_phys.c +++ b/uquake/sv_phys.c @@ -47,15 +47,10 @@ solid_edge items only clip against bsp models. */ -//cvar_t sv_friction = {"sv_friction","4",CVAR_USERINFO|CVAR_SERVERINFO}; cvar_t *sv_friction; -//cvar_t sv_stopspeed = {"sv_stopspeed","100"}; cvar_t *sv_stopspeed; -//cvar_t sv_gravity = {"sv_gravity","800",CVAR_USERINFO|CVAR_SERVERINFO}; cvar_t *sv_gravity; -//cvar_t sv_maxvelocity = {"sv_maxvelocity","2000"}; cvar_t *sv_maxvelocity; -//cvar_t sv_nostep = {"sv_nostep","0"}; cvar_t *sv_nostep; #ifdef QUAKE2