[nexuiz-commits] r8138 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-10-15 10:16:35 -0400 (Thu, 15 Oct 2009)
New Revision: 8138

Modified:
   trunk/data/qcsrc/server/gamecommand.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
patch by Spaceman: use sv_adminnick in admin messages and make some whitespace changes


Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc	2009-10-15 07:22:31 UTC (rev 8137)
+++ trunk/data/qcsrc/server/gamecommand.qc	2009-10-15 14:16:35 UTC (rev 8138)
@@ -669,20 +669,27 @@
 		return;
 	}
 
-	if(argv(0) == "adminmsg") if(argc == 3)
+	if(argv(0) == "adminmsg")
+	if(argc == 3)
 	{
 		entno = stof(argv(1));
-		client = world;
-		if(entno <= maxclients)
-			client = edict_num(entno);
+
+		if((entno < 1) | (entno > maxclients)) {
+			print("Player ", argv(1), " doesn't exist\n");
+			return;
+		}
+
+		client = edict_num(entno);
+
 		if(client.flags & FL_CLIENT)
 		{
-			centerprint_atprio(client, CENTERPRIO_ADMIN, strcat("^3SERVER ADMIN:\n\n^7", argv(2)));
-			sprint(client, strcat("\{1}\{13}^3SERVER ADMIN^7: ", argv(2), "\n"));
+			centerprint_atprio(client, CENTERPRIO_ADMIN, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
+			sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", argv(2), "\n"));
 			print("Message sent to ", client.netname, "\n");
 		}
 		else
 			print("Client not found\n");
+
 		return;
 	}
 
@@ -707,6 +714,7 @@
 		print("DB loaded.\n");
 		return;
 	}
+
 	if (argv(0) == "nospectators")
 	{
 		blockSpectators = 1;
@@ -722,6 +730,7 @@
 		bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(cvar("g_maxplayers_spectator_blocktime")), " seconds!\n"));
 		return;
 	}
+
 	if (argv(0) == "lockteams")
 	{
 		if(teams_matter)
@@ -733,6 +742,7 @@
 			bprint("That command can only be used in a team-based gamemode.\n");
 		return;
 	}
+
 	if (argv(0) == "unlockteams")
 	{
 		if(teams_matter)

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-10-15 07:22:31 UTC (rev 8137)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-10-15 14:16:35 UTC (rev 8138)
@@ -7,6 +7,14 @@
 void() spawnpoint_use;
 string ColoredTeamName(float t);
 
+string admin_name(void)
+{
+	if(cvar_string("sv_adminnick") != "")
+		return cvar_string("sv_adminnick");
+	else
+		return "SERVER ADMIN";
+}
+
 float DistributeEvenly_amount;
 float DistributeEvenly_totalweight;
 void DistributeEvenly_Init(float amount, float totalweight)
@@ -653,6 +661,7 @@
     else
         return "^7";
 }
+
 string Team_ColorName(float t)
 {
     // fixme: Search for team entities and get their .netname's!
@@ -666,6 +675,7 @@
         return "Pink";
     return "Neutral";
 }
+
 string Team_ColorNameLowerCase(float t)
 {
     // fixme: Search for team entities and get their .netname's!