[PlaneShift-svn] SF.net SVN: planeshift:[2464] trunk

[<wel...@us...>]

Revision: 2464
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2464&view=rev
Author:   weltall2
Date:     2008-11-21 23:26:08 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
- Updates to the help
- Fixed FS#2502 - /setlabelcolor doesn't show help when issued with no arguments. 

Modified Paths:
--------------
    trunk/data/help.xml
    trunk/docs/history.txt
    trunk/src/server/adminmanager.cpp

Modified: trunk/data/help.xml
===================================================================
--- trunk/data/help.xml	2008-11-21 23:05:30 UTC (rev 2463)
+++ trunk/data/help.xml	2008-11-21 23:26:08 UTC (rev 2464)
@@ -508,6 +508,9 @@
 Kills the targeted NPC, using the current target if no name is given. The reload option recreates the NPC with stats and triggers from the DB.</topic>
         <topic name="/listwarnings">/listwarnings [me/target/eid/pid/area/name]
 List all warnings given to the targeted account.</topic>
+        <topic name="/managepetitions">/managepetitions
+
+Manage petitions to help users.</topic>
         <topic name="/marriageinfo">/marriageinfo [me/target/eid/pid/area/name]
 
 View the details of a characters marriage.</topic>
@@ -616,9 +619,6 @@
 
 Stop the current path. If there are a waypoint nearby the waypoint is used to end the path. Otherwise a new aypoint is created.</topic>
         </branch>
-        <topic name="/petition_manage">/petition_manage
-
-Manage petitions to help users.</topic>
         <topic name="/pos">/pos target
 
 GMs have an enhanced version of the /pos command which shows your current region and the direction you are facing.  It also has an optional parameter to get the position of another entity.  (may specify by name or an ID)</topic>

Modified: trunk/docs/history.txt
===================================================================
--- trunk/docs/history.txt	2008-11-21 23:05:30 UTC (rev 2463)
+++ trunk/docs/history.txt	2008-11-21 23:26:08 UTC (rev 2464)
@@ -5,6 +5,8 @@
 - Migrating some code to c++
 - Committed an additional patch from kougaro for FS#2340 - Drop Command - fixing the /drop # tria
   problems
+- Updates to the help
+- Fixed FS#2502 - /setlabelcolor doesn't show help when issued with no arguments. 
 
 *** 2008-11-20 by Keith Fulton
 - Quest prerequisites (at least the basic ones) now work with popup dialog.  This

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-11-21 23:05:30 UTC (rev 2463)
+++ trunk/src/server/adminmanager.cpp	2008-11-21 23:26:08 UTC (rev 2464)
@@ -2201,7 +2201,11 @@
 
     if(!subject)
     {
-        psserver->SendSystemInfo( me->clientnum, "The target was not found online\"");
+        if(data.player.IsEmpty())
+            psserver->SendSystemInfo(me->clientnum,
+            "Correct syntax is: \"/setlabelcolor [target] [npc|player|tester|gm1|gm|dead|alive|normal]\"");
+        else
+            psserver->SendSystemInfo( me->clientnum, "The target was not found online");
         return;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.