From 325ec09eb8bca6f9603a772450283697d23a4b3b Mon Sep 17 00:00:00 2001
From: fruitiex <fruitiex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 15 Oct 2009 14:16:35 +0000
Subject: [PATCH] patch by Spaceman: use sv_adminnick in admin messages and
 make some whitespace changes

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8138 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/gamecommand.qc   | 22 ++++++++++++++++------
 data/qcsrc/server/miscfunctions.qc | 10 ++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/data/qcsrc/server/gamecommand.qc b/data/qcsrc/server/gamecommand.qc
index e1bca263a..19cb6b748 100644
--- a/data/qcsrc/server/gamecommand.qc
+++ b/data/qcsrc/server/gamecommand.qc
@@ -669,20 +669,27 @@ void GameCommand(string command)
 		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 @@ void GameCommand(string command)
 		print("DB loaded.\n");
 		return;
 	}
+
 	if (argv(0) == "nospectators")
 	{
 		blockSpectators = 1;
@@ -722,6 +730,7 @@ void GameCommand(string command)
 		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 @@ void GameCommand(string command)
 			bprint("That command can only be used in a team-based gamemode.\n");
 		return;
 	}
+
 	if (argv(0) == "unlockteams")
 	{
 		if(teams_matter)
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index fd12bebb1..a89c158e5 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -7,6 +7,14 @@ void() spawnfunc_info_player_deathmatch; // needed for the other spawnpoints
 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 @@ string Team_ColorCode(float teamid)
     else
         return "^7";
 }
+
 string Team_ColorName(float t)
 {
     // fixme: Search for team entities and get their .netname's!
@@ -666,6 +675,7 @@ string Team_ColorName(float t)
         return "Pink";
     return "Neutral";
 }
+
 string Team_ColorNameLowerCase(float t)
 {
     // fixme: Search for team entities and get their .netname's!
-- 
2.39.2