More cleanup/fixes

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 2f38d3e1b0dcacd370746d57ba80c58648d87619..06262e109c9754c9e7bdea44dca601bf21ada875 100644 (file)
--- 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 1ac23e5632bdf94dfef59b2c08a438dd33b097d2..fd468f7d955647c24b82b9690a076ac5ddacd0f9 100644 (file)
--- 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 82871d8b224d87879b5f14730e4013bcb4c84893..4babf32b22eb8c9e8cb8db51b5c7b066b488becf 100644 (file)
--- 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)