From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 10 Sep 2010 12:08:41 +0000 (+0300)
Subject: More changes to the RPG scoreboard
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=167edbb838b51f3e554af040cd32a2b0b981009a;p=voretournament%2Fvoretournament.git

More changes to the RPG scoreboard
---

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index d26f661c..b09e2bf6 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1480,7 +1480,10 @@ void Sbar_DrawScoreboard()
 	// Print info string
 	string str;
 	float tl, fl, ll;
-	str = strcat("playing on ^2", shortmapname, "^7");
+	if(gametype == GAME_RPG)
+		str = strcat("you are in ^2", shortmapname, "^7");
+	else
+		str = strcat("playing on ^2", shortmapname, "^7");
 	tl = getstatf(STAT_TIMELIMIT);
 	fl = getstatf(STAT_FRAGLIMIT);
 	ll = getstatf(STAT_LEADLIMIT);
@@ -1493,7 +1496,7 @@ void Sbar_DrawScoreboard()
 	{
 		if(tl > 0)
 			str = strcat(str, " for ^1", ftos(tl), " minutes^7");
-		if(fl > 0)
+		if(fl > 0 && !(gametype == GAME_RPG))
 		{
 			if(tl > 0)
 				str = strcat(str, " or");
diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index 1fc113c6..e1d7b50f 100644
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -499,7 +499,7 @@ void PrintWelcomeMessage(entity pl)
 	versionmessage = GetClientVersionMessage();
 
 	s = strcat(s, NEWLINES, "This is Voretournament ", cvar_string("g_voretournamentversion"), "\n", versionmessage);
-	s = strcat(s, "^8\n\nmatch type is ^1", gamemode_name, "^8\n");
+	s = strcat(s, "^8\n\ngame type is ^1", gamemode_name, "^8\n");
 
 	if(modifications != "")
 		s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");