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

diff --git a/menu.c b/menu.c
index 2781af4317a4abcad0d3161900789531e7b5f8d3..cc78744e127a4336970b74ac9c4d1a9c3cf223a7 100644 (file)
--- 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 5e5ffd838aaaf6660fbf57257844868af36c75ad..acc7f52677df303884c9f3038f671250d128ab48 100644 (file)
--- 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);
+       }
 }
 
 /*