From: Samual <samual@xonotic.org>
Date: Sat, 31 Dec 2011 00:31:11 +0000 (-0500)
Subject: More cleanup/fixes
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db08ef3cf8fa0f4e04a71833903b65367b7259ff;p=xonotic%2Fxonotic-data.pk3dir.git

More cleanup/fixes
---

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 2f38d3e1b..06262e109 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -512,7 +512,7 @@ void ClientCommand_tell(float request, float argc, string command)
 				}
 				else if(strtolower(argv(1)) == "world") 
 				{ 
-					trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
+					trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token)));
 					return;
 				}
 				else { print_to(self, strcat("tell: ", GetClientErrorString(tell_accepted, argv(1)), ".")); return; }
diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index 1ac23e563..fd468f7d9 100644
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -10,6 +10,8 @@
 
 // See common.qc for their proper commands
 
+// todo: Re-write this to be more user friendly... I'll probably do it after it is merged.
+
 string getrecords(float page) // 50 records per page
 {
     float rec;
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 82871d8b2..4babf32b2 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -2510,71 +2510,6 @@ void SoundEntity_Detach(entity pl)
         SoundEntity_StopSound(pl, i);
 }
 
-
-float ParseCommandPlayerSlotTarget_firsttoken;
-entity GetCommandPlayerSlotTargetFromTokenizedCommand(float tokens, float idx) // idx = start index
-{
-	string s;
-	entity e, head;
-	float n;
-
-	s = string_null;
-
-	ParseCommandPlayerSlotTarget_firsttoken = -1;
-
-	if (tokens > idx)
-	{
-		if (substring(argv(idx), 0, 1) == "#")
-		{
-			s = substring(argv(idx), 1, -1);
-			++idx;
-			if (s == "") if (tokens > idx)
-			{
-				s = argv(idx);
-				++idx;
-			}
-			ParseCommandPlayerSlotTarget_firsttoken = idx;
-			n = stof(s);
-			if (s == ftos(n) && n > 0 && n <= maxclients)
-			{
-				e = edict_num(n);
-				if (e.flags & FL_CLIENT)
-					return e;
-			}
-		}
-		else
-		{
-			// it must be a nick name
-			s = argv(idx);
-			++idx;
-			ParseCommandPlayerSlotTarget_firsttoken = idx;
-
-			n = 0;
-			FOR_EACH_CLIENT(head)
-				if (head.netname == s)
-				{
-					e = head;
-					++n;
-				}
-			if (n == 1)
-				return e;
-
-			s = strdecolorize(s);
-			n = 0;
-			FOR_EACH_CLIENT(head)
-				if (strdecolorize(head.netname) == s)
-				{
-					e = head;
-					++n;
-				}
-			if (n == 1)
-				return e;
-		}
-	}
-
-	return world;
-}
-
 .float scale2;
 
 float modeleffect_SendEntity(entity to, float sf)