r3915 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-25 14:46:21 -0400 (Fri, 25 Jul 2008)
New Revision: 3915

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/domination.qc
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
oops... ;)


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-07-25 17:28:26 UTC (rev 3914)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-07-25 18:46:21 UTC (rev 3915)
@@ -380,7 +380,7 @@
 	{
 		if(g_lms)
 		{
-			if(PlayerScoreAdd(self, SP_LMS_PLACE, 0) > 0)
+			if(PlayerScore_Add(self, SP_LMS_PLACE, 0) > 0)
 				bprint ("^4", self.netname, "^4 has no more lives left\n");
 			else
 				bprint ("^4", self.netname, "^4 is spectating now\n"); // TODO turn this into a proper forfeit?
@@ -556,7 +556,7 @@
 	// FIXME fix LMS scoring for new system
 	if(g_lms)
 	{
-		if(PlayerScoreAdd(self, SP_LMS_PLACE, 0) > 0)
+		if(PlayerScore_Add(self, SP_LMS_PLACE, 0) > 0)
 			self.classname = "observer";
 	}
 
@@ -1153,9 +1153,9 @@
 
 	if(g_lms)
 	{
-		if(PlayerScoreAdd(self, SP_LMS_LIVES, LMS_NewPlayerLives()) <= 0)
+		if(PlayerScore_Add(self, SP_LMS_LIVES, LMS_NewPlayerLives()) <= 0)
 		{
-			PlayerScoreAdd(self, SP_LMS_PLACE, 666);
+			PlayerScore_Add(self, SP_LMS_PLACE, 666);
 			self.frags = -666; // FIXME do we still need this?
 		}
 	}

Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc	2008-07-25 17:28:26 UTC (rev 3914)
+++ trunk/data/qcsrc/server/domination.qc	2008-07-25 18:46:21 UTC (rev 3915)
@@ -15,7 +15,7 @@
 Note: The only teams who can use dom control points are identified by spawnfunc_dom_team entities (if none exist these default to red and blue and use only quake models/sounds).
 */
 
-#define DOMPOINT_FRAGS frags
+#define DOMPOINTFRAGS frags
 
 void() dom_controlpoint_setup;
 

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-07-25 17:28:26 UTC (rev 3914)
+++ trunk/data/qcsrc/server/g_world.qc	2008-07-25 18:46:21 UTC (rev 3915)
@@ -1521,10 +1521,10 @@
 		CheckAllowedTeams(world);
 		for(i = 0; i < MAX_TEAMSCORE; ++i)
 		{
-			if(t != COLOR_TEAM1) if(c1 >= 0) TeamScore_Add(COLOR_TEAM1, i, -1000);
-			if(t != COLOR_TEAM2) if(c2 >= 0) TeamScore_Add(COLOR_TEAM2, i, -1000);
-			if(t != COLOR_TEAM3) if(c3 >= 0) TeamScore_Add(COLOR_TEAM3, i, -1000);
-			if(t != COLOR_TEAM4) if(c4 >= 0) TeamScore_Add(COLOR_TEAM4, i, -1000);
+			if(t != COLOR_TEAM1) if(c1 >= 0) TeamScore_AddToTeam(COLOR_TEAM1, i, -1000);
+			if(t != COLOR_TEAM2) if(c2 >= 0) TeamScore_AddToTeam(COLOR_TEAM2, i, -1000);
+			if(t != COLOR_TEAM3) if(c3 >= 0) TeamScore_AddToTeam(COLOR_TEAM3, i, -1000);
+			if(t != COLOR_TEAM4) if(c4 >= 0) TeamScore_AddToTeam(COLOR_TEAM4, i, -1000);
 		}
 
 		AddWinners(team, t);

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-07-25 17:28:26 UTC (rev 3914)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-07-25 18:46:21 UTC (rev 3915)
@@ -365,6 +365,7 @@
 void PrintWelcomeMessage(entity pl)
 {
 	string s, mutator, modifications, padding;
+	float p;
 
 	/*if(self.welcomemessage_time > time)
 		return;
@@ -388,7 +389,6 @@
 		{
 			if(g_lms)
 			{
-				float p;
 				p = PlayerScore_Add(self, SP_LMS_PLACE, 0);
 				if(p >= 666)
 					return centerprint_atprio(self, CENTERPRIO_SPAM, strcat(NEWLINES, "^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"));
@@ -400,7 +400,6 @@
 		{
 			if(g_lms)
 			{
-				float p;
 				p = PlayerScore_Add(self, SP_LMS_PLACE, 0);
 				if(p)
 					return centerprint_atprio(self, CENTERPRIO_SPAM, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));