More changes to the RPG scoreboard

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index d26f661ccf0327861f15380553a69aa7f289bf9d..b09e2bf6acdd336b8e30888622876f3a16bd8076 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1480,7 +1480,10 @@ void Sbar_DrawScoreboard()
        // Print info string\r
        string str;\r
        float tl, fl, ll;\r
-       str = strcat("playing on ^2", shortmapname, "^7");\r
+       if(gametype == GAME_RPG)\r
+               str = strcat("you are in ^2", shortmapname, "^7");\r
+       else\r
+               str = strcat("playing on ^2", shortmapname, "^7");\r
        tl = getstatf(STAT_TIMELIMIT);\r
        fl = getstatf(STAT_FRAGLIMIT);\r
        ll = getstatf(STAT_LEADLIMIT);\r
@@ -1493,7 +1496,7 @@ void Sbar_DrawScoreboard()
        {\r
                if(tl > 0)\r
                        str = strcat(str, " for ^1", ftos(tl), " minutes^7");\r
-               if(fl > 0)\r
+               if(fl > 0 && !(gametype == GAME_RPG))\r
                {\r
                        if(tl > 0)\r
                                str = strcat(str, " or");\r

diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index 1fc113c63012310a70cf482145210de2ae0e8a47..e1d7b50ffe8403a93d229ae7e8b39a63214fa41c 100644 (file)
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -499,7 +499,7 @@ void PrintWelcomeMessage(entity pl)
        versionmessage = GetClientVersionMessage();\r
 \r
        s = strcat(s, NEWLINES, "This is Voretournament ", cvar_string("g_voretournamentversion"), "\n", versionmessage);\r
-       s = strcat(s, "^8\n\nmatch type is ^1", gamemode_name, "^8\n");\r
+       s = strcat(s, "^8\n\ngame type is ^1", gamemode_name, "^8\n");\r
 \r
        if(modifications != "")\r
                s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");\r