[Planeshift-cvs] SF.net SVN: planeshift: [882] trunk/src/server/command.cpp

[<ac...@us...>]

Revision: 882
          http://planeshift.svn.sourceforge.net/planeshift/?rev=882&view=rev
Author:   acraig
Date:     2008-02-17 17:50:38 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
Replacing GetEntity()->GetID() with GetEntityID()

Modified Paths:
--------------
    trunk/src/server/command.cpp

Modified: trunk/src/server/command.cpp
===================================================================
--- trunk/src/server/command.cpp	2008-02-18 01:48:46 UTC (rev 881)
+++ trunk/src/server/command.cpp	2008-02-18 01:50:38 UTC (rev 882)
@@ -280,7 +280,7 @@
         int eid = 0;
         if (client->GetActor() && client->GetActor()->GetEntity() )
         {
-            eid = client->GetActor()->GetEntity()->GetID();
+            eid = client->GetActor()->GetEntityID();
         }
         CPrintf (CON_CMDOUTPUT ,"%5d %5d %-25s %14d %10s",
             eid,
@@ -1581,7 +1581,7 @@
                 (sector) ? sector->QueryObject()->GetName():"(null)";
 
             CPrintf(CON_CMDOUTPUT ,"%5d %-15s %-20s (%9.3f,%9.3f,%9.3f, %s)\n",
-                    obj->GetEntity()->GetID(),
+                    obj->GetEntityID(),
                     obj->GetObjectType(),
                     obj->GetName(),
                     pos.x,pos.y,pos.z,sector_name );
@@ -1607,7 +1607,7 @@
         {
             CPrintf(CON_CMDOUTPUT ,"%9u %5u %9u %-10s %-20s\n",
                     actor->GetCharacterData()->GetCharacterID(),
-                    actor->GetEntity()->GetID(),
+                    actor->GetEntityID(),
                     actor->GetClientID(),
                     actor->GetObjectType(),
                     actor->GetName());
@@ -2084,7 +2084,7 @@
         CPrintf(CON_CMDOUTPUT ,"Client %d not found!\n",clientNum);
         return 0;
     }
-    int playerNum = client->GetActor()->GetEntity()->GetID();
+    int playerNum = client->GetActor()->GetEntityID();
     gemActor* object = (gemActor*)GEMSupervisor::GetSingleton().FindObject(playerNum);
     object->Kill(NULL);
     return 0;


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