[PlaneShift-svn] SF.net SVN: planeshift:[4128] trunk/src/server

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

Revision: 4128
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4128&view=rev
Author:   weltall2
Date:     2009-07-25 17:41:33 +0000 (Sat, 25 Jul 2009)

Log Message:
-----------
fixed doadmincmd

Modified Paths:
--------------
    trunk/src/server/adminmanager.cpp
    trunk/src/server/adminmanager.h
    trunk/src/server/bulkobjects/dictionary.cpp

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-07-25 17:11:46 UTC (rev 4127)
+++ trunk/src/server/adminmanager.cpp	2009-07-25 17:41:33 UTC (rev 4128)
@@ -175,6 +175,13 @@
     return command.Slice(command.FindFirst(' ')+1,8) == "me reset";
 }
 
+//TODO: To be expanded to make the implementation better than how it is now 
+//      when an NPC issues an admin command
+void AdminManager::HandleNpcCommand(MsgEntry *pMsg, Client *client)
+{
+    HandleAdminCmdMessage(pMsg, client);
+}
+
 bool AdminManager::AdminCmdData::DecodeAdminCmdMessage(MsgEntry *pMsg, psAdminCmdMessage& msg, Client *client)
 {
     WordArray words (msg.cmd, false);

Modified: trunk/src/server/adminmanager.h
===================================================================
--- trunk/src/server/adminmanager.h	2009-07-25 17:11:46 UTC (rev 4127)
+++ trunk/src/server/adminmanager.h	2009-07-25 17:41:33 UTC (rev 4128)
@@ -104,6 +104,9 @@
 
     /** Get sector and coordinates of starting point of a map. Returns success. */
     bool GetStartOfMap(int clientnum, const csString & map, iSector * & targetSector,  csVector3 & targetPoint);
+    
+    ///wrapper for internal use from npc
+    void HandleNpcCommand(MsgEntry *pMsg, Client *client);
 
 protected:
 

Modified: trunk/src/server/bulkobjects/dictionary.cpp
===================================================================
--- trunk/src/server/bulkobjects/dictionary.cpp	2009-07-25 17:11:46 UTC (rev 4127)
+++ trunk/src/server/bulkobjects/dictionary.cpp	2009-07-25 17:41:33 UTC (rev 4128)
@@ -2429,7 +2429,7 @@
     modifiedCommandString.ReplaceAll("sourcenpc", format);
     psAdminCmdMessage msg(modifiedCommandString, 0);
     msg.msg->current=0;
-    psserver->GetAdminManager()->HandleMessage(msg.msg, target->GetClient());
+    psserver->GetAdminManager()->HandleNpcCommand(msg.msg, target->GetClient());
     return true;
 }
 


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