X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclientcommands.qc;h=ac08cc916a43bc343ce896afed07fe208d108825;hb=3cd77e9863d3c7622c1d31d1b5c3686593ff09c8;hp=922b846be375b5a445402f042a37bedff563941f;hpb=0ffc6db70dc8518215693babad2fc42ba89b64c3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index 922b846be..ac08cc916 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -25,6 +25,9 @@ float Nagger_SendEntity(entity to, float sendflags)
 	if(sendflags & 128)
 		nags |= 128;
 
+	if(!(nags & 4)) // no vote called? send no string
+		nags &~= 128;
+
 	WriteByte(MSG_ENTITY, nags);
 
 	if(nags & 128)
@@ -129,7 +132,7 @@ void SV_ParseClientCommand(string s) {
 
 	tokens = tokenize_console(s);
 
-	cmd = argv(0);
+	cmd = strtolower(argv(0));
 	if(cmd != "reportcvar")
 	if(cmd != "sentcvar")
 	if(cmd != "pause")
@@ -174,7 +177,7 @@ void SV_ParseClientCommand(string s) {
 			ClientKill_TeamChange(-2); // observe
 		} else if(autocvar_g_campaign || autocvar_g_balance_teams || autocvar_g_balance_teams_force) {
 			//JoinBestTeam(self, FALSE, TRUE);
-		} else if(teams_matter && !autocvar_sv_spectate && !(self.team_forced > 0)) {
+		} else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) {
 			self.classname = "observer";
 			stuffcmd(self,"menu_showteamselect\n");
 		}
@@ -240,7 +243,7 @@ void SV_ParseClientCommand(string s) {
 	} else if( cmd == "selectteam" ) {
 		if not(self.flags & FL_CLIENT)
 			return;
-		if( !teams_matter ) {
+		if( !teamplay ) {
 			sprint( self, "selectteam can only be used in teamgames\n");
 		} else if(autocvar_g_campaign) {
 			//JoinBestTeam(self, 0);
@@ -362,6 +365,7 @@ void SV_ParseClientCommand(string s) {
 		sprint(self, cvar_purechanges);
 	} else if(CheatCommand(tokens)) {
 	} else {
+#if 0
 		//if(ctf_clientcommand())
 		//	return;
 		// grep for Cmd_AddCommand_WithClientCommand to find them all
@@ -387,6 +391,7 @@ void SV_ParseClientCommand(string s) {
 			print("WARNING: Invalid clientcommand by ", self.netname, ": ", s, "\n");
 			return;
 		}
+#endif
 
 		if(self.jointime > 0 && time > self.jointime + 10 && time > self.nickspamtime) // allow any changes in the first 10 seconds since joining
 		if(cmd == "name" || cmd == "playermodel") // TODO also playerskin and color?
@@ -440,7 +445,7 @@ void ReadyRestartForce()
 	readycount = 0;
 	Nagger_ReadyCounted(); // NOTE: this causes a resend of that entity, and will also turn off warmup state on the client
 
-	if(autocvar_teamplay_lockonrestart && teams_matter) {
+	if(autocvar_teamplay_lockonrestart && teamplay) {
 		lockteams = 1;
 		bprint("^1The teams are now locked.\n");
 	}