r1857 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-08-26 04:13:41 -0400 (Sat, 26 Aug 2006)
New Revision: 1857

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
Log:
old .cfg method; no yoda for dead people


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-08-25 22:53:19 UTC (rev 1856)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-08-26 08:13:41 UTC (rev 1857)
@@ -712,19 +712,10 @@
 	self.welcomemessage_time = time + cvar("welcome_message_time");
 	self.welcomemessage_time2 = 0;
 
-	//stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
-	// the client might not have that file yet!
-	fh = fopen(strcat("maps/", mapname, ".cfg"), FILE_READ);
-	if(fh >= 0)
-	{
-		while((s = fgets(fh)))
-			stuffcmd(self, strcat(s, "\n"));
-		fclose(fh);
-	}
+	stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
 	// TODO: is this being used for anything else than cd tracks?
 	// Remember: SVC_CDTRACK exists. Maybe it should be used.
 	
-	
 	// send prediction settings to the client
 	stuffcmd(self, strcat("cl_movement_accelerate ", ftos(cvar("sv_accelerate")), "\n"));
 	stuffcmd(self, strcat("cl_movement_friction ", ftos(cvar("sv_friction")), "\n"));

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2006-08-25 22:53:19 UTC (rev 1856)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2006-08-26 08:13:41 UTC (rev 1857)
@@ -387,7 +387,7 @@
 			}
 		}
 	} else {
-		if (deathtype == IT_NEX && !(attacker.flags & FL_ONGROUND) && !(targ.flags & FL_ONGROUND) && attacker.waterlevel < 2 && targ.waterlevel < 2 && attacker.killcount != 3 && attacker.killcount != 5 && attacker.killcount != 10 && attacker.killcount != 15 && attacker.killcount != 20 && attacker.killcount != 25 && attacker.killcount != 30)
+		if (deathtype == IT_NEX && !targ.deadflag && !(attacker.flags & FL_ONGROUND) && !(targ.flags & FL_ONGROUND) && attacker.waterlevel < 2 && targ.waterlevel < 2 && attacker.killcount != 3 && attacker.killcount != 5 && attacker.killcount != 10 && attacker.killcount != 15 && attacker.killcount != 20 && attacker.killcount != 25 && attacker.killcount != 30)
 		{
 			if(clienttype(attacker) == CLIENTTYPE_REAL)  stuffcmd(attacker, "play2 announcer/male/yoda.ogg\n");
 		}