r2007 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-12-08 03:03:11 -0500 (Fri, 08 Dec 2006)
New Revision: 2007

Modified:
   trunk/data/default.cfg
   trunk/data/qcsrc/server/clientcommands.qc
Log:
chat width is 100% again; voting in chat area


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2006-12-08 07:20:50 UTC (rev 2006)
+++ trunk/data/default.cfg	2006-12-08 08:03:11 UTC (rev 2007)
@@ -782,4 +782,4 @@
 
 alias teamstatus "set _scoreboard 1"
 
-con_chatwidth 0.55
+con_chatwidth 1.0

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2006-12-08 07:20:50 UTC (rev 2006)
+++ trunk/data/qcsrc/server/clientcommands.qc	2006-12-08 08:03:11 UTC (rev 2007)
@@ -178,7 +178,8 @@
 						votefinished = time + cvar("sv_vote_timeout");
 						votecaller.vote_vote = 1; // of course you vote yes
 						votecaller.vote_next = time + cvar("sv_vote_wait");
-						bprint(strcat("^3Vote for \"^1", votecalledvote, "^3\" called by \"^7", votecaller.netname, "^3\".\n"));
+						// bprint(strcat("^3Vote for \"^1", votecalledvote, "^3\" called by \"^7", votecaller.netname, "^3\".\n"));
+						bprint(strcat("\{1}^3* ^7", votecaller.netname, "^3 calls a vote for ^1", votecalledvote, "\n"));
 						VoteCount(); // needed if you are the only one
 					} else {
 						sprint(self, "^1This vote is not ok. See help for more info.\n");
@@ -337,6 +338,20 @@
 			bprint(self.netname, "^2 is ready\n");
 			ReadyCount();
 		}
+	} else if(argv(0) == "maplist") {
+		local float i, n;
+		local string col;
+		n = tokenize(cvar_string("g_maplist"));
+		sprint(self, "^7Maps in list: ");
+		for(i = 0; i < n; ++i)
+		{
+			if(math_mod(i, 2))
+				col = "^2";
+			else
+				col = "^3";
+			sprint(self, strcat(col, argv(i), " "));
+		}
+		sprint(self, "\n");
 	} else if(argv(0) == "say") {
 		Say(self, FALSE, substring(s, 4, strlen(s) - 4));
 		//clientcommand(self, formatmessage(s));
@@ -481,7 +496,8 @@
 }
 
 void VoteAccept() {
-	bprint(strcat("^2The vote for \"^1", votecalledvote, "^2\" from \"^7", votecaller.netname, "^2\" was accepted.\n"));
+	// bprint(strcat("^2The vote for \"^1", votecalledvote, "^2\" from \"^7", votecaller.netname, "^2\" was accepted.\n"));
+	bprint(strcat("\{1}^3* ^7", votecaller.netname, "^3's vote for ^1", votecalledvote, "^3 was accepted\n"));
 	if(votecalledmaster)
 	{
 		votecaller.vote_master = 1;
@@ -493,17 +509,20 @@
 }
 
 void VoteReject() {
-	bprint(strcat("^2The vote for \"^1", votecalledvote, "^2\" from \"^7", votecaller.netname, "^2\" was rejected.\n"));
+	// bprint(strcat("^2The vote for \"^1", votecalledvote, "^2\" from \"^7", votecaller.netname, "^2\" was rejected.\n"));
+	bprint(strcat("\{1}^3* ^7", votecaller.netname, "^3's vote for ^1", votecalledvote, "^3 was rejected\n"));
 	VoteReset();
 }
 
 void VoteTimeout() {
-	bprint(strcat("^5The vote for \"^1", votecalledvote, "^5\" from \"^7", votecaller.netname, "^5\" did timeout.\n"));
+	// bprint(strcat("^5The vote for \"^1", votecalledvote, "^5\" from \"^7", votecaller.netname, "^5\" did timeout.\n"));
+	bprint(strcat("\{1}^3* ^7", votecaller.netname, "^3's vote for ^1", votecalledvote, "^3 timed out\n"));
 	VoteReset();
 }
 
 void VoteStop(entity stopper) {
-	bprint(strcat("^5The vote for \"^1", votecalledvote, "^5\" from \"^7", votecaller.netname, "^5\" was stopped by \"^5", stopper.netname, "^5\".\n"));
+	// bprint(strcat("^5The vote for \"^1", votecalledvote, "^5\" from \"^7", votecaller.netname, "^5\" was stopped by \"^5", stopper.netname, "^5\".\n"));
+	bprint(strcat("\{1}^3* ^7", stopper.netname, "^3 stopped ^7", votecaller.netname, "^3's vote\n"));
 	if(stopper == votecaller) {
 		// no wait for next vote so you can correct your vote
 		votecaller.vote_next = 0;