r4026 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-05 06:01:27 -0400 (Tue, 05 Aug 2008)
New Revision: 4026

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/clientcommands.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/teamplay.qc
Log:
replace "frags -2" by "version_mismatch"; first step to make .frags have a meaningful value again (for status, remote queries)


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-08-05 08:47:01 UTC (rev 4025)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-08-05 10:01:27 UTC (rev 4026)
@@ -446,15 +446,14 @@
 
 	if(g_arena)
 	{
-		if(self.frags != -2)
+		if(self.version_mismatch)
 		{
-			Spawnqueue_Insert(self);
-			// FIXME what IS this?
+			Spawnqueue_Unmark(self);
+			Spawnqueue_Remove(self);
 		}
 		else
 		{
-			Spawnqueue_Unmark(self);
-			Spawnqueue_Remove(self);
+			Spawnqueue_Insert(self);
 		}
 	}
 	else if(g_lms)
@@ -1808,12 +1807,12 @@
 void ObserverThink()
 {
 	if (self.flags & FL_JUMPRELEASED) {
-		if (self.BUTTON_JUMP && self.version == cvar("gameversion")) {
+		if (self.BUTTON_JUMP && !self.version_mismatch) {
 			self.welcomemessage_time = 0;
 			self.flags = self.flags - FL_JUMPRELEASED;
 			LeaveSpectatorMode();
 			return;
-		} else if(self.BUTTON_ATCK && self.version == cvar("gameversion")) {
+		} else if(self.BUTTON_ATCK && !self.version_mismatch) {
 			self.welcomemessage_time = 0;
 			self.flags = self.flags - FL_JUMPRELEASED;
 			if(SpectateNext() == 1) {
@@ -1834,7 +1833,7 @@
 void SpectatorThink()
 {
 	if (self.flags & FL_JUMPRELEASED) {
-		if (self.BUTTON_JUMP && self.version == cvar("gameversion")) {
+		if (self.BUTTON_JUMP && !self.version_mismatch) {
 			self.welcomemessage_time = 0;
 			self.flags = self.flags - FL_JUMPRELEASED;
 			LeaveSpectatorMode();

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2008-08-05 08:47:01 UTC (rev 4025)
+++ trunk/data/qcsrc/server/clientcommands.qc	2008-08-05 10:01:27 UTC (rev 4026)
@@ -197,7 +197,7 @@
 		if(self.version != cvar("gameversion"))
 		{
 			self.classname = "observer";
-			self.frags = -2;
+			self.version_mismatch = 1;
 			PutClientInServer();
 		} else if(cvar("g_campaign") || cvar("g_balance_teams") || cvar("g_balance_teams_force")) {
 			//JoinBestTeam(self, FALSE, TRUE);

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-08-05 08:47:01 UTC (rev 4025)
+++ trunk/data/qcsrc/server/defs.qh	2008-08-05 10:01:27 UTC (rev 4026)
@@ -477,3 +477,5 @@
 void PlayerSound(.string samplefield, float channel, float teamsay); // 0 is normal, 1 is team, 2 is last attacker
 void GlobalSound(string samplestring, float channel, float teamsay); // 0 is normal, 1 is team, 2 is last attacker
 void VoiceMessage(string type);
+
+.float version_mismatch;

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-08-05 08:47:01 UTC (rev 4025)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-08-05 10:01:27 UTC (rev 4026)
@@ -337,13 +337,10 @@
 	e.think = default_delayedinit;
 }
 
-string GetClientVersionMessage(float v) {
+string GetClientVersionMessage() {
 	local string versionmsg;
-	if (v == 1) {
-		versionmsg = "^1client is too old to get versioninfo.\n\n\n### YOU WON'T BE ABLE TO PLAY ON THIS SERVER ###\n\n\nUPDATE!!! (http://www.nexuiz.com)^8";
-		// either that or someone wants to be funny
-	} else if (v != cvar("gameversion")) {
-		if(v < cvar("gameversion")) {
+	if (self.version_mismatch) {
+		if(self.version < cvar("gameversion")) {
 			versionmsg = "^3Your client version is outdated.\n\n\n### YOU WON'T BE ABLE TO PLAY ON THIS SERVER ###\n\n\nPlease update!!!^8";
 		} else {
 			versionmsg = "^3This server is using an outdated Nexuiz version.\n\n\n ### THIS SERVER IS INCOMPATIBLE AND THUS YOU CANNOT JOIN ###.^8";
@@ -447,7 +444,7 @@
 	}
 
 	local string versionmessage;
-	versionmessage = GetClientVersionMessage(self.version);
+	versionmessage = GetClientVersionMessage();
 
 	s = strcat(s, NEWLINES, "This is Nexuiz ", cvar_string("g_nexuizversion"), "\n", versionmessage);
 	s = strcat(s, "^8\n\nmatch type is ^1", mutator, gamemode_name, "^8\n");