From 815acba79ba17ee4cc19b332346649b35053ec43 Mon Sep 17 00:00:00 2001 From: black Date: Wed, 2 Feb 2005 20:54:45 +0000 Subject: [PATCH] FCVS: ---------------------------------------------------------------------- -Changed the scoreboard for nexuiz (only). -Fixed a bug in the old quake menu. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4989 d7cf8633-e32d-0410-b094-e92efae38249 --- menu.c | 3 ++- sbar.c | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/menu.c b/menu.c index 2781af43..cc78744e 100644 --- a/menu.c +++ b/menu.c @@ -3902,7 +3902,8 @@ void M_ServerList_Key(int k, char ascii) case K_ENTER: S_LocalSound ("sound/misc/menu2.wav"); - Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname)); + if (hostcache_viewcount) + Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname)); break; default: diff --git a/sbar.c b/sbar.c index 5e5ffd83..acc7f526 100644 --- a/sbar.c +++ b/sbar.c @@ -477,11 +477,13 @@ void Sbar_SoloScoreboard (void) int minutes, seconds, tens, units; int l; - sprintf (str,"Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]); - Sbar_DrawString (8, 4, str); + if (gamemode != GAME_NEXUIZ) { + sprintf (str,"Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]); + Sbar_DrawString (8, 4, str); - sprintf (str,"Secrets :%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]); - Sbar_DrawString (8, 12, str); + sprintf (str,"Secrets :%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]); + Sbar_DrawString (8, 12, str); + } // time minutes = cl.time / 60; @@ -492,8 +494,13 @@ void Sbar_SoloScoreboard (void) Sbar_DrawString (184, 4, str); // draw level name - l = strlen (cl.levelname); - Sbar_DrawString (232 - l*4, 12, cl.levelname); + if (gamemode == GAME_NEXUIZ) { + l = strlen (cl.worldmodel->name); + Sbar_DrawString (232 - l*4, 12, cl.worldmodel->name); + } else { + l = strlen (cl.levelname); + Sbar_DrawString (232 - l*4, 12, cl.levelname); + } } /* -- 2.39.2