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

[<to...@us...>]

Revision: 1238
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1238&view=rev
Author:   tomtt
Date:     2008-03-23 07:14:15 -0700 (Sun, 23 Mar 2008)

Log Message:
-----------
Added some runtime dev debug info on entrance failures.

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

Modified: trunk/src/server/usermanager.cpp
===================================================================
--- trunk/src/server/usermanager.cpp	2008-03-22 22:34:52 UTC (rev 1237)
+++ trunk/src/server/usermanager.cpp	2008-03-23 14:14:15 UTC (rev 1238)
@@ -693,10 +693,12 @@
 
 void UserManager::HandleEntranceMessage( MsgEntry* me, Client *client )
 {
+    bool secure = (client->GetSecurityLevel() > GM_LEVEL_0 ) ? true : false;
     psEntranceMessage mesg(me);
     psActionLocation *action = psserver->GetActionManager()->FindAction( mesg.entranceID );
     if ( !action )
     {
+        if (secure) psserver->SendSystemInfo(client->GetClientNum(),"No item/action : %d", mesg.entranceID );
         Error2( "No item/action : %d", mesg.entranceID );
         return;
     }
@@ -713,6 +715,7 @@
     // Check for entrance
     if ( !action->IsEntrance() ) 
     {
+        if (secure) psserver->SendSystemInfo(client->GetClientNum(),"No <Entrance> tag in action response");
         Error1("No <Entrance> tag in action response");
         return;
     }
@@ -726,6 +729,7 @@
         gemItem* realItem = GEMSupervisor::GetSingleton().FindItemEntity( instance_id );
         if (!realItem)
         {
+            if (secure) psserver->SendSystemInfo(client->GetClientNum(),"Invalid instance ID %u in action location %s", instance_id, action->name.GetDataSafe());
             Error3("Invalid instance ID %u in action location %s", instance_id, action->name.GetDataSafe());
             return;
         }
@@ -734,6 +738,7 @@
         psItem* item = realItem->GetItem();
         if ( !item )
         {
+            if (secure) psserver->SendSystemInfo(client->GetClientNum(),"Invalid ItemID in Action Location Response.\n");
             Error1("Invalid ItemID in Action Location Response.\n");
             return;
         }
@@ -760,6 +765,7 @@
     // Send player to main game instance
     if (entranceType == "Prime")
     {
+        if (secure) psserver->SendSystemInfo(client->GetClientNum(),"Teleporting to sector %s", sectorName.GetData());
         Teleport( client, pos.x, pos.y, pos.z, 0, rot, sectorName );
     }
 
@@ -767,6 +773,7 @@
     else if (entranceType == "ActionID")
     {
         int instance = (int)action->id;
+        if (secure) psserver->SendSystemInfo(client->GetClientNum(),"Teleporting to sector %s", sectorName.GetData());
         Teleport( client, pos.x, pos.y, pos.z, instance, rot, sectorName );
     }
 
@@ -777,13 +784,15 @@
         psActionLocation *retAction = psserver->GetActionManager()->FindActionByID( client->GetActor()->GetInstance() );
         if ( !retAction )
         {
-            Error2( "No item/action : %i", client->GetActor()->GetInstance() );
+            if (secure) psserver->SendSystemInfo(client->GetClientNum(),"No exit item/action : %i", client->GetActor()->GetInstance() );
+            Error2( "No exit item/action : %i", client->GetActor()->GetInstance() );
             return;
         }
 
         // Check for return entrance
         if ( !retAction->IsReturn() ) 
         {
+            if (secure) psserver->SendSystemInfo(client->GetClientNum(),"No <Return tag in action response %s",retAction->response.GetData());
             Error2("No <Return tag in action response %s",retAction->response.GetData());
             return;
         }
@@ -794,10 +803,12 @@
         csString retSectorName = retAction->GetReturnSector();
 
         // Send player back to return point
+        if (secure) psserver->SendSystemInfo(client->GetClientNum(),"Teleporting to sector %s", sectorName.GetData());
         Teleport( client, retPos.x, retPos.y, retPos.z, 0, retRot, retSectorName );
     }
     else
     {
+        if (secure) psserver->SendSystemInfo(client->GetClientNum(),"Unknown type in entrance action location");
         Error1("Unknown type in entrance action location");
     }
 }


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