Planeshift: a 3D MMORPG

Revision: 2140
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2140&view=rev
Author:   heinchen
Date:     2008-08-31 15:06:40 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
removed typos

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-08-31 14:48:48 UTC (rev 2139)
+++ trunk/src/server/adminmanager.cpp	2008-08-31 15:06:40 UTC (rev 2140)
@@ -807,7 +807,7 @@
         else if (subCmd == "help")
         {
             help = true;
-            subCmd = words[2]; // This might be help on a specefix command
+            subCmd = words[2]; // This might be help on a specific command
         }
         else
         {
@@ -832,7 +832,7 @@
         {
             // No params
         }
-        else if (subCmd == "show") // Alias for dislay
+        else if (subCmd == "show") // Alias for display
         {
             subCmd = "display";
         }
@@ -1882,7 +1882,7 @@
     psSectorInfo *spawnsector = CacheManager::GetSingleton().GetSectorInfoByName(sector->QueryObject()->GetName());
     if(!spawnsector)
     {
-        CPrintf(CON_ERROR,"Player is in invaild sector %s!",sector->QueryObject()->GetName());
+        CPrintf(CON_ERROR,"Player is in invalid sector %s!",sector->QueryObject()->GetName());
         return;
     }
  
@@ -2473,7 +2473,7 @@
         // Add on description
         resp.AppendFmt("<Description>%s</Description></Examine>",data.description.GetData());
 
-        // Create entrance action location w/ possition info since there will be many of these
+        // Create entrance action location w/ position info since there will be many of these
         psActionLocation* actionLocation = new psActionLocation();
         actionLocation->SetName(name);
         actionLocation->SetSectorName(sector_name.GetData());
@@ -2829,7 +2829,7 @@
             }
             else
             {
-                psserver->SendSystemError( me->clientnum, "Stoping selected path.");
+                psserver->SendSystemError( me->clientnum, "Stopping selected path.");
                 client->PathSetPath(NULL);
             }
         }
@@ -2843,7 +2843,7 @@
         Waypoint * wp = pathNetwork->FindNearestWaypoint(myPos,mySector,2.0,&range);
         if (wp)
         {
-            psserver->SendSystemInfo( me->clientnum, "Starting path, using exsisting waypoint %s(%d) at range %.2f",
+            psserver->SendSystemInfo( me->clientnum, "Starting path, using existing waypoint %s(%d) at range %.2f",
                                       wp->GetName(), wp->GetID(), range);
         } else
         {
@@ -2904,7 +2904,7 @@
                 return;
             }
             
-            psserver->SendSystemInfo( me->clientnum, "Stoping path using exsisting waypoint %s(%d) at range %.2f",
+            psserver->SendSystemInfo( me->clientnum, "Stoping path using existing waypoint %s(%d) at range %.2f",
                                       wp->GetName(), wp->GetID(), range);
         } else
         {
@@ -3697,7 +3697,7 @@
 
     if ( !psserver->GetConnections()->FindAccount(masternpc->GetSuperclientID()) )
     {
-        psserver->SendSystemError(me->clientnum, "%s's superclient is not online", basis->GetName() );
+        psserver->SendSystemError(me->clientnum, "%s's super client is not online", basis->GetName() );
         return;
     }
 
@@ -4039,7 +4039,7 @@
         target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id );
         if (!target)
         {
-            psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location.");
+            psserver->SendSystemError(me->clientnum,"There is no item associated with this action location.");
             return;
         }
     }
@@ -4089,7 +4089,7 @@
         target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id );
         if (!target)
         {
-            psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location.");
+            psserver->SendSystemError(me->clientnum,"There is no item associated with this action location.");
             return;
         }
     }
@@ -4176,7 +4176,7 @@
         target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id );
         if (!target)
         {
-            psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location.");
+            psserver->SendSystemError(me->clientnum,"There is no item associated with this action location.");
             return;
         }
     }
@@ -4234,7 +4234,7 @@
         target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id );
         if (!target)
         {
-            psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location.");
+            psserver->SendSystemError(me->clientnum,"There is no item associated with this action location.");
             return;
         }
     }
@@ -4761,7 +4761,7 @@
     }
     else
     {
-        // Tell GM operation was successful eventhough we don't have a list of petitions
+        // Tell GM operation was successful even though we don't have a list of petitions
         psPetitionMessage message(me->clientnum, NULL, "Successful", true, type, true);
         message.SendMessage();
     }
@@ -5090,7 +5090,7 @@
         if ( error.Length() )
             psserver->SendSystemError(me->clientnum,"Deletion error: %s", error.GetData() );
         else
-            psserver->SendSystemError(me->clientnum,"Character deletion got unkown error!", error.GetData() );
+            psserver->SendSystemError(me->clientnum,"Character deletion got unknown error!", error.GetData() );
     }
 }
 


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

Revision: 2204
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2204&view=rev
Author:   weltall2
Date:     2008-09-28 20:56:56 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
forgot to rearrange some arguments

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-09-28 20:50:53 UTC (rev 2203)
+++ trunk/src/server/adminmanager.cpp	2008-09-28 20:56:56 UTC (rev 2204)
@@ -1239,7 +1239,7 @@
     }
     else if (data.command == "/charlist")
     {
-        GetSiblingChars(me,msg,data,client,targetobject, duplicateActor);
+        GetSiblingChars(me,msg,data, targetobject, duplicateActor, client);
     }
     else if (data.command == "/crystal")
     {
@@ -1506,7 +1506,7 @@
     return found;
 }
 
-void AdminManager::GetSiblingChars(MsgEntry* me,psAdminCmdMessage& msg, AdminCmdData& data,Client *client, gemObject *targetobject, bool duplicateActor)
+void AdminManager::GetSiblingChars(MsgEntry* me,psAdminCmdMessage& msg, AdminCmdData& data, gemObject *targetobject, bool duplicateActor, Client *client)
 {
     if ((!data.player || !data.player.Length()) && !targetobject)
     {


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

Revision: 2346
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2346&view=rev
Author:   weltall2
Date:     2008-11-02 12:46:37 +0000 (Sun, 02 Nov 2008)

Log Message:
-----------
Added standard targetting and offline pid support to /listwarnings as part of FS#2254

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-11-02 12:27:16 UTC (rev 2345)
+++ trunk/src/server/adminmanager.cpp	2008-11-02 12:46:37 UTC (rev 2346)
@@ -1064,7 +1064,7 @@
     }
     else if (command == "/listwarnings")
     {
-        target = words.Get(1);
+        player = words.Get(1);
         return true;
     }
     else if (command == "/target_name") //will return what would be targeted in an admin function, mostly useful with area targeting
@@ -1451,7 +1451,7 @@
     }
     else if (data.command == "/listwarnings")
     {
-        HandleListWarnings(msg, data, client, targetobject);
+        HandleListWarnings(msg, data, client, targetclient);
     }
     else if (data.command == "/target_name")
     {
@@ -7833,30 +7833,29 @@
     }
 }
 
-void AdminManager::HandleListWarnings(psAdminCmdMessage& msg, AdminCmdData& data, Client *client, gemObject* object )
+void AdminManager::HandleListWarnings(psAdminCmdMessage& msg, AdminCmdData& data, Client *client, Client *target )
 {
-    Client* target = NULL;
     AccountID accountID;
+    PID pid; //used when offline to allow the use of pids
 
-    if (!data.target.IsEmpty() && data.target != "target")
-    {
-        target = psserver->GetCharManager()->FindPlayerClient(data.target);
-    }
-    else if(object)
-    {
-        gemActor* targetActor = dynamic_cast<gemActor*>(object);
-        if (targetActor)
-            target = targetActor->GetClient();
-    }
-
     if(target)
     {
         accountID = target->GetAccountID();
     }
     else
     {
+        csString query;
         // let's see if there's a offline character with given name
-        Result rs(db->Select("SELECT account_id FROM characters WHERE name='%s'", data.target.GetData()));
+        if (data.player.StartsWith("pid:",true) && data.player.Length() > 4) // Get player ID should happen only if offline
+            pid = PID(strtoul(data.player.Slice(4).GetData(), NULL, 10)); //convert the PID to something usable
+
+        if (pid.IsValid()) // Find by player ID
+            query.Format("SELECT account_id FROM characters WHERE id='%u'", pid.Unbox());
+        else //find by player name
+            query.Format("SELECT account_id FROM characters WHERE name='%s'", data.player.GetData());
+
+        Result rs(db->Select(query));
+
         if(rs.IsValid() && rs.Count() > 0)
         {
             accountID = AccountID(rs[0].GetUInt32("account_id"));


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

Revision: 2366
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2366&view=rev
Author:   weltall2
Date:     2008-11-06 23:04:53 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
typo fix

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-11-06 22:22:52 UTC (rev 2365)
+++ trunk/src/server/adminmanager.cpp	2008-11-06 23:04:53 UTC (rev 2366)
@@ -5206,14 +5206,14 @@
     if ( data.zombie.StartsWith("pid:",true) ) // Find by player ID
     {
         zombieID = PID(strtoul(data.player.Slice(4).GetData(), NULL, 10));
-        if (!zombieID.Valid())
+        if (!zombieID.IsValid())
         {
             psserver->SendSystemError(me->clientnum,"Error, bad PID");
             return;
         }
     }
 
-    if (!zombieID.Valid())  // Deleting by name; verify the petitioner gave us one of their characters
+    if (!zombieID.IsValid())  // Deleting by name; verify the petitioner gave us one of their characters
     {
         if (data.zombie.IsEmpty() || data.requestor.IsEmpty())
         {


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

Revision: 2615
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2615&view=rev
Author:   weltall2
Date:     2008-12-03 21:54:13 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
Other instance hardcoded values changed to their defines, fixed an int used in place of INSTANCE_ID

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-12-03 21:33:08 UTC (rev 2614)
+++ trunk/src/server/adminmanager.cpp	2008-12-03 21:54:13 UTC (rev 2615)
@@ -333,7 +333,7 @@
         player = words[1];
         target = words[2];
 
-        instance = 0;
+        instance = DEFAULT_INSTANCE;
         instanceValid = false;
 
         if (target == "map")
@@ -1692,7 +1692,7 @@
     csString name, ipAddress, securityLevel, sectorName;
     PID playerId;
     AccountID accountId;
-    int instance = 0;
+    INSTANCE_ID instance = DEFAULT_INSTANCE;
     float timeConnected = 0.0f, loc_x = 0.0f, loc_y = 0.0f, loc_z = 0.0f, loc_yrot = 0.0f;
 
     bool banned = false;


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

Revision: 2686
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2686&view=rev
Author:   weltall2
Date:     2008-12-14 11:54:05 +0000 (Sun, 14 Dec 2008)

Log Message:
-----------
Some congruency changes

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-12-14 11:50:01 UTC (rev 2685)
+++ trunk/src/server/adminmanager.cpp	2008-12-14 11:54:05 UTC (rev 2686)
@@ -1841,7 +1841,7 @@
         else
             info.Append("is offline, ");
 
-        info.AppendFmt("at position %1.2f, %1.2f, %1.2f angle: %d in sector: %s, instance: %d, ",
+        info.AppendFmt("at position (%1.2f, %1.2f, %1.2f) angle: %d in sector: %s, instance: %d, ",
                 loc_x, loc_y, loc_z, degrees, sectorName.GetData(), instance);
 
         info.AppendFmt("total time connected is %1.1f hours", timeConnected );


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

Revision: 2757
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2757&view=rev
Author:   weltall2
Date:     2008-12-23 21:14:08 +0000 (Tue, 23 Dec 2008)

Log Message:
-----------
trimmed spaces/converted tabs to spaces

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2008-12-23 21:10:46 UTC (rev 2756)
+++ trunk/src/server/adminmanager.cpp	2008-12-23 21:14:08 UTC (rev 2757)
@@ -1678,7 +1678,7 @@
                         loc_x, loc_y, loc_z, degrees,
                         sectorName.GetData(),
                         instance);
-                
+
           if ( item->GetScheduledItem() )
               info.AppendFmt(", spawns with interval %d + %d max modifier",
                              item->GetScheduledItem()->GetInterval(),
@@ -6567,7 +6567,7 @@
         target->GetPosition(pos, yrot, sec);
         instance = target->GetInstance();
     }
-  
+
     csString sector = sec->QueryObject()->GetName();
 
     psSectorInfo* sectorinfo = CacheManager::GetSingleton().GetSectorInfoByName(sector);


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

Revision: 2799
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2799&view=rev
Author:   weltall2
Date:     2009-01-03 14:01:59 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
removed code of a not ready function

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-03 13:39:07 UTC (rev 2798)
+++ trunk/src/server/adminmanager.cpp	2009-01-03 14:01:59 UTC (rev 2799)
@@ -1949,8 +1949,6 @@
         gmSettings |= (1 << 8);
     if (client->GetActor()->givekillexp)
         gmSettings |= (1 << 9);
-    if (client->GetActor()->attackable)
-        gmSettings |= (1 << 10);
 
 
     psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings);
@@ -2066,7 +2064,6 @@
                                                 "infinitemana = %s\n"
                                                 "instantcast = %s\n"
                                                 "givekillexp = %s\n"
-                                                "attackable = %s",
                                                 (actor->GetInvincibility())?"on":"off",
                                                 (!actor->GetVisibility())?"on":"off",
                                                 (actor->GetViewAllObjects())?"on":"off",
@@ -2076,8 +2073,7 @@
                                                 (actor->questtester)?"on":"off",
                                                 (actor->infinitemana)?"on":"off",
                                                 (actor->instantcast)?"on":"off",
-                                                (actor->givekillexp)?"on":"off",
-                                                (actor->attackable)?"on":"off");
+                                                (actor->givekillexp)?"on":"off");
         return;
     }
     else if (data.attribute == "invincible" || data.attribute == "invincibility")
@@ -2200,18 +2196,6 @@
         else
             actor->givekillexp = onoff;
     }
-    else if (data.attribute == "attackable")
-    {
-        if (toggle)
-        {
-            actor->attackable = !actor->attackable;
-            onoff = actor->attackable;
-        }
-        else if (actor->attackable == onoff)
-            already = true;
-        else
-            actor->attackable = onoff;
-    }
     else if (!data.attribute.IsEmpty())
     {
         psserver->SendSystemInfo(me->clientnum, "%s is not a supported attribute", data.attribute.GetData() );


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

Revision: 2800
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2800&view=rev
Author:   weltall2
Date:     2009-01-03 23:28:24 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
a missing comma

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-03 14:01:59 UTC (rev 2799)
+++ trunk/src/server/adminmanager.cpp	2009-01-03 23:28:24 UTC (rev 2800)
@@ -2063,7 +2063,7 @@
                                                 "questtester = %s\n"
                                                 "infinitemana = %s\n"
                                                 "instantcast = %s\n"
-                                                "givekillexp = %s\n"
+                                                "givekillexp = %s\n",
                                                 (actor->GetInvincibility())?"on":"off",
                                                 (!actor->GetVisibility())?"on":"off",
                                                 (actor->GetViewAllObjects())?"on":"off",


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

Revision: 2820
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2820&view=rev
Author:   Vengeance2001
Date:     2009-01-06 04:28:29 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
Fix to cheat count reporting in admin info command.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-06 03:15:16 UTC (rev 2819)
+++ trunk/src/server/adminmanager.cpp	2009-01-06 04:28:29 UTC (rev 2820)
@@ -1748,6 +1748,7 @@
     time_t banTimeLeft;
     int daysLeft = 0, hoursLeft = 0, minsLeft = 0;
     bool advisorBanned = false;
+    int cheatCount = 0;
 
     if (target) // Online
     {
@@ -1774,6 +1775,7 @@
                 securityLevel.Format("%d",currSL);
 
             advisorBanned = targetclient->IsAdvisorBanned();
+            cheatCount = targetclient->GetDetectedCheatCount();
         }
         else // NPC
         {
@@ -1866,7 +1868,7 @@
 
         info.AppendFmt("total time connected is %1.1f hours", timeConnected );
 
-        info.AppendFmt(" has had %d cheats flagged.", client->GetDetectedCheatCount());
+        info.AppendFmt(" has had %d cheats flagged.", cheatCount);
 
         if(banned)
         {


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

Revision: 2881
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2881&view=rev
Author:   weltall2
Date:     2009-01-14 06:41:49 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
again that not ready code...

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-14 06:40:25 UTC (rev 2880)
+++ trunk/src/server/adminmanager.cpp	2009-01-14 06:41:49 UTC (rev 2881)
@@ -1953,8 +1953,6 @@
         gmSettings |= (1 << 8);
     if (client->GetActor()->givekillexp)
         gmSettings |= (1 << 9);
-    if (client->GetActor()->attackable)
-        gmSettings |= (1 << 10);
 
 
     psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings);
@@ -2069,8 +2067,7 @@
                                                 "questtester = %s\n"
                                                 "infinitemana = %s\n"
                                                 "instantcast = %s\n"
-                                                "givekillexp = %s\n"
-                                                "attackable = %s",
+                                                "givekillexp = %s\n",
                                                 (actor->GetInvincibility())?"on":"off",
                                                 (!actor->GetVisibility())?"on":"off",
                                                 (actor->GetViewAllObjects())?"on":"off",
@@ -2080,8 +2077,7 @@
                                                 (actor->questtester)?"on":"off",
                                                 (actor->infinitemana)?"on":"off",
                                                 (actor->instantcast)?"on":"off",
-                                                (actor->givekillexp)?"on":"off",
-                                                (actor->attackable)?"on":"off");
+                                                (actor->givekillexp)?"on":"off");
         return;
     }
     else if (data.attribute == "invincible" || data.attribute == "invincibility")


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

Revision: 2883
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2883&view=rev
Author:   weltall2
Date:     2009-01-14 06:52:19 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
again that not ready code...

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-14 06:42:48 UTC (rev 2882)
+++ trunk/src/server/adminmanager.cpp	2009-01-14 06:52:19 UTC (rev 2883)
@@ -2200,18 +2200,6 @@
         else
             actor->givekillexp = onoff;
     }
-    else if (data.attribute == "attackable")
-    {
-        if (toggle)
-        {
-            actor->attackable = !actor->attackable;
-            onoff = actor->attackable;
-        }
-        else if (actor->attackable == onoff)
-            already = true;
-        else
-            actor->attackable = onoff;
-    }
     else if (!data.attribute.IsEmpty())
     {
         psserver->SendSystemInfo(me->clientnum, "%s is not a supported attribute", data.attribute.GetData() );


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

Revision: 2887
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2887&view=rev
Author:   weltall2
Date:     2009-01-14 11:14:21 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
Made /inspect *usable*

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-14 09:18:20 UTC (rev 2886)
+++ trunk/src/server/adminmanager.cpp	2009-01-14 11:14:21 UTC (rev 2887)
@@ -6615,18 +6615,16 @@
     }
 
     // We got our target, now let's print it's inventory
-    csString message; // Dump all data formated in this
+    csString message; //stores the formatted item data
     bool npc = (target->GetClientID() == 0);
 
-    message.Format("Inventory for %s %s:\n",
-                   npc?"NPC":"player",
-                   target->GetName() );
+    //sends the heading
+    psserver->SendSystemInfo(me->clientnum,"Inventory for %s %s:\nTotal weight is %d / %d\nTotal money is %d\n",
+                    npc?"NPC":"player", target->GetName(),
+                    (int)target->GetCharacterData()->Inventory().GetCurrentTotalWeight(),
+                    (int)target->GetCharacterData()->Inventory().MaxWeight(),
+                    target->GetCharacterData()->Money().GetTotal() );
 
-    message.AppendFmt("Total weight is %d / %d\nTotal money is %d\n",
-                      (int)target->GetCharacterData()->Inventory().GetCurrentTotalWeight(),
-                      (int)target->GetCharacterData()->Inventory().MaxWeight(),
-                      target->GetCharacterData()->Money().GetTotal() );
-
     bool found = false;
     // Inventory indexes start at 1.  0 is reserved for the "NULL" item.
     for (size_t i = 1; i < target->GetCharacterData()->Inventory().GetInventoryIndexCount(); i++)
@@ -6635,7 +6633,7 @@
         if (item)
         {
             found = true;
-            message += item->GetName();
+            message = item->GetName();
             message.AppendFmt(" (%d/%d)", (int)item->GetItemQuality(), (int)item->GetMaxItemQuality());
             if (item->GetStackCount() > 1)
                 message.AppendFmt(" (x%u)", item->GetStackCount());
@@ -6647,15 +6645,13 @@
                 message.Append(slotname);
             else
                 message.AppendFmt("Bulk %d", item->GetLocInParent(true));
-            message += "\n";
+
+            psserver->SendSystemInfo(me->clientnum,message); //sends one line per item.
+                                                             //so we avoid to go over the packet limit
         }
     }
     if (!found)
-        message += "(none)\n";
-
-    message.Truncate(message.Length() -1);
-
-    psserver->SendSystemInfo(me->clientnum,message);
+        psserver->SendSystemInfo(me->clientnum,"(none)");
 }
 
 void AdminManager::RenameGuild(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client* client)


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

Revision: 2891
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2891&view=rev
Author:   weltall2
Date:     2009-01-15 09:06:15 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
allow devs to deputize how they want

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-15 08:54:40 UTC (rev 2890)
+++ trunk/src/server/adminmanager.cpp	2009-01-15 09:06:15 UTC (rev 2891)
@@ -1954,7 +1954,6 @@
     if (client->GetActor()->givekillexp)
         gmSettings |= (1 << 9);
 
-
     psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings);
     gmMsg.SendMessage();
 }
@@ -7277,7 +7276,9 @@
     }
 
     // Can only set others to a max of 1 level below own level (ex: GM4 can set someone to GM3)
-    int maxleveltoset = client->GetSecurityLevel() - 1;
+    // Devs can override this
+    int maxleveltoset = client->GetSecurityLevel() >= GM_DEVELOPER ?
+                        client->GetSecurityLevel() : client->GetSecurityLevel() - 1;
 
     int value;
 
@@ -7314,9 +7315,11 @@
         value = GM_LEVEL_1;
     else if (data.setting.StartsWith("gm",true) && data.setting.Length() == 3)
         value = atoi(data.setting.Slice(2,1)) + GM_LEVEL_0;
+    else if (data.setting == "developer")
+        value = GM_DEVELOPER;
     else
     {
-        psserver->SendSystemError(me->clientnum,"Valid settings are:  player, tester, GM, or reset.  GM levels may be specified:  GM1, ... GM5");
+        psserver->SendSystemError(me->clientnum,"Valid settings are:  player, tester, GM, developer or reset.  GM levels may be specified:  GM1, ... GM5");
         return;
     }
 


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

Revision: 2893
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2893&view=rev
Author:   weltall2
Date:     2009-01-15 09:27:55 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
removed some code for testing

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-15 09:19:51 UTC (rev 2892)
+++ trunk/src/server/adminmanager.cpp	2009-01-15 09:27:55 UTC (rev 2893)
@@ -8016,11 +8016,6 @@
     if(targetobject) //just to be sure
         psserver->SendSystemInfo(client->GetClientNum(),"Targeted: %s", targetobject->GetName());
         gemActor *myact = targetobject->GetActorPtr();
-        if(myact && myact->GetCharacterData())
-        {
-            myact->GetCharacterData()->SetKillExperience(10000);
-            printf("%d\n",myact->GetCharacterData()->GetKillExperience());
-        }
 }
 
 void AdminManager::DisableQuest(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client *client )


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

Revision: 2902
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2902&view=rev
Author:   weltall2
Date:     2009-01-18 10:08:56 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
Additional fix by kougaro for money not updating in clients

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-01-18 06:51:49 UTC (rev 2901)
+++ trunk/src/server/adminmanager.cpp	2009-01-18 10:08:56 UTC (rev 2902)
@@ -4047,6 +4047,7 @@
     Debug4(LOG_ADMIN,me->clientnum,  "Created %d %s for %s\n", quantity, data.item.GetDataSafe(), charData->GetCharName());
 
     charData->AdjustMoney(money, false);
+    psserver->GetCharManager()->SendPlayerMoney(client);
 
 }
 


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

Revision: 3095
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3095&view=rev
Author:   weltall2
Date:     2009-02-22 17:25:09 +0000 (Sun, 22 Feb 2009)

Log Message:
-----------
wrong file

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-02-22 17:19:38 UTC (rev 3094)
+++ trunk/src/server/adminmanager.cpp	2009-02-22 17:25:09 UTC (rev 3095)
@@ -1051,11 +1051,6 @@
         value = words.GetInt(3);
         return true;
     }
-    else if (command == "/forcepickup") //will pickup also no pickup items - be careful with this -
-    {
-        player = words[1];
-        return true;
-    }
     return false;
 }
 
@@ -1454,10 +1449,6 @@
     {
         AssignFaction(me, msg, data, client, targetclient);
     }
-    else if (data.command == "/forcepickup")
-    {
-        ForcePickup(me, msg, data, targetobject, client);
-    }
 }
 
 void AdminManager::HandleLoadQuest(psAdminCmdMessage& msg, AdminCmdData& data, Client* client)
@@ -1914,10 +1905,7 @@
         gmSettings |= (1 << 8);
     if (client->GetActor()->givekillexp)
         gmSettings |= (1 << 9);
-    if (client->GetActor()->attackable)
-        gmSettings |= (1 << 10);
 
-
     psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings);
     gmMsg.SendMessage();
 }
@@ -2030,8 +2018,7 @@
                                                 "questtester = %s\n"
                                                 "infinitemana = %s\n"
                                                 "instantcast = %s\n"
-                                                "givekillexp = %s\n"
-                                                "attackable = %s",
+                                                "givekillexp = %s\n",
                                                 (actor->GetInvincibility())?"on":"off",
                                                 (!actor->GetVisibility())?"on":"off",
                                                 (actor->GetViewAllObjects())?"on":"off",
@@ -2041,8 +2028,7 @@
                                                 (actor->questtester)?"on":"off",
                                                 (actor->infinitemana)?"on":"off",
                                                 (actor->instantcast)?"on":"off",
-                                                (actor->givekillexp)?"on":"off",
-                                                (actor->attackable)?"on":"off");
+                                                (actor->givekillexp)?"on":"off");
         return;
     }
     else if (data.attribute == "invincible" || data.attribute == "invincibility")
@@ -2165,18 +2151,6 @@
         else
             actor->givekillexp = onoff;
     }
-    else if (data.attribute == "attackable")
-    {
-        if (toggle)
-        {
-            actor->attackable = !actor->attackable;
-            onoff = actor->attackable;
-        }
-        else if (actor->attackable == onoff)
-            already = true;
-        else
-            actor->attackable = onoff;
-    }
     else if (!data.attribute.IsEmpty())
     {
         psserver->SendSystemInfo(me->clientnum, "%s is not a supported attribute", data.attribute.GetData() );
@@ -4849,9 +4823,6 @@
             info.assignedgm = (*rs)[i][6];
             info.online = (clients->Find(info.player) ? true : false);
 
-            if(!info.assignedgm.Length()) //put something in there so it looks nice
-                info.assignedgm = "";
-
             // Append to the message:
             petitions.Push(info);
         }
@@ -4947,9 +4918,6 @@
             info.assignedgm = (*rs)[i][6];
             info.online = (clients->Find(info.player) ? true : false);
 
-            if(!info.assignedgm.Length()) //put something in there so it looks nice
-                info.assignedgm = "";
-
             // Append to the message:
             petitions.Push(info);
         }
@@ -6614,7 +6582,7 @@
     bool npc = (target->GetClientID() == 0);
 
     //sends the heading
-    psserver->SendSystemInfo(me->clientnum,"Inventory for %s %s:\nTotal weight is %d / %d\nTotal money is %d",
+    psserver->SendSystemInfo(me->clientnum,"Inventory for %s %s:\nTotal weight is %d / %d\nTotal money is %d\n",
                     npc?"NPC":"player", target->GetName(),
                     (int)target->GetCharacterData()->Inventory().GetCurrentTotalWeight(),
                     (int)target->GetCharacterData()->Inventory().MaxWeight(),
@@ -8088,15 +8056,3 @@
 
     AdjustFactionStandingOfTarget(client->GetClientNum(), target, data.name, data.value);
 }
-
-void AdminManager::ForcePickup(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, gemObject* targetobject, Client *client )
-{
-    if ((!data.player || !data.player.Length()) && !targetobject)
-    {
-        psserver->SendSystemInfo(client->GetClientNum(),"Syntax: \"/forcepickup [me/target/eid/pid/area/name]\"");
-        return;
-    }
-    if(targetobject) //just to be sure
-        psserver->SendSystemInfo(client->GetClientNum(),"Targeted: %s", targetobject->GetName());
-        gemActor *myact = targetobject->GetActorPtr();
-}


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

Revision: 3334
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3334&view=rev
Author:   weltall2
Date:     2009-03-28 09:00:10 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
Escaped name of the player in /teleport ... restore and warning in /warning to avoid sql injection fixing PS#2116 - vulnerability against sql injections 

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-03-27 17:00:15 UTC (rev 3333)
+++ trunk/src/server/adminmanager.cpp	2009-03-28 09:00:10 UTC (rev 3334)
@@ -2394,8 +2394,13 @@
             return;
         }
 
+        
+        //escape the player name so it's not possible to do nasty things
+        csString escapedName;
+        db->Escape( escapedName, data.name.GetDataSafe() );
+
         sql.AppendFmt("update characters set loc_x=%10.2f, loc_y=%10.2f, loc_z=%10.2f, loc_yrot=%10.2f, loc_sector_id=%u, loc_instance=%u where name='%s'",
-            myPoint.x, myPoint.y, myPoint.z, yRot, mysectorinfo->uid, client->GetActor()->GetInstance(), data.player.GetData());
+            myPoint.x, myPoint.y, myPoint.z, yRot, mysectorinfo->uid, client->GetActor()->GetInstance(), escapedName.GetDataSafe());
 
         if (db->CommandPump(sql) != 1)
         {
@@ -4545,8 +4550,13 @@
 
     // This message will be in big red letters on their screen
     psserver->SendSystemError(target->GetClientNum(), data.reason);
-    db->CommandPump("INSERT INTO warnings VALUES(%u, '%s', NOW(), '%s')", target->GetAccountID().Unbox(), client->GetName(), data.reason.GetData());
 
+    //escape the warning so it's not possible to do nasty things
+    csString escapedReason;
+    db->Escape( escapedReason, data.reason.GetDataSafe() );
+
+    db->CommandPump("INSERT INTO warnings VALUES(%u, '%s', NOW(), '%s')", target->GetAccountID().Unbox(), client->GetName(), escapedReason.GetDataSafe());
+
     psserver->SendSystemInfo(client->GetClientNum(), "You warned '%s': " + data.reason, target->GetName());
 }
 


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

Revision: 3335
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3335&view=rev
Author:   weltall2
Date:     2009-03-28 10:43:27 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
fixed a missing line for /set list

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-03-28 09:00:10 UTC (rev 3334)
+++ trunk/src/server/adminmanager.cpp	2009-03-28 10:43:27 UTC (rev 3335)
@@ -2030,6 +2030,7 @@
                                                 (!actor->GetFiniteInventory())?"on":"off",
                                                 (actor->questtester)?"on":"off",
                                                 (actor->infinitemana)?"on":"off",
+                                                (actor->instantcast)?"on":"off",
                                                 (actor->givekillexp)?"on":"off",
                                                 (actor->attackable)?"on":"off");
         return;


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

Revision: 3415
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3415&view=rev
Author:   weltall2
Date:     2009-04-07 19:58:39 +0000 (Tue, 07 Apr 2009)

Log Message:
-----------
wrong variable

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-04-07 18:25:40 UTC (rev 3414)
+++ trunk/src/server/adminmanager.cpp	2009-04-07 19:58:39 UTC (rev 3415)
@@ -2395,12 +2395,11 @@
             return;
         }
 
-        
         //escape the player name so it's not possible to do nasty things
         csString escapedName;
-        db->Escape( escapedName, data.name.GetDataSafe() );
+        db->Escape( escapedName, data.player.GetDataSafe() );
 
-        sql.AppendFmt("update characters set loc_x=%10.2f, loc_y=%10.2f, loc_z=%10.2f, loc_yrot=%10.2f, loc_sector_id=%u, loc_instance=%u where name='%s'",
+        sql.AppendFmt("update characters set loc_x=%10.2f, loc_y=%10.2f, loc_z=%10.2f, loc_yrot=%10.2f, loc_sector_id=%u, loc_instance=%u where name=\"%s\"",
             myPoint.x, myPoint.y, myPoint.z, yRot, mysectorinfo->uid, client->GetActor()->GetInstance(), escapedName.GetDataSafe());
 
         if (db->CommandPump(sql) != 1)


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

Revision: 3458
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3458&view=rev
Author:   weltall2
Date:     2009-04-15 08:35:50 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
what is vlaid?

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-04-15 04:29:15 UTC (rev 3457)
+++ trunk/src/server/adminmanager.cpp	2009-04-15 08:35:50 UTC (rev 3458)
@@ -1657,9 +1657,9 @@
               info += ", has flags:";
 
               if ( flags & PSITEM_FLAG_CRAFTER_ID_IS_VALID )
-                  info += " 'vlaid crafter id'";
+                  info += " 'valid crafter id'";
               if ( flags & PSITEM_FLAG_GUILD_ID_IS_VALID )
-                  info += " 'vlaid guild id'";
+                  info += " 'valid guild id'";
               if ( flags & PSITEM_FLAG_UNIQUE_ITEM )
                   info += " 'unique'";
               if ( flags & PSITEM_FLAG_USES_BASIC_ITEM )


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

Revision: 3653
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3653&view=rev
Author:   weltall2
Date:     2009-05-10 08:23:06 +0000 (Sun, 10 May 2009)

Log Message:
-----------
Fix for PS#2480 - setskill has bad fallback defaults by setting -2 as invalid value and sending out the quick help of the function in case a value isn't specified patch by aiken

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-05-10 08:15:30 UTC (rev 3652)
+++ trunk/src/server/adminmanager.cpp	2009-05-10 08:23:06 UTC (rev 3653)
@@ -640,7 +640,7 @@
         if (words.GetCount() >= 4)
             value = words.GetInt(3);
         else
-            value = 100;
+            value = -2;
         return true;
     }
     else if (command == "/set")
@@ -6423,7 +6423,7 @@
 
 void AdminManager::SetSkill(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client* client, Client *target)
 {
-    if (data.skill.IsEmpty())
+    if (data.skill.IsEmpty() || data.value == -2)
     {
         psserver->SendSystemError(me->clientnum, "Syntax: /setskill [target] [skill|'all'] [value|-1]");
         return;


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

Revision: 3824
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3824&view=rev
Author:   weltall2
Date:     2009-06-08 07:21:38 +0000 (Mon, 08 Jun 2009)

Log Message:
-----------
unfinished code

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-06-08 06:26:23 UTC (rev 3823)
+++ trunk/src/server/adminmanager.cpp	2009-06-08 07:21:38 UTC (rev 3824)
@@ -2510,7 +2510,7 @@
     }
 
     if ( dynamic_cast<gemActor*>(subject) ) // Record old location of actor, for undo
-        ((gemActor*)subject)->SetPrevTeleportLocation(oldpos, oldyrot, oldsector, oldInstance);
+        ((gemActor*)subject)->SetPrevTeleportLocation(oldpos, oldyrot, oldsector);
 
     // Send explanations
     if (subject->GetClientID() != client->GetClientNum())


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

Revision: 3844
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3844&view=rev
Author:   weltall2
Date:     2009-06-14 03:44:13 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
why move+setinstance when there is setposition which does the same and also saves the item?

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-06-13 21:18:41 UTC (rev 3843)
+++ trunk/src/server/adminmanager.cpp	2009-06-14 03:44:13 UTC (rev 3844)
@@ -3851,8 +3851,7 @@
         }
 
         // Move the item
-        item->SetInstance(instance);
-        item->Move(pos,yrot,sector);
+        item->SetPosition(pos, yrot, sector, instance);
 
         // Check to see if this client has the admin level to move this spawn point
         if ( item->GetItem()->GetScheduledItem() && extras )


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

Revision: 3854
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3854&view=rev
Author:   weltall2
Date:     2009-06-22 06:00:11 +0000 (Mon, 22 Jun 2009)

Log Message:
-----------
fixed PS#2587 - Buddy list edits will not delete after name change patch by Aiken

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-06-20 16:03:43 UTC (rev 3853)
+++ trunk/src/server/adminmanager.cpp	2009-06-22 06:00:11 UTC (rev 3854)
@@ -5589,14 +5589,14 @@
         unsigned int buddyid;
 
         //If the target is offline then we select all the players online that have him in the buddylist
-        Result result2(db->Select("SELECT player_id FROM buddy_list WHERE player_buddy='%u'", pid.Unbox()));
+        Result result2(db->Select("SELECT character_id FROM character_relationships WHERE relationship_type = 'buddy' and related_id = '%u'", pid.Unbox()));
 
         if (result2.IsValid())
         {
             for(unsigned long j=0; j<result2.Count();j++)
             {
                 iResultRow& row = result2[j];
-                buddyid = row.GetUInt32("player_id");
+                buddyid = row.GetUInt32("character_id");
                 buddy = clients->FindPlayer(buddyid);
                 if (buddy && buddy->IsReady())
                 {


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

Revision: 3885
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3885&view=rev
Author:   aresilek
Date:     2009-07-02 02:54:20 +0000 (Thu, 02 Jul 2009)

Log Message:
-----------
- Ban/unban fixes.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-07-01 22:35:17 UTC (rev 3884)
+++ trunk/src/server/adminmanager.cpp	2009-07-02 02:54:20 UTC (rev 3885)
@@ -5752,23 +5752,28 @@
         if (secs < year)
         {
             csString reason;
-            reason.Format("You were banned from the server by a GM for %d minutes, %d hours and %d days. Reason: %s",
-                          data.mins, data.hours, data.days, data.reason.GetData() );
+            if (secs == twodays)
+                reason.Format("You were banned from the server by a GM for two days. Reason: %s", data.reason.GetData() );
+            else
+                reason.Format("You were banned from the server by a GM for %d minutes, %d hours and %d days. Reason: %s",
+                              data.mins, data.hours, data.days, data.reason.GetData() );
 
             psserver->RemovePlayer(target->GetClientNum(),reason);
         }
         else
-            psserver->RemovePlayer(target->GetClientNum(),"You were banned from the server by a GM. Reason: " + data.reason);
+            psserver->RemovePlayer(target->GetClientNum(),"You were banned from the server by a GM for a year. Reason: " + data.reason);
     }
 
     csString notify;
     notify.Format("You%s banned '%s' off the server for ", (target)?" kicked and":"", user.GetData() );
     if (secs == year)
         notify.Append("a year.");
+    else if (secs == twodays)
+        notify.Append("two days.");
     else
         notify.AppendFmt("%d minutes, %d hours and %d days.", data.mins, data.hours, data.days );
     if (data.banIP)
-      notify.AppendFmt(" They will also be banned by IP range.");
+        notify.AppendFmt(" They will also be banned by IP range.");
 
     // Finally, notify the client who kicked the target
     psserver->SendSystemInfo(me->clientnum,notify);
@@ -5817,7 +5822,7 @@
 
     // How long is the ban?
     result = db->Select("SELECT * FROM bans WHERE account = '%u' LIMIT 1",accountId.Unbox());
-    if (!result.IsValid()){
+    if (!result.IsValid() || !result.Count()){
         psserver->SendSystemError(me->clientnum, "%s is not banned", user.GetData() );
         return;
     }


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

Revision: 4050
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4050&view=rev
Author:   weltall2
Date:     2009-07-17 12:18:19 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
improved a db command and allowed to complete the master quest of an offline player

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-07-17 11:30:15 UTC (rev 4049)
+++ trunk/src/server/adminmanager.cpp	2009-07-17 12:18:19 UTC (rev 4050)
@@ -7663,7 +7663,28 @@
         }
         else
         {
-            psserver->SendSystemError(me->clientnum,"Unable to complete quests: player %s is offline!", name.GetData());
+            if(!quest->GetParentQuest()) //only allow to complete main quest entries (no steps)
+            {
+                if(db->CommandPump("insert into character_quests "
+                    "(player_id, assigner_id, quest_id, "
+                    "status, remaininglockout, last_response, last_response_npc_id) "
+                    "values (%d, %d, %d, '%c', %d, %d, %d) "
+                    "ON DUPLICATE KEY UPDATE "
+                    "status='%c',remaininglockout=%ld,last_response=%ld,last_response_npc_id=%ld;",
+                    pid.Unbox(), 0, quest->GetID(), 'C', 0, -1, 0, 'C', 0, -1, 0))
+                {
+                    psserver->SendSystemInfo(me->clientnum, "Quest %s completed for %s!", data.text.GetData(), name.GetData());
+                }
+                else
+                {
+                    psserver->SendSystemError(me->clientnum,"Unable to complete quest of offline player %s!", name.GetData());
+                }
+                
+            }
+            else
+            {
+                psserver->SendSystemError(me->clientnum,"Unable to complete substeps: player %s is offline!", name.GetData());
+            }
         }
     }
     else if (data.subCmd == "discard")
@@ -7695,8 +7716,8 @@
         }
         else //the player is offline so we have to hit the database
         {
-            Result result(db->Select("DELETE FROM character_quests WHERE player_id=%u AND quest_id=%u",pid.Unbox(), quest->GetID()));
-            if (result.IsValid())
+            
+            if (db->CommandPump("DELETE FROM character_quests WHERE player_id=%u AND quest_id=%u",pid.Unbox(), quest->GetID()))
             {
                 psserver->SendSystemInfo(me->clientnum, "Quest %s discarded for %s!", data.text.GetData(), name.GetData());
             }


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

Revision: 4253
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4253&view=rev
Author:   weltall2
Date:     2009-08-25 18:10:45 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
fixed PS#2323 - giveitem command doesn't say how many given 

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-08-25 17:48:20 UTC (rev 4252)
+++ trunk/src/server/adminmanager.cpp	2009-08-25 18:10:45 UTC (rev 4253)
@@ -6348,9 +6348,12 @@
                     item->GetStackCount(), data.value);
             return;
         }
-
+        
         bool wasEquipped = item->IsEquipped();
-
+        
+        //we need to get this before the items are stacked in the destination inventory
+        int StackCount = item->GetStackCount();
+        
         // Now here we handle the target machine
         InventoryTransaction trgtTran(&targetchar->Inventory());
 
@@ -6364,7 +6367,7 @@
 
         // Inform the GM doing the transfer
         psserver->SendSystemOK(me->clientnum,
-                "%u %s transferred from %s's %s to %s", item->GetStackCount(), item->GetName(),
+                "%u %s transferred from %s's %s to %s", StackCount, item->GetName(),
                 source->GetActor()->GetName(), wasEquipped ? "equipment"
                         : "inventory", target->GetActor()->GetName());
 
@@ -6372,7 +6375,7 @@
         if (target->GetClientNum() != me->clientnum)
         {
             psserver->SendSystemOK(target->GetClientNum(),
-                    "You were given %u %s by GM %s.", item->GetStackCount(), item->GetName(),
+                    "You were given %u %s by GM %s.", StackCount, item->GetName(),
                     source->GetActor()->GetName());
         }
 
@@ -6380,7 +6383,7 @@
         if (source->GetClientNum() != me->clientnum)
         {
             psserver->SendSystemResult(source->GetClientNum(),
-                    "%u %s was taken by GM %s.", item->GetStackCount(), item->GetName(),
+                    "%u %s was taken by GM %s.", StackCount, item->GetName(),
                     target->GetActor()->GetName());
         }
 


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

Revision: 4261
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4261&view=rev
Author:   weltall2
Date:     2009-08-26 07:26:18 +0000 (Wed, 26 Aug 2009)

Log Message:
-----------
better error handling for /morph fixing PS#3112 - Morph commands need better error handling

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-08-26 06:32:07 UTC (rev 4260)
+++ trunk/src/server/adminmanager.cpp	2009-08-26 07:26:18 UTC (rev 4261)
@@ -7337,7 +7337,10 @@
     }
 
     if(targetclient != client && !psserver->CheckAccess(client, "morph others"))
+    {
+        psserver->SendSystemError(me->clientnum,"You don't have permission to change mesh of %s!", targetclient->GetName());
         return;
+    }
 
     gemActor* target = targetclient->GetActor();
 
@@ -7348,6 +7351,11 @@
     }
     else
     {
+        if(!CacheManager::GetSingleton().GetRaceInfoByMeshName(data.mesh.GetData()))
+        {
+            psserver->SendSystemError(me->clientnum, "Unable to override mesh for %s to %s. Race not found.", targetclient->GetName(), data.mesh.GetData());
+            return;
+        }
         psserver->SendSystemInfo(me->clientnum, "Overriding mesh for %s to %s", targetclient->GetName(), data.mesh.GetData());
         target->GetOverridableMesh().Override(MORPH_FAKE_ACTIVESPELL, data.mesh);
     }


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

Revision: 4311
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4311&view=rev
Author:   weltall2
Date:     2009-09-05 10:27:19 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
committed a fix for PS#714 - better way to list /quest results 

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-09-04 09:45:11 UTC (rev 4310)
+++ trunk/src/server/adminmanager.cpp	2009-09-05 10:27:19 UTC (rev 4311)
@@ -7811,7 +7811,9 @@
             for (size_t i = 0; i < quests.GetSize(); i++)
             {
                 QuestAssignment *currassignment = quests.Get(i);
-                psserver->SendSystemInfo(me->clientnum, "Quest name: %s. Status: %c", currassignment->GetQuest()->GetName(), currassignment->status);
+                csString QuestName = currassignment->GetQuest()->GetName();
+                if(!data.text.Length() || QuestName.StartsWith(data.text,true)) //check if we are searching a particular quest
+                    psserver->SendSystemInfo(me->clientnum, "Quest name: %s. Status: %c", QuestName.GetData(), currassignment->status);
             }
         }
         else //our target is offline access the db then...
@@ -7824,7 +7826,9 @@
                 {
                     //get the quest data from the cache so we can print it's name without accessing the db again
                     psQuest* currQuest = CacheManager::GetSingleton().GetQuestByID(result[currResult].GetUInt32("quest_id"));
-                    psserver->SendSystemInfo(me->clientnum, "Quest name: %s. Status: %s", currQuest->GetName(), result[currResult]["status"]);
+                    csString QuestName = currQuest->GetName();
+                    if(!data.text.Length() || QuestName.StartsWith(data.text,true)) //check if we are searching a particular quest
+                        psserver->SendSystemInfo(me->clientnum, "Quest name: %s. Status: %s", QuestName.GetData(), result[currResult]["status"]);
                 }
             }
         }


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

Revision: 4346
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4346&view=rev
Author:   aresilek
Date:     2009-09-11 03:33:07 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
- Fixed PS#2378 - setskill -1 does not return boosts

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-09-10 23:37:46 UTC (rev 4345)
+++ trunk/src/server/adminmanager.cpp	2009-09-11 03:33:07 UTC (rev 4346)
@@ -6554,7 +6554,24 @@
 
             if(data.value == -1)
             {
-                psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u", skill->name.GetDataSafe(), target->GetName(), old_value);
+                PSITEMSTATS_STAT stat = skillToStat(skill->id);
+                if (stat != PSITEMSTATS_STAT_NONE)
+                {
+                    //Handle stats differently to pickup buffs/debuffs
+                    int base = pchar->Stats()[stat].Base();
+                    int current = pchar->Stats()[stat].Current();
+                    if (base == current)
+                        psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u", skill->name.GetDataSafe(), target->GetName(), base);
+                    else
+                        psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u (%u)", skill->name.GetDataSafe(), target->GetName(), base, current);
+                } else {
+                    int base = pchar->Skills().GetSkillRank(skill->id).Base();
+                    int current = pchar->Skills().GetSkillRank(skill->id).Current();
+                    if (base == current)
+                        psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u", skill->name.GetDataSafe(), target->GetName(), base);
+                    else
+                        psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u (%u)", skill->name.GetDataSafe(), target->GetName(), base, current);
+                }
             }
             else
             {
@@ -6584,7 +6601,24 @@
         unsigned int old_value = pchar->Skills().GetSkillRank(skill->id).Current();
         if (data.value == -1)
         {
-            psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u",skill->name.GetDataSafe(), target->GetName(), old_value);
+            PSITEMSTATS_STAT stat = skillToStat(skill->id);
+            if (stat != PSITEMSTATS_STAT_NONE)
+            {
+                //Handle stats differently to pickup buffs/debuffs
+                int base = pchar->Stats()[stat].Base();
+                int current = pchar->Stats()[stat].Current();
+                if (base == current)
+                    psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u", skill->name.GetDataSafe(), target->GetName(), base);
+                else
+                    psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u (%u)", skill->name.GetDataSafe(), target->GetName(), base, current);
+            } else {
+                int base = pchar->Skills().GetSkillRank(skill->id).Base();
+                int current = pchar->Skills().GetSkillRank(skill->id).Current();
+                if (base == current)
+                    psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u", skill->name.GetDataSafe(), target->GetName(), base);
+                else
+                    psserver->SendSystemInfo(me->clientnum, "Current '%s' of '%s' is %u (%u)", skill->name.GetDataSafe(), target->GetName(), base, current);
+            }
             return;
         }
         else if (skill->category == PSSKILLS_CATEGORY_STATS && (value < 0 || value > MAX_STAT))


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

Revision: 4441
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4441&view=rev
Author:   weltall2
Date:     2009-09-18 22:14:03 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
fixes for removal of regions

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-09-18 22:05:05 UTC (rev 4440)
+++ trunk/src/server/adminmanager.cpp	2009-09-18 22:14:03 UTC (rev 4441)
@@ -1623,7 +1623,7 @@
 void AdminManager::GetInfo(MsgEntry* me,psAdminCmdMessage& msg, AdminCmdData& data,Client *client, gemObject* target)
 {
     EID entityId;
-    csString sectorName, regionName;
+    csString sectorName;
     InstanceID instance = DEFAULT_INSTANCE;
     float loc_x = 0.0f, loc_y = 0.0f, loc_z = 0.0f, loc_yrot = 0.0f;
     int degrees = 0;
@@ -1643,8 +1643,6 @@
         instance = target->GetInstance();
 
         sectorName = (sector) ? sector->QueryObject()->GetName() : "(null)";
-        
-        regionName = (sector) ? sector->QueryObject()->GetObjectParent()->GetName() : "(null)";
     }
 
     if (target && target->GetALPtr()) // Action location
@@ -1658,10 +1656,9 @@
         psActionLocation *action = item->GetAction();
 
         csString info;
-        info.Format("ActionLocation: %s is at region %s, position (%1.2f, %1.2f, %1.2f) "
+        info.Format("ActionLocation: %s is at position (%1.2f, %1.2f, %1.2f) "
                     "angle: %d in sector: %s, instance: %d with ",
                     item->GetName(),
-                    regionName.GetData(),
                     loc_x, loc_y, loc_z, degrees,
                     sectorName.GetData(),
                     instance);
@@ -1686,12 +1683,11 @@
           if ( item->GetStackCount() > 1 )
               info.AppendFmt("(x%d) ", item->GetStackCount() );
 
-          info.AppendFmt("with item stats ID %u, item ID %u, and %s, is at region %s, position (%1.2f, %1.2f, %1.2f) "
+          info.AppendFmt("with item stats ID %u, item ID %u, and %s, is at position (%1.2f, %1.2f, %1.2f) "
                          "angle: %d in sector: %s, instance: %d",
                         item->GetBaseStats()->GetUID(),
                         item->GetUID(),
                         ShowID(entityId),
-                        regionName.GetData(),
                         loc_x, loc_y, loc_z, degrees,
                         sectorName.GetData(),
                         instance);
@@ -1789,12 +1785,11 @@
         {
             name = target->GetName();
             psserver->SendSystemInfo(client->GetClientNum(),
-                "NPC: <%s, %s, %s> is at region %s, position (%1.2f, %1.2f, %1.2f) "
+                "NPC: <%s, %s, %s> is at position (%1.2f, %1.2f, %1.2f) "
                 "angle: %d in sector: %s, instance: %d, and has been active for %1.1f hours.",
                 name.GetData(),
                 ShowID(playerId),
                 ShowID(entityId),
-                regionName.GetData(),
                 loc_x,
                 loc_y,
                 loc_z,
@@ -1872,8 +1867,8 @@
         else
             info.Append("is offline, ");
 
-        info.AppendFmt("at region %s, position (%1.2f, %1.2f, %1.2f) angle: %d in sector: %s, instance: %d, ",
-                regionName.GetData(), loc_x, loc_y, loc_z, degrees, sectorName.GetData(), instance);
+        info.AppendFmt("at position (%1.2f, %1.2f, %1.2f) angle: %d in sector: %s, instance: %d, ",
+                loc_x, loc_y, loc_z, degrees, sectorName.GetData(), instance);
 
         info.AppendFmt("total time connected is %1.1f hours", timeConnected );
 


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

Revision: 4582
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4582&view=rev
Author:   weltall2
Date:     2009-09-28 13:19:54 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
added output of ban reason to /info

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-09-28 06:20:14 UTC (rev 4581)
+++ trunk/src/server/adminmanager.cpp	2009-09-28 13:19:54 UTC (rev 4582)
@@ -1756,6 +1756,7 @@
     bool banned = false;
     time_t banTimeLeft;
     int daysLeft = 0, hoursLeft = 0, minsLeft = 0;
+    csString BanReason;
     bool advisorBanned = false;
     int cheatCount = 0;
 
@@ -1846,6 +1847,7 @@
         time_t now = time(0);
         if(ban->end > now)
         {
+            BanReason = ban->reason;
             banTimeLeft = ban->end - now;
             banned = true;
 
@@ -1882,7 +1884,7 @@
 
         if(banned)
         {
-            info.AppendFmt(" The player's account is banned! Time left: %d days, %d hours, %d minutes.", daysLeft, hoursLeft, minsLeft);
+            info.AppendFmt(" The player's account is banned for %s! Time left: %d days, %d hours, %d minutes.", BanReason.GetDataSafe(), daysLeft, hoursLeft, minsLeft);
         }
 
         if (advisorBanned)


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

Revision: 4692
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4692&view=rev
Author:   weltall2
Date:     2009-10-25 09:44:18 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
put a more valid default for rain stop and allowed to define fade in stopping by doing /rain sector 0 0 <fade time>

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-10-25 06:28:40 UTC (rev 4691)
+++ trunk/src/server/adminmanager.cpp	2009-10-25 09:44:18 UTC (rev 4692)
@@ -7063,7 +7063,7 @@
     }
 
     // Stop raining
-    if (data.interval == -3 || (data.interval == 0 && data.rainDrops == 0 && data.fade == 0 ))
+    if (data.interval == -3 || (data.interval == 0 && data.rainDrops == 0))
     {
         if( !sectorinfo->is_raining) //If it is not raining already then you don't stop anything.
         {
@@ -7077,7 +7077,7 @@
             // queue the event
             psserver->GetWeatherManager()->QueueNextEvent(0, psWeatherMessage::RAIN,
                                                       0, 0,
-                                                      0, data.sector, sectorinfo);
+                                                      data.fade, data.sector, sectorinfo);
          }
     }
     else
@@ -7113,7 +7113,7 @@
     }
 
     // Stop snowing
-    if (data.interval == -3 || (data.interval == 0 && data.fade == 0 && data.rainDrops == 0 ))
+    if (data.interval == -3 || (data.interval == 0 && data.fade == 0))
     {
         if( !sectorinfo->is_snowing) //If it is not snowing already then you don't stop anything.
         {
@@ -7127,7 +7127,7 @@
             // queue the event
             psserver->GetWeatherManager()->QueueNextEvent(0, psWeatherMessage::SNOW,
                                                       0, 0,
-                                                      0, data.sector, sectorinfo);
+                                                      data.fade, data.sector, sectorinfo);
          }
     }
     else


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

Revision: 5081
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5081&view=rev
Author:   weltall2
Date:     2009-12-28 15:48:47 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
fixed signed/unsigned comparison

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2009-12-28 15:01:50 UTC (rev 5080)
+++ trunk/src/server/adminmanager.cpp	2009-12-28 15:48:47 UTC (rev 5081)
@@ -7447,7 +7447,7 @@
             //from races with same mesh name but different texture for now
             //but till we have an idea on how to allow the user to select them let's leave like this to
             //have at least a basic listing
-            for(int i = 0; i < CacheManager::GetSingleton().GetRaceInfoCount(); i++)
+            for(size_t i = 0; i < CacheManager::GetSingleton().GetRaceInfoCount(); i++)
                 dirNames.PushSmart(CacheManager::GetSingleton().GetRaceInfoByIndex(i)->GetMeshName());
 
             // Make alphabetized list


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

Revision: 5394
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5394&view=rev
Author:   aresilek
Date:     2010-01-27 01:35:45 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
- Added whether a player is banned by IP to /info.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-01-26 19:42:22 UTC (rev 5393)
+++ trunk/src/server/adminmanager.cpp	2010-01-27 01:35:45 UTC (rev 5394)
@@ -1770,6 +1770,7 @@
     int daysLeft = 0, hoursLeft = 0, minsLeft = 0;
     csString BanReason;
     bool advisorBanned = false;
+    bool ipBanned = false;
     int cheatCount = 0;
 
     if (target) // Online
@@ -1862,6 +1863,7 @@
             BanReason = ban->reason;
             banTimeLeft = ban->end - now;
             banned = true;
+            ipBanned = ban->banIP;
 
             banTimeLeft = banTimeLeft / 60; // don't care about seconds
             minsLeft = banTimeLeft % 60;
@@ -1897,6 +1899,9 @@
         if(banned)
         {
             info.AppendFmt(" The player's account is banned for %s! Time left: %d days, %d hours, %d minutes.", BanReason.GetDataSafe(), daysLeft, hoursLeft, minsLeft);
+
+            if (ipBanned)
+                info.Append(" The player's ip range is banned as well.");
         }
 
         if (advisorBanned)


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

Revision: 5459
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5459&view=rev
Author:   aresilek
Date:     2010-02-06 02:52:04 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
- Fixed some PID: while offline bugs.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-02-06 01:30:35 UTC (rev 5458)
+++ trunk/src/server/adminmanager.cpp	2010-02-06 02:52:04 UTC (rev 5459)
@@ -1822,9 +1822,28 @@
     }
     else // Offline
     {
-        Result result(db->Select("SELECT c.id as 'id', c.name as 'name', lastname, account_id, time_connected_sec, loc_instance, "
+        PID pid;
+        Result result;
+        if (data.player.StartsWith("pid:",true) && data.player.Length() > 4)
+        {
+            pid = PID(strtoul(data.player.Slice(4).GetData(), NULL, 10));
+
+            if (!pid.IsValid())
+            {
+                 psserver->SendSystemError(client->GetClientNum(), "%s is invalid!",data.player.GetData() );
+                 return;
+            }
+
+            result = db->Select("SELECT c.id as 'id', c.name as 'name', lastname, account_id, time_connected_sec, loc_instance, "
                 "s.name as 'sector', loc_x, loc_y, loc_z, loc_yrot, advisor_ban from characters c join sectors s on s.id = loc_sector_id "
-                "join accounts a on a.id = account_id where c.name='%s'", data.player.GetData()));
+                "join accounts a on a.id = account_id where c.id=%u", pid.Unbox());
+        }
+        else
+        {
+            result = db->Select("SELECT c.id as 'id', c.name as 'name', lastname, account_id, time_connected_sec, loc_instance, "
+                "s.name as 'sector', loc_x, loc_y, loc_z, loc_yrot, advisor_ban from characters c join sectors s on s.id = loc_sector_id "
+                "join accounts a on a.id = account_id where c.name='%s'", data.player.GetData());
+        }
 
         if (!result.IsValid() || result.Count() == 0)
         {
@@ -2397,6 +2416,7 @@
 
     bool married;
     csString spouse;
+    csString playerStr = data.player;
 
     if(player)
     {
@@ -2414,26 +2434,50 @@
     {
         // player is offline - hit the db
         Result result;
+        PID charID;
         if(data.player.StartsWith("pid:",true) && data.player.Length() > 4) //check if pid was provided or only name
-            result = db->Select("SELECT id FROM characters WHERE name='%i'", atoi( data.player.Slice(4).GetData())); // FIXME: I think this is wrong.
+        {
+            charID = PID(strtoul(data.player.Slice(4).GetData(), NULL, 10));
+
+            if (!charID.IsValid())
+            {
+                // invalid PID
+                psserver->SendSystemInfo(me->clientnum, "%s is invalid!", data.player.GetData());
+                return;
+            }
+
+            result = db->Select("SELECT name FROM characters WHERE id = %u", charID.Unbox()); // Verify char exists and get name
+
+            if(!result.IsValid() || result.Count() == 0)
+            {
+                // there's no character with given PID
+                psserver->SendSystemInfo(me->clientnum, "There's no character with %s!", data.player.GetData());
+                return;
+            }
+
+            iResultRow& row = result[0];
+            playerStr = row["name"];
+        }
         else
+        {
             result = db->Select("SELECT id FROM characters WHERE name='%s'", data.player.GetData());
 
-        if(!result.IsValid() || result.Count() == 0)
-        {
-            // there's no character with given name
-            psserver->SendSystemInfo(me->clientnum, "There's no character named %s!", data.player.GetData());
-            return;
+            if(!result.IsValid() || result.Count() == 0)
+            {
+                // there's no character with given name
+                psserver->SendSystemInfo(me->clientnum, "There's no character named %s!", data.player.GetData());
+                return;
+            }
+
+            iResultRow& row = result[0];
+            charID = PID(row.GetInt("id"));
         }
 
-        iResultRow& row = result[0];
-        int charID = row.GetInt("id");
-
         result = db->Select(
                 "SELECT name FROM characters WHERE id = "
                 "("
-                "   SELECT related_id FROM character_relationships WHERE character_id = %d AND relationship_type='spouse'"
-                ")", charID);
+                "   SELECT related_id FROM character_relationships WHERE character_id = %u AND relationship_type='spouse'"
+                ")", charID.Unbox());
 
         married = (result.IsValid() && result.Count() != 0);
         if(married)
@@ -2454,17 +2498,17 @@
         // character is married
         if(psserver->GetCharManager()->HasConnected(spouse))
         {
-            psserver->SendSystemInfo(me->clientnum, "%s is married to %s, who was last online less than two months ago.", data.player.GetData(), spouse.GetData());
+            psserver->SendSystemInfo(me->clientnum, "%s is married to %s, who was last online less than two months ago.", playerStr.GetData(), spouse.GetData());
         }
         else
         {
-            psserver->SendSystemInfo(me->clientnum, "%s is married to %s, who was last online more than two months ago.", data.player.GetData(), spouse.GetData());
+            psserver->SendSystemInfo(me->clientnum, "%s is married to %s, who was last online more than two months ago.", playerStr.GetData(), spouse.GetData());
         }
     }
     else
     {
         // character isn't married
-        psserver->SendSystemInfo(me->clientnum, "%s is not married.", data.player.GetData());
+        psserver->SendSystemInfo(me->clientnum, "%s is not married.", playerStr.GetData());
     }
 }
 


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

Revision: 5603
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5603&view=rev
Author:   weltall2
Date:     2010-02-21 06:17:15 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
fixes to changename and optimizations (don't send the name change to everyone: only who is in the proxylist)

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-02-21 05:39:42 UTC (rev 5602)
+++ trunk/src/server/adminmanager.cpp	2010-02-21 06:17:15 UTC (rev 5603)
@@ -5458,7 +5458,9 @@
         csString query;
         //check if it's an npc
         if(targetobject && (targetobject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_NPC ||
-           targetobject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_PET))
+           targetobject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_PET ||
+           targetobject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_MOUNT ||
+           targetobject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_MOUNTPET))
         { //if so get it's pid so it works correctly with targetting
             pid = targetobject->GetCharacterData()->GetPID();
         }
@@ -5590,7 +5592,8 @@
         actorId = target->GetActor()->GetEID();
 
     }
-    else if (type == PSCHARACTER_TYPE_NPC || type == PSCHARACTER_TYPE_PET)
+    else if (type == PSCHARACTER_TYPE_NPC || type == PSCHARACTER_TYPE_PET || 
+             type == PSCHARACTER_TYPE_MOUNT || type == PSCHARACTER_TYPE_MOUNTPET)
     {
         gemNPC *npc = GEMSupervisor::GetSingleton().FindNPCEntity(pid);
         if (!npc)
@@ -5626,11 +5629,13 @@
                              );
 
     // Update
-    if (online || type == PSCHARACTER_TYPE_NPC || type == PSCHARACTER_TYPE_PET)
+    if ((online || type == PSCHARACTER_TYPE_NPC || type == PSCHARACTER_TYPE_PET 
+                || type == PSCHARACTER_TYPE_MOUNT || type == PSCHARACTER_TYPE_MOUNTPET) && targetobject->GetActorPtr())
     {
         psUpdateObjectNameMessage newNameMsg(0, actorId, fullName);
-        psserver->GetEventManager()->Broadcast(
-            newNameMsg.msg, NetBase::BC_EVERYONE);
+        
+        csArray<PublishDestination>& clients = targetobject->GetActorPtr()->GetMulticastClients();
+        newNameMsg.Multicast(clients, 0, PROX_LIST_ANY_RANGE );
     }
 
     // Need instant DB update if we should be able to change the same persons name twice


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

Revision: 5654
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5654&view=rev
Author:   Khakilord
Date:     2010-03-09 00:33:51 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
/money random is now bounded to 1000 to make it more useful, for larger values use an explicit value.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-03-08 20:08:00 UTC (rev 5653)
+++ trunk/src/server/adminmanager.cpp	2010-03-09 00:33:51 UTC (rev 5654)
@@ -4129,7 +4129,7 @@
 
     int quantity = data.value;
     if(data.random > 0)
-        quantity = psserver->rng->Get(INT_MAX-1)+1;
+        quantity = psserver->rng->Get(1000) + 1;
 
     psMoney money;
 


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

Revision: 5709
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5709&view=rev
Author:   weltall2
Date:     2010-03-19 11:26:15 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
removed skill hardcoding from admin manager

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-03-19 11:25:00 UTC (rev 5708)
+++ trunk/src/server/adminmanager.cpp	2010-03-19 11:26:15 UTC (rev 5709)
@@ -6691,7 +6691,7 @@
             return;
         }
 
-        for (int i=0; i<PSSKILL_COUNT; i++)
+        for (int i=0; i<CacheManager::GetSingloton().GetSkillAmount(); i++)
         {
             psSkillInfo * skill = CacheManager::GetSingleton().GetSkillByID(i);
             if (skill == NULL) continue;
@@ -6737,7 +6737,7 @@
     }
     else if (data.skill == "copy")
     {
-        for (int i=0; i<PSSKILL_COUNT; i++)
+        for (int i=0; i<CacheManager::GetSingloton().GetSkillAmount(); i++)
         {
             psSkillInfo * skill = CacheManager::GetSingleton().GetSkillByID(i);
             if (skill == NULL) continue;


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

Revision: 5984
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5984&view=rev
Author:   weltall2
Date:     2010-06-21 09:40:56 +0000 (Mon, 21 Jun 2010)

Log Message:
-----------
escape questname

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-06-21 07:19:42 UTC (rev 5983)
+++ trunk/src/server/adminmanager.cpp	2010-06-21 09:40:56 UTC (rev 5984)
@@ -1552,7 +1552,9 @@
 {
     uint32 questID = (uint32)-1;
 
-    Result result(db->Select("select * from quests where name='%s'", data.text.GetData()));
+    csString questName;
+    db->Escape(questName, data.text.GetData());
+    Result result(db->Select("select * from quests where name='%s'", questName.GetData()));
     if (!result.IsValid() || result.Count() == 0)
     {
         psserver->SendSystemError(client->GetClientNum(), "Quest <%s> not found", data.text.GetData());


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

Revision: 6196
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6196&view=rev
Author:   weltall2
Date:     2010-09-13 18:24:58 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
fixed logic

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-09-13 16:00:40 UTC (rev 6195)
+++ trunk/src/server/adminmanager.cpp	2010-09-13 18:24:58 UTC (rev 6196)
@@ -6224,7 +6224,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney() && !item->IsSpawnable())
+        if(item && !item->IsMoney() && item->IsSpawnable())
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());


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

Revision: 6367
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6367&view=rev
Author:   weltall2
Date:     2010-11-08 10:35:45 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Again same DBMS and same problems...

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-11-08 10:27:12 UTC (rev 6366)
+++ trunk/src/server/adminmanager.cpp	2010-11-08 10:35:45 UTC (rev 6367)
@@ -5280,7 +5280,7 @@
     if (playerID == PETITION_GM)
     {
             rs = db->Select("SELECT pet.id,pet.petition,pet.status,pet.created_date,gm.name as gmname,pl.name,pet.escalation_level FROM petitions pet "
-                    "LEFT JOIN characters gm ON pet.assigned_gm=gm.id, characters pl WHERE pet.player!=%d AND (pet.status=\"Open\" OR pet.status=\"In Progress\") "
+                    "LEFT JOIN characters gm ON pet.assigned_gm=gm.id, characters pl WHERE pet.player!=%d AND (pet.status='Open' OR pet.status='In Progress') "
                     "AND pet.player=pl.id "
                     "ORDER BY pet.status ASC,pet.escalation_level DESC,pet.created_date ASC", gmID.Unbox());
     }
@@ -5290,7 +5290,7 @@
                     "FROM petitions pet LEFT JOIN characters pl "
                     "ON pet.assigned_gm=pl.id "
                     "WHERE pet.player=%d "
-                    "AND pet.status!=\"Cancelled\" "
+                    "AND pet.status!='Cancelled' "
                     "ORDER BY pet.status ASC,pet.escalation_level DESC", playerID.Unbox());
     }
 
@@ -5401,7 +5401,7 @@
 
 bool AdminManager::AssignPetition(PID gmID, int petitionID)
 {
-    int result = db->CommandPump("UPDATE petitions SET assigned_gm=%d,status=\"In Progress\" WHERE id=%d AND assigned_gm=-1", gmID.Unbox(), petitionID);
+    int result = db->CommandPump("UPDATE petitions SET assigned_gm=%d,status='In Progress' WHERE id=%d AND assigned_gm=-1", gmID.Unbox(), petitionID);
 
     // If this failed if means that there is a serious error, or another GM was already assigned
     if (!result || result <= -1)
@@ -6224,7 +6224,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney() && item->IsSpawnable())
+        if(item && !item->IsMoney())
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());
@@ -6309,11 +6309,11 @@
         return;
     }
 
-    if(!stats->IsSpawnable())
+    /*if(!stats->IsSpawnable())
     {
         psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
         return;
-    }
+    }*/
 
     psItem* item = stats->InstantiateBasicItem();
 


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

Revision: 6427
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6427&view=rev
Author:   weltall2
Date:     2010-11-22 22:47:47 +0000 (Mon, 22 Nov 2010)

Log Message:
-----------
revert wrong commit

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-11-22 20:39:39 UTC (rev 6426)
+++ trunk/src/server/adminmanager.cpp	2010-11-22 22:47:47 UTC (rev 6427)
@@ -6224,7 +6224,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney())
+        if(item && !item->IsMoney() && item->IsSpawnable())
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());
@@ -6309,11 +6309,11 @@
         return;
     }
 
-    /*if(!stats->IsSpawnable())
+    if(!stats->IsSpawnable())
     {
         psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
         return;
-    }*/
+    }
 
     psItem* item = stats->InstantiateBasicItem();
 


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

Revision: 6525
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6525&view=rev
Author:   weltall2
Date:     2010-12-13 08:31:21 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
added the interface to reload server options in admin manager use /reload serveroptions.
Fixed some parameter passed without their placeholder in the format string

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-13 08:29:17 UTC (rev 6524)
+++ trunk/src/server/adminmanager.cpp	2010-12-13 08:31:21 UTC (rev 6525)
@@ -8406,7 +8406,7 @@
 
         if (!itemStats->ReadItemStats((*rs)[0]))
         {
-            psserver->SendSystemError(client->GetClientNum(), "Couldn't load new item stats", data.value);
+            psserver->SendSystemError(client->GetClientNum(), "Couldn't load new item stats %d", data.value);
             if (bCreatingNew)
                 delete itemStats;
             return;
@@ -8415,11 +8415,19 @@
         if (bCreatingNew)
         {
             psserver->GetCacheManager()->AddItemStatsToHashTable(itemStats);
-            psserver->SendSystemOK(client->GetClientNum(), "Successfully created new item", data.value);
+            psserver->SendSystemOK(client->GetClientNum(), "Successfully created new item id %d", data.value);
         }
         else
-            psserver->SendSystemOK(client->GetClientNum(), "Successfully modified item", data.value);
+            psserver->SendSystemOK(client->GetClientNum(), "Successfully modified item id %d", data.value);
     }
+    if (data.subCmd == "serveroptions")
+    {
+        if(psserver->GetCacheManager()->ReloadOptions())
+            psserver->SendSystemOK(client->GetClientNum(), "Reloading server options.");
+        else
+            psserver->SendSystemError(client->GetClientNum(), "Failed to reload server options.");
+
+    }
 }
 
 void AdminManager::HandleListWarnings(psAdminCmdMessage& msg, AdminCmdData& data, Client *client, Client *target )


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

Revision: 6526
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6526&view=rev
Author:   weltall2
Date:     2010-12-13 08:33:24 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
little optimization

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-13 08:31:21 UTC (rev 6525)
+++ trunk/src/server/adminmanager.cpp	2010-12-13 08:33:24 UTC (rev 6526)
@@ -8420,7 +8420,7 @@
         else
             psserver->SendSystemOK(client->GetClientNum(), "Successfully modified item id %d", data.value);
     }
-    if (data.subCmd == "serveroptions")
+    else if (data.subCmd == "serveroptions")
     {
         if(psserver->GetCacheManager()->ReloadOptions())
             psserver->SendSystemOK(client->GetClientNum(), "Reloading server options.");


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

Revision: 6619
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6619&view=rev
Author:   weltall2
Date:     2010-12-26 15:53:17 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
restored code which went missing

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-26 15:49:09 UTC (rev 6618)
+++ trunk/src/server/adminmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
@@ -6241,7 +6241,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney())
+        if(item && !item->IsMoney() && item->IsSpawnable())
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());
@@ -6326,11 +6326,11 @@
         return;
     }
 
-    /*if(!stats->IsSpawnable())
+    if(!stats->IsSpawnable())
     {
         psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
         return;
-    }*/
+    }
 
     psItem* item = stats->InstantiateBasicItem();
 


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

Revision: 6645
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6645&view=rev
Author:   weltall2
Date:     2010-12-30 18:35:09 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
improved comments

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-30 18:26:12 UTC (rev 6644)
+++ trunk/src/server/adminmanager.cpp	2010-12-30 18:35:09 UTC (rev 6645)
@@ -1495,23 +1495,30 @@
 
     // /runscript <scriptName> <player> <player>
 
+    //first take the name of the script
     scriptName = words[index++];
+    //if there are more entries probably we have a target
     if(words.GetCount() >= index + 1)
     {
+        //check first the target
         if(ParseTarget(msgManager, me, msg, client, words[index++]))
         {
+            //if there is another field we have also an origin
             if(words.GetCount() == index + 1)
             {
+                //check the origin if it's valid
                 if(!origObj.ParseTarget(msgManager, me, msg, client, words[index++]))
                 {
                     ParseError(me,"Invalid origin target given");
                 }
             }
+            //if we have more commands it means we have too many parameters
             else
             {
                 ParseError(me,"Syntax error");
             }
         }
+        //the given target is invalid
         else
         {
             ParseError(me,"Invalid target given");


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

Revision: 6655
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6655&view=rev
Author:   weltall2
Date:     2010-12-31 10:54:23 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
some compiling fixes

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-31 01:26:35 UTC (rev 6654)
+++ trunk/src/server/adminmanager.cpp	2010-12-31 10:54:23 UTC (rev 6655)
@@ -331,7 +331,7 @@
     // remove the starting '|' character
     if (!help.IsEmpty())
     {
-        help[0] = ' ';
+        help.SetAt(0, ' ');
         help.LTrim();
     }
 
@@ -774,7 +774,7 @@
     }
     
     // remove the starting '|' character
-    help[0] = ' ';
+    help.SetAt(0, ' ');
     help.LTrim();
 
     return help;


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

Revision: 6665
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6665&view=rev
Author:   weltall2
Date:     2010-12-31 14:12:10 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
fixed compilation on some gcc

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-31 13:50:36 UTC (rev 6664)
+++ trunk/src/server/adminmanager.cpp	2010-12-31 14:12:10 UTC (rev 6665)
@@ -855,7 +855,7 @@
             skill = words[index++];
 
             // check for relative value
-            if (words[index][0] == '+' || words[index][0] == '-')
+            if (words[index].GetAt(0) == '+' || words[index].GetAt(0) == '-')
                 relative = true;
             delta = words.GetInt(index++);
 
@@ -2513,7 +2513,7 @@
         else
         {
             skillData.skillName = words[index++];
-            if (words[index][0] == '-' || words[index][0] == '+')
+            if (words[index].GetAt(0) == '-' || words[index].GetAt(0) == '+')
             {
                 skillData.relativeSkill = true;
             }


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

Revision: 6675
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6675&view=rev
Author:   weltall2
Date:     2010-12-31 22:41:53 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
fixed /item

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-31 22:30:13 UTC (rev 6674)
+++ trunk/src/server/adminmanager.cpp	2010-12-31 22:41:53 UTC (rev 6675)
@@ -1374,7 +1374,7 @@
 }
 
 AdminCmdDataItem::AdminCmdDataItem(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/item", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_STRING), random(false), quality(0)
+: AdminCmdDataTarget("/item", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_STRING), random(false), quality(50)
 {
     size_t index = 1;
 
@@ -1387,7 +1387,7 @@
     {// no action required
     }
     // /item <item> [random] <quality>
-    else if (words.GetCount() >2)
+    else if (words.GetCount() >=2)
     {
         // try first parameter as a target string (item name string)
         if (ParseTarget(msgManager, me, msg, client, words[index]))
@@ -1400,23 +1400,14 @@
             {
                 index++;
                 random = true;
-                if (words.GetCount() == index + 1)
-                {
-                    quality = words.GetInt(index++);
-                }
-                else if (words.GetCount() > index + 1)
-                {
-                    ParseError(me, "Too many parameters");
-                }
             }
-            // quality is required
-            else if (words.GetCount() == index+1)
+            if (words.GetCount() == index + 1)
             {
                 quality = words.GetInt(index++);
             }
-            else
+            if (words.GetCount() > index)
             {
-                ParseError(me, "Unknown subcommand" + words[index]);
+                ParseError(me, "Too many parameters");
             }
         }
         else 


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

Revision: 6678
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6678&view=rev
Author:   weltall2
Date:     2010-12-31 23:16:38 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
restored /modify [] remove

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-31 22:50:54 UTC (rev 6677)
+++ trunk/src/server/adminmanager.cpp	2010-12-31 23:16:38 UTC (rev 6678)
@@ -2389,7 +2389,7 @@
             }
         }
         // everything else is a syntax error
-        else
+        else if(subcommand != "remove")
         {
             ParseError(me,"Invalid subcommand");
         }


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

Revision: 6679
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6679&view=rev
Author:   weltall2
Date:     2010-12-31 23:18:07 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
typo

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-31 23:16:38 UTC (rev 6678)
+++ trunk/src/server/adminmanager.cpp	2010-12-31 23:18:07 UTC (rev 6679)
@@ -2389,7 +2389,7 @@
             }
         }
         // everything else is a syntax error
-        else if(subcommand != "remove")
+        else if(subCommand != "remove")
         {
             ParseError(me,"Invalid subcommand");
         }


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

Revision: 6727
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6727&view=rev
Author:   weltall2
Date:     2011-01-08 15:47:49 +0000 (Sat, 08 Jan 2011)

Log Message:
-----------
allow the use of here even if optional

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-08 15:39:49 UTC (rev 6726)
+++ trunk/src/server/adminmanager.cpp	2011-01-08 15:47:49 UTC (rev 6727)
@@ -2061,8 +2061,13 @@
     // reset sector name
     sectorName = "";
     // when string to parse is not empty
-    if (!target.IsEmpty() && target != "here")
+    if(!target.IsEmpty())
     {
+        //if here was provided just get the sector of the client directly
+        if(target == "here")
+        {
+            return GetSectorOfClient(client);
+        }
         // retrieve and save sector information
         sectorInfo = psserver->GetCacheManager()->GetSectorInfoByName(target);
         sectorName = target;


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

Revision: 6792
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6792&view=rev
Author:   weltall2
Date:     2011-01-16 09:43:37 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
fixed PS#4908 - /setquality: bad number in system message 

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-16 09:35:57 UTC (rev 6791)
+++ trunk/src/server/adminmanager.cpp	2011-01-16 09:43:37 UTC (rev 6792)
@@ -8488,7 +8488,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney() && item->IsSpawnable())
+        if(item && !item->IsMoney() /*&& item->IsSpawnable()*/)
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());
@@ -8573,11 +8573,11 @@
         return;
     }
     
-    if(!stats->IsSpawnable())
+    /*if(!stats->IsSpawnable())
     {
         psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
         return;
-    }
+    }*/
     
     psItem* item = stats->InstantiateBasicItem();
     
@@ -10432,7 +10432,7 @@
 
     item->Save(false);
 
-    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %d/%d", data->quality, item->GetItemQuality());
+    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %d/%d", data->quality, data->qualityMax);
 }
 
 void AdminManager::HandleSetTrait(psAdminCmdMessage& msg, AdminCmdData* cmddata, Client *client)


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

Revision: 6793
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6793&view=rev
Author:   weltall2
Date:     2011-01-16 09:44:24 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
additional fixes

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-16 09:43:37 UTC (rev 6792)
+++ trunk/src/server/adminmanager.cpp	2011-01-16 09:44:24 UTC (rev 6793)
@@ -10432,7 +10432,7 @@
 
     item->Save(false);
 
-    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %d/%d", data->quality, data->qualityMax);
+    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %d/%d", data->quality, data->qualityMax ? data->qualityMax : item->GetMaxItemQuality());
 }
 
 void AdminManager::HandleSetTrait(psAdminCmdMessage& msg, AdminCmdData* cmddata, Client *client)


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

Revision: 6794
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6794&view=rev
Author:   weltall2
Date:     2011-01-16 09:47:08 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
better fix for the previous one

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-16 09:44:24 UTC (rev 6793)
+++ trunk/src/server/adminmanager.cpp	2011-01-16 09:47:08 UTC (rev 6794)
@@ -10432,7 +10432,7 @@
 
     item->Save(false);
 
-    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %d/%d", data->quality, data->qualityMax ? data->qualityMax : item->GetMaxItemQuality());
+    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %f/%f", data->GetItemQuality(), item->GetMaxItemQuality());
 }
 
 void AdminManager::HandleSetTrait(psAdminCmdMessage& msg, AdminCmdData* cmddata, Client *client)


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

Revision: 6795
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6795&view=rev
Author:   weltall2
Date:     2011-01-16 09:52:13 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
wrong class

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-16 09:47:08 UTC (rev 6794)
+++ trunk/src/server/adminmanager.cpp	2011-01-16 09:52:13 UTC (rev 6795)
@@ -10432,7 +10432,7 @@
 
     item->Save(false);
 
-    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %f/%f", data->GetItemQuality(), item->GetMaxItemQuality());
+    psserver->SendSystemOK(client->GetClientNum(), "Quality changed successfully to: %f/%f", item->GetItemQuality(), item->GetMaxItemQuality());
 }
 
 void AdminManager::HandleSetTrait(psAdminCmdMessage& msg, AdminCmdData* cmddata, Client *client)


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

Revision: 6796
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6796&view=rev
Author:   weltall2
Date:     2011-01-16 09:52:41 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
decommented some code

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-16 09:52:13 UTC (rev 6795)
+++ trunk/src/server/adminmanager.cpp	2011-01-16 09:52:41 UTC (rev 6796)
@@ -8488,7 +8488,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney() /*&& item->IsSpawnable()*/)
+        if(item && !item->IsMoney() && item->IsSpawnable())
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());
@@ -8573,11 +8573,11 @@
         return;
     }
     
-    /*if(!stats->IsSpawnable())
+    if(!stats->IsSpawnable())
     {
         psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
         return;
-    }*/
+    }
     
     psItem* item = stats->InstantiateBasicItem();
     


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

Revision: 6808
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6808&view=rev
Author:   weltall2
Date:     2011-01-18 12:39:30 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
fixed there and here, last and spawn and restore being considered first as players in the db. we need a flag to allow db hits...

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-17 17:59:56 UTC (rev 6807)
+++ trunk/src/server/adminmanager.cpp	2011-01-18 12:39:30 UTC (rev 6808)
@@ -1572,22 +1572,9 @@
         index++;
         destInstance = DEFAULT_INSTANCE;
         destInstanceValid = false;
-        // when the second word is me|pid:<PID>|playername|...
-        if (destObj.ParseTarget(msgManager, me, msg, client, words[index]))
+        if (destList.IsSubCommand(words[index]))
         {
-            index++;
-            /*if (destObj.targetType == ADMINCMD_TARGET_ME)
-            {
-                // optional instance name
-                if (words.GetCount() == index + 1)
-                {
-                    instanceName = words[index++];
-                }
-                else if (words.GetCount() != index)
-                {
-                    ParseError(me, "Too many arguments");
-                }
-            }*/
+            dest = words[index++];
         }
         // current word is not a default target
         // but it might be 'map'
@@ -1613,9 +1600,22 @@
                 ParseError(me, "Missing x,y,z coordinates");
             }
         }
-        else if (destList.IsSubCommand(words[index]))
+        // when the second word is me|pid:<PID>|playername|...
+        else if (destObj.ParseTarget(msgManager, me, msg, client, words[index]))
         {
-            dest = words[index++];
+            index++;
+            /*if (destObj.targetType == ADMINCMD_TARGET_ME)
+            {
+                // optional instance name
+                if (words.GetCount() == index + 1)
+                {
+                    instanceName = words[index++];
+                }
+                else if (words.GetCount() != index)
+                {
+                    ParseError(me, "Too many arguments");
+                }
+            }*/
         }
         else
         {
@@ -1623,7 +1623,7 @@
         }
         if (words.GetCount() == index + 1)
         {
-            destInstance = words.GetInt(index);
+            destInstance = words.GetInt(index++);
             destInstanceValid = true;
         }
         else if (words.GetCount() != index)


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

Revision: 6809
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6809&view=rev
Author:   weltall2
Date:     2011-01-18 13:43:37 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
made db hit from the targeting system need to be authorized from the admin command itself (to avoid hitting players which we don't want to hit during the search for the target and reducing the load of the admin commands)
made the targetname function just use the targetname set by the targetting system so it becomes also debug system for it.
made killnpc able to load also npc for the first time (untested)

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-18 12:39:30 UTC (rev 6808)
+++ trunk/src/server/adminmanager.cpp	2011-01-18 13:43:37 UTC (rev 6809)
@@ -354,6 +354,11 @@
     // basically the pid is resolved to an account id that is then used to
     // execute the specified command
 
+    //first of all check if db hits are allowed. most commands don't
+    //work with the database so there is no use to hit the db for that.
+    if(!IsAllowedTargetType(ADMINCMD_TARGET_DATABASE))
+        return false;
+
     PID pid = PID(strtoul(word.Slice(4).GetData(), NULL, 10));
     if (!pid.IsValid())
     {
@@ -409,6 +414,11 @@
 
 bool AdminCmdTargetParser::GetPlayerAccountIDByName(size_t gmClientNum, const csString &word, bool reporterror)
 {
+    //first of all check if db hits are allowed. most commands don't
+    //work with the database so there is no use to hit the db for that.
+    if(!IsAllowedTargetType(ADMINCMD_TARGET_DATABASE))
+        return false;
+
     // try to find an offline player by name and resolve to a pid
     csString name;
     // normalize and escape name (to avoid security issues)
@@ -1083,7 +1093,7 @@
 }
 
 AdminCmdDataDeleteChar::AdminCmdDataDeleteChar(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/deletechar", ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID), requestor(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+: AdminCmdDataTarget("/deletechar", ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID), requestor(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
 
@@ -1174,7 +1184,7 @@
 }
 
 AdminCmdDataBan::AdminCmdDataBan(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/ban", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+: AdminCmdDataTarget("/ban", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
     bool found;
@@ -1245,7 +1255,7 @@
 }
 
 AdminCmdDataKillNPC::AdminCmdDataKillNPC(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/killnpc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), reload(false)
+: AdminCmdDataTarget("/killnpc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE), reload(false)
 {
     size_t index = 1;
     bool found;
@@ -1554,7 +1564,7 @@
 }
 
 AdminCmdDataTeleport::AdminCmdDataTeleport(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/teleport", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM), destList("here there last spawn restore"), destObj(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM)
+: AdminCmdDataTarget("/teleport", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_DATABASE), destList("here there last spawn restore"), destObj(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM)
 {
     destList.Push("map", "(<map name>|here) | (<sector name> <x> <y> <z>) [<instance>]");
     size_t index = 1;
@@ -1685,7 +1695,7 @@
 }
 
 AdminCmdDataChangeName::AdminCmdDataChangeName(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/changename", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), uniqueName(true), uniqueFirstName(true)
+: AdminCmdDataTarget("/changename", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE), uniqueName(true), uniqueFirstName(true)
 {
     size_t index = 1;
     bool found;
@@ -1776,7 +1786,7 @@
 }
 
 AdminCmdDataChangeGuildLeader::AdminCmdDataChangeGuildLeader(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/changeguildleader", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+: AdminCmdDataTarget("/changeguildleader", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
     bool found = false;
@@ -3130,7 +3140,7 @@
 }
 
 AdminCmdDataQuest::AdminCmdDataQuest(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/quest", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET),
+: AdminCmdDataTarget("/quest", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE),
         subCommandList("complete list discard assign")
 {
     size_t index = 1;
@@ -3400,7 +3410,7 @@
 }
 
 AdminCmdDataListWarnings::AdminCmdDataListWarnings(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/listwarnings", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET)
+: AdminCmdDataTarget("/listwarnings", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
     bool found;
@@ -3727,19 +3737,19 @@
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/mute", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
 
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/unmute", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/unban", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ACCOUNT));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/banadvisor", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/unbanadvisor", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/info", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/charlist", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/unban", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_DATABASE));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/banadvisor", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/unbanadvisor", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/info", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/charlist", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/inspect", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/npc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_CLIENTTARGET));
     //has got its own class (but this is not really needed yet)
     // RegisterMsgFactoryFunction(new AdminCmdDataTarget("/setstackable", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)); //natoka: actually here is a need for ADMIN_TARGET_ITEM
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/divorce", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
 
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/marriageinfo", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/targetname", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/marriageinfo", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/targetname", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_DATABASE | ADMINCMD_TARGET_STRING));
 
 }
 
@@ -7110,6 +7120,22 @@
         }
         return;
     }
+    else if(!target)
+    {
+        //as the npc was not found but it's id was found from db or direct data from the user
+        PID npcid = data->targetID;
+        if(npcid.IsValid()) //check if the pid is really one
+        {
+            //try to load the new npc
+            psCharacter *npcdata = psServer::CharacterLoader.LoadCharacterData(npcid,true);
+            //if the load was successful we can try completing the load process
+            if(npcdata)
+            {
+                EntityManager::GetSingleton().CreateNPC(npcdata);
+                psserver->SendSystemResult(me->clientnum, "NPC (%s) has been loaded.", npcid.Show().GetData());
+            }
+        }
+    }
     psserver->SendSystemError(me->clientnum, "No NPC found to kill.");
 }
 
@@ -10627,13 +10653,14 @@
 {
     AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata);
 
-    if ((!data->target || !data->target.Length()) && !data->target)
+    if (!data->target.Length())
     {
         psserver->SendSystemInfo(client->GetClientNum(),"Syntax: \"/targetname [me/target/eid/pid/area/name]\"");
         return;
     }
-    if(data->targetObject) //just to be sure
-        psserver->SendSystemInfo(client->GetClientNum(),"Targeted: %s", data->targetObject->GetName());
+    AccountID aid = (!data->IsTargetType(ADMINCMD_TARGET_PLAYER) && !data->IsTargetType(ADMINCMD_TARGET_PID)) ? 0 : data->GetAccountID(client->GetClientNum());
+    psserver->SendSystemInfo(client->GetClientNum(),"Targeted: %s (%s, %s, online: %d)", data->target.GetData(),
+                             data->targetID.Show().GetData(), aid.Show().GetData(), data->IsOnline() ? "yes" : "no");
 }
 
 void AdminManager::DisableQuest(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData* cmddata, Client *client )


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

Revision: 6816
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6816&view=rev
Author:   weltall2
Date:     2011-01-18 22:09:59 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
fixed map

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-18 16:30:10 UTC (rev 6815)
+++ trunk/src/server/adminmanager.cpp	2011-01-18 22:09:59 UTC (rev 6816)
@@ -1582,33 +1582,33 @@
         index++;
         destInstance = DEFAULT_INSTANCE;
         destInstanceValid = false;
+
         if (destList.IsSubCommand(words[index]))
         {
             dest = words[index++];
-        }
-        // current word is not a default target
-        // but it might be 'map'
-        else if (words[index] == "map")
-        {
-            dest = words[index++];
-            // map target specified by map name
-            if (words.GetCount() == index + 1)
+            // current word is not a default target
+            // but it might be 'map'
+            if(dest == "map")
             {
-                destMap = words[index++];
+                // map target specified by map name
+                if (words.GetCount() == index + 1)
+                {
+                    destMap = words[index++];
+                }
+                // or sector target specified by coordinates
+                // with optional instance id at the end (parsed below)
+                else if (words.GetCount() == index + 4 || words.GetCount() == index + 5)
+                {
+                    destSector = words[index++];
+                    x = words.GetFloat(index++);
+                    y = words.GetFloat(index++);
+                    z = words.GetFloat(index++);
+                }
+                else
+                {
+                    ParseError(me, "Missing x,y,z coordinates");
+                }
             }
-            // or sector target specified by coordinates
-            // with optional instance id at the end (parsed below)
-            else if (words.GetCount() == index + 4 || words.GetCount() == index + 5)
-            {
-                destSector = words[index++];
-                x = words.GetFloat(index++);
-                y = words.GetFloat(index++);
-                z = words.GetFloat(index++);
-            }
-            else
-            {
-                ParseError(me, "Missing x,y,z coordinates");
-            }
         }
         // when the second word is me|pid:<PID>|playername|...
         else if (destObj.ParseTarget(msgManager, me, msg, client, words[index]))


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

Revision: 6820
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6820&view=rev
Author:   weltall2
Date:     2011-01-20 08:57:24 +0000 (Thu, 20 Jan 2011)

Log Message:
-----------
allowed skill = 0

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-19 17:47:33 UTC (rev 6819)
+++ trunk/src/server/adminmanager.cpp	2011-01-20 08:57:24 UTC (rev 6820)
@@ -182,7 +182,7 @@
 
 bool psRewardDataSkill::IsZero()
 {
-    return (skillName.IsEmpty() || (skillDelta == 0 && !relativeSkill));
+    return (skillName.IsEmpty());
 }
 
 psRewardDataMoney::psRewardDataMoney(csString pmoneyType, int pmoneyCount, bool prandom)


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

Revision: 6828
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6828&view=rev
Author:   weltall2
Date:     2011-01-25 16:35:57 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
fixed crash when the name is typoed!

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-24 21:39:05 UTC (rev 6827)
+++ trunk/src/server/adminmanager.cpp	2011-01-25 16:35:57 UTC (rev 6828)
@@ -718,8 +718,7 @@
             username.Downcase();
             db->Escape(usernameEscaped, username.GetData());
             result = db->Select("SELECT id FROM accounts WHERE username = '%s' LIMIT 1",usernameEscaped.GetData());
-        
-            if ( result.IsValid() || result.Count() == 1 )
+            if ( result.IsValid() && result.Count() == 1 )
             {
                 AccountID accountID = AccountID(result[0].GetUInt32("id"));
                 if (accountID.IsValid())


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

Revision: 6829
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6829&view=rev
Author:   weltall2
Date:     2011-01-25 20:24:38 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
restored offline banning and by pid or aid

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-01-25 16:35:57 UTC (rev 6828)
+++ trunk/src/server/adminmanager.cpp	2011-01-25 20:24:38 UTC (rev 6829)
@@ -8233,7 +8233,8 @@
     }
 
     // Find client to get target
-    if (!data->IsTargetType(ADMINCMD_TARGET_PLAYER))
+    if (!data->IsTargetType(ADMINCMD_TARGET_PLAYER) && !data->IsTargetType(ADMINCMD_TARGET_PID) &&
+        !data->IsTargetType(ADMINCMD_TARGET_ACCOUNT))
     {
         psserver->SendSystemError(me->clientnum, "You can only ban a player!");
         return;


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

Revision: 6893
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6893&view=rev
Author:   weltall2
Date:     2011-02-08 08:55:15 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
removed adminmanager dependency from psskill enum

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-02-07 22:17:05 UTC (rev 6892)
+++ trunk/src/server/adminmanager.cpp	2011-02-08 08:55:15 UTC (rev 6893)
@@ -8764,7 +8764,7 @@
         bool modified = false;
         if (rewardDataSkill->skillName == "all") // update all skills
         {
-            for (int i=0; i<PSSKILL_COUNT; i++)
+            for(int i=0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
             {
                 psSkillInfo* skill = psserver->GetCacheManager()->GetSkillByID(i);
                 if (!skill) continue; // skill doesn't exist -> this should not happen
@@ -9203,7 +9203,7 @@
     {
         if (data->skillData.skillName == "all")
         {
-            for (int i=0; i<PSSKILL_COUNT; i++)
+            for(int i=0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
             {
                 psSkillInfo * skill = psserver->GetCacheManager()->GetSkillByID(i);
                 if (skill == NULL) continue;
@@ -9257,7 +9257,7 @@
     }
 
     bool modified = false;
-    for (int i=0; i<PSSKILL_COUNT; i++)
+    for (int i=0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
     {
         psSkillInfo * skill = psserver->GetCacheManager()->GetSkillByID(i);
         if (skill == NULL) continue;


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

Revision: 6924
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6924&view=rev
Author:   weltall2
Date:     2011-02-13 10:57:56 +0000 (Sun, 13 Feb 2011)

Log Message:
-----------
fixed various warning and uninitialized variables

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-02-13 10:52:51 UTC (rev 6923)
+++ trunk/src/server/adminmanager.cpp	2011-02-13 10:57:56 UTC (rev 6924)
@@ -2105,7 +2105,7 @@
 bool AdminCmdDataSectorTarget::GetSectorOfClient(Client* client)
 {
     // Get the current sector
-    iSector* here;
+    iSector* here = NULL;
     if (client->GetActor())
     {
         here = client->GetActor()->GetSector();
@@ -8771,7 +8771,7 @@
         bool modified = false;
         if (rewardDataSkill->skillName == "all") // update all skills
         {
-            for(int i=0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
+            for(size_t i = 0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
             {
                 psSkillInfo* skill = psserver->GetCacheManager()->GetSkillByID(i);
                 if (!skill) continue; // skill doesn't exist -> this should not happen
@@ -9210,7 +9210,7 @@
     {
         if (data->skillData.skillName == "all")
         {
-            for(int i=0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
+            for(size_t i = 0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
             {
                 psSkillInfo * skill = psserver->GetCacheManager()->GetSkillByID(i);
                 if (skill == NULL) continue;
@@ -9264,7 +9264,7 @@
     }
 
     bool modified = false;
-    for (int i=0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
+    for (size_t i = 0; i < psserver->GetCacheManager()->GetSkillAmount(); i++)
     {
         psSkillInfo * skill = psserver->GetCacheManager()->GetSkillByID(i);
         if (skill == NULL) continue;
@@ -10213,7 +10213,7 @@
     AdminCmdDataQuest *data = dynamic_cast<AdminCmdDataQuest*>(cmddata);
     Client *subject = data->targetClient;
 
-    Client *target; //holds the target of our query
+    Client *target = NULL; //holds the target of our query
     PID pid; //used to keep player pid used *only* in offline queries
     csString name; //stores the char name
     if(!data->IsOnline())    //the target was empty check if it was because it's a command targetting the issuer or an offline player


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

Revision: 6965
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6965&view=rev
Author:   weltall2
Date:     2011-02-17 18:07:48 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
fixed ban of offline entities

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-02-16 16:14:04 UTC (rev 6964)
+++ trunk/src/server/adminmanager.cpp	2011-02-17 18:07:48 UTC (rev 6965)
@@ -8247,7 +8247,7 @@
         return;
     }
 
-    if(data->targetClient->GetClientNum() == client->GetClientNum())
+    if(data->targetClient && data->targetClient->GetClientNum() == client->GetClientNum())
     {
         psserver->SendSystemError(me->clientnum, "You can't ban yourself!");
         return;


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

Revision: 7201
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7201&view=rev
Author:   magodra
Date:     2011-05-01 16:23:00 +0000 (Sun, 01 May 2011)

Log Message:
-----------
- Include the AdminCmdDataLocatoin factory.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-04-30 22:21:59 UTC (rev 7200)
+++ trunk/src/server/adminmanager.cpp	2011-05-01 16:23:00 UTC (rev 7201)
@@ -3730,6 +3730,7 @@
     RegisterMsgFactoryFunction(new AdminCmdDataSetLabelColor());
     RegisterMsgFactoryFunction(new AdminCmdDataAction());
     RegisterMsgFactoryFunction(new AdminCmdDataPath());
+    RegisterMsgFactoryFunction(new AdminCmdDataLocation());
     RegisterMsgFactoryFunction(new AdminCmdDataGameMasterEvent());
     RegisterMsgFactoryFunction(new AdminCmdDataBadText());
     RegisterMsgFactoryFunction(new AdminCmdDataQuest());


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

Revision: 7211
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7211&view=rev
Author:   magodra
Date:     2011-05-04 19:58:53 +0000 (Wed, 04 May 2011)

Log Message:
-----------
- Fixed command line help for /event and /location.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-05-04 18:36:16 UTC (rev 7210)
+++ trunk/src/server/adminmanager.cpp	2011-05-04 19:58:53 UTC (rev 7211)
@@ -2750,7 +2750,7 @@
     // when help is requested, return immediate
     if (IsHelp(words[1]))
     {
-        subCmd = words[2]; // Next workd might be a sub Cmd.
+        subCmd = words[2]; // Next word might be a sub Cmd.
         return;
     }
 
@@ -2908,11 +2908,17 @@
 AdminCmdDataLocation::AdminCmdDataLocation(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
 : AdminCmdData("/location"), subCommandList("help adjust display hide")
 {
+
+    subCommandList.Push("help","[sub command]");
+    subCommandList.Push("add","<type> <name>");
+
     // when help is requested, return immediate
     if (IsHelp(words[1]))
+    {
+        subCommand = words[2]; // Next word might be a sub Cmd.
         return;
+    }
 
-    subCommandList.Push("add","<type> <name>");
     size_t index = 1;
 
     // first word must be a sub command
@@ -2961,10 +2967,6 @@
 AdminCmdDataGameMasterEvent::AdminCmdDataGameMasterEvent(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
 : AdminCmdData("/event"), subCommandList("help list"), subCmd(), player(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET)
 {
-    // when help is requested, return immediate
-    if (IsHelp(words[1]))
-        return;
-
     // register subcommands along with their help message
     subCommandList.Push("create","<name> <description>");
     subCommandList.Push("reward",(csString)"{REWARD}" + "\n" + rewardList.GetHelpMessage());
@@ -2973,6 +2975,14 @@
     subCommandList.Push("register","[range <range> | <player>]");
     subCommandList.Push("control","<name>");
     subCommandList.Push("discard","<name>");
+
+    // when help is requested, return immediate
+    if (IsHelp(words[1]))
+    {
+        subCmd = words[2]; // Next word might be a sub Cmd.
+        return;
+    }
+
     size_t index = 1;
 
     // test if the first word is a subcommand


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

Revision: 7310
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7310&view=rev
Author:   magodra
Date:     2011-05-24 17:01:31 +0000 (Tue, 24 May 2011)

Log Message:
-----------
- Removed unused var.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-05-24 04:38:13 UTC (rev 7309)
+++ trunk/src/server/adminmanager.cpp	2011-05-24 17:01:31 UTC (rev 7310)
@@ -6518,7 +6518,6 @@
         csVector3 myPos;
         float myRotY,distance=10000.0;
         iSector* mySector = 0;
-        int loc_id = -1;
 
         client->GetActor()->GetPosition(myPos, myRotY, mySector);
         csString sectorName = mySector->QueryObject()->GetName();


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

Revision: 7462
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7462&view=rev
Author:   weltall2
Date:     2011-06-27 19:12:42 +0000 (Mon, 27 Jun 2011)

Log Message:
-----------
restored some code

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-06-27 19:12:04 UTC (rev 7461)
+++ trunk/src/server/adminmanager.cpp	2011-06-27 19:12:42 UTC (rev 7462)
@@ -8909,7 +8909,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney() /*&& item->IsSpawnable()*/)
+        if(item && !item->IsMoney() && item->IsSpawnable())
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());
@@ -8996,8 +8996,8 @@
     
     if(!stats->IsSpawnable())
     {
-        //psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
-        //return;
+        psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
+        return;
     }
     
     psItem* item = stats->InstantiateBasicItem();


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

Revision: 7512
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7512&view=rev
Author:   weltall2
Date:     2011-07-12 05:27:41 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
fixed  possible null pointer deference

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-07-12 05:26:55 UTC (rev 7511)
+++ trunk/src/server/adminmanager.cpp	2011-07-12 05:27:41 UTC (rev 7512)
@@ -9867,7 +9867,7 @@
     while(mIter.HasNext())
     {
         psGuildMember* member = mIter.Next();
-        if(member->character)
+        if(member->character && member->character->GetActor())
         {
             array.Push(member->character->GetActor()->GetEID());
         }


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

Revision: 7516
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7516&view=rev
Author:   weltall2
Date:     2011-07-15 13:43:26 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
added support to send an animation

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-07-15 01:56:48 UTC (rev 7515)
+++ trunk/src/server/adminmanager.cpp	2011-07-15 13:43:26 UTC (rev 7516)
@@ -1921,7 +1921,7 @@
     {
         commandMod = words[index];
         commandMod.Downcase();
-        if ( commandMod == "say" || commandMod == "shout" || commandMod == "worldshout")
+        if ( commandMod == "say" || commandMod == "shout" || commandMod == "worldshout" || commandMod == "anim" )
         { // command mode (if supplied)
             index++;
         }
@@ -1941,7 +1941,7 @@
 
 csString AdminCmdDataImpersonate::GetHelpMessage()
 {
-    return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + "] [say|shout|worldshout] <text>\"\n"
+    return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + "] [say|shout|worldshout|anim] <text/anim name>\"\n"
             "If name is \"text\" the given text is used as it is.";
 }
 
@@ -7652,10 +7652,25 @@
     AdminCmdDataImpersonate* data = dynamic_cast<AdminCmdDataImpersonate*>(cmddata);
     if (data->text.IsEmpty())
     {
-        psserver->SendSystemError(me->clientnum, "Missing text");
+        psserver->SendSystemError(me->clientnum, "Missing text or anim name");
         return;
     }
 
+
+    //send an animation
+    if(data->commandMod == "anim")
+    {
+        gemActor* target = dynamic_cast<gemActor*>(client->GetTargetObject());
+        csTicks delay = 0;
+        if(!target)
+        {
+            psserver->SendSystemError(me->clientnum, "You can execute animations only on actors");
+            return;
+        }
+        target->SetAction(data->text, delay);
+        return;
+    }
+
     csString sendText; // We need specialised say/shout as it is a special GM chat message
 
     if (data->target == "text")


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

Revision: 7518
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7518&view=rev
Author:   weltall2
Date:     2011-07-17 11:42:32 +0000 (Sun, 17 Jul 2011)

Log Message:
-----------
added duration flag

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-07-16 19:05:48 UTC (rev 7517)
+++ trunk/src/server/adminmanager.cpp	2011-07-17 11:42:32 UTC (rev 7518)
@@ -1899,6 +1899,7 @@
 {
     size_t index = 1;
     bool found = false;
+    duration = 0;
 
     // when help is requested, return immediate
     if (IsHelp(words[1]))
@@ -1921,10 +1922,19 @@
     {
         commandMod = words[index];
         commandMod.Downcase();
-        if ( commandMod == "say" || commandMod == "shout" || commandMod == "worldshout" || commandMod == "anim" )
+        if ( commandMod == "say" || commandMod == "shout" || commandMod == "worldshout" )
         { // command mode (if supplied)
             index++;
         }
+        else if(commandMod == "anim")
+        {
+            index++;
+            //check if a duration is specified
+            if(words.GetCount() > index + 1)
+            {
+                duration = words.GetInt(index++);
+            }
+        }
         else
         { // default is to use say
             commandMod = "say";
@@ -1941,7 +1951,7 @@
 
 csString AdminCmdDataImpersonate::GetHelpMessage()
 {
-    return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + "] [say|shout|worldshout|anim] <text/anim name>\"\n"
+    return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + "] [say|shout|worldshout|anim] <text/[anim duration] anim name>\"\n"
             "If name is \"text\" the given text is used as it is.";
 }
 
@@ -7660,14 +7670,17 @@
     //send an animation
     if(data->commandMod == "anim")
     {
-        gemActor* target = dynamic_cast<gemActor*>(client->GetTargetObject());
-        csTicks delay = 0;
+        //this is done for error checking (items can't be animated)
+        gemActor* target = client->GetTargetObject()->GetActorPtr();
         if(!target)
         {
             psserver->SendSystemError(me->clientnum, "You can execute animations only on actors");
             return;
         }
-        target->SetAction(data->text, delay);
+
+        //send an action override message which runs the animation
+        psOverrideActionMessage msg(0, target->GetEID(), data->text, data->duration);
+        msg.Multicast(target->GetMulticastClients(), 0, PROX_LIST_ANY_RANGE);
         return;
     }
 


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

Revision: 7625
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7625&view=rev
Author:   weltall2
Date:     2011-08-30 20:18:28 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
added ability to spawn creative from the /item dialog. patch by kalaspuffar

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-08-28 15:53:45 UTC (rev 7624)
+++ trunk/src/server/adminmanager.cpp	2011-08-30 20:18:28 UTC (rev 7625)
@@ -9014,63 +9014,80 @@
         return;
     }
 
-    // if the item is 'personalised' by the owner, then the item is in fact just a
-    // template which is best not to instantiate it itself. Eg blank book, map.
-    if (stats->GetBuyPersonalise())
-    {
-        psserver->SendSystemError(me->clientnum, "Cannot spawn personalised item!");
-        return;
-    }
-    
     if(!stats->IsSpawnable())
     {
         psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
         return;
     }
-    
+
+    // Prepare text for error messages.
+    csString text;
+
     psItem* item = stats->InstantiateBasicItem();
-    
-    // randomize if requested
-    if (msg.random)
-    {
-        LootRandomizer* lootRandomizer = psserver->GetSpawnManager()->GetLootRandomizer();
-        item = lootRandomizer->RandomizeItem(item, msg.quality );
-    }
 
-    item->SetStackCount(msg.count);
-    item->SetIsLockable(msg.lockable);
-    item->SetIsLocked(msg.locked);
-    item->SetIsPickupable(msg.pickupable);
-    item->SetIsCD(msg.collidable);
-    item->SetIsUnpickable(msg.Unpickable);
-    item->SetIsTransient(msg.Transient);
-    
-    //These are setting only flags. When modify gets valid permission update also here accordly
-    if(psserver->GetCacheManager()->GetCommandManager()->Validate(client->GetSecurityLevel(), "/modify"))
+    if (stats->GetBuyPersonalise())
     {
-        item->SetIsSettingItem(msg.SettingItem);
-        item->SetIsNpcOwned(msg.NPCOwned);
-    }
+    	// Spawn personlised item.
 
-    if (msg.quality > 0)
-    {
-        item->SetItemQuality(msg.quality);
-        // Setting craft quality as well if quality given by user
-        item->SetMaxItemQuality(msg.quality);
+        PSITEMSTATS_CREATORSTATUS creatorStatus;
+        item->GetCreator(creatorStatus);
+
+        // Prepare name for personalised item.
+        csString itemName(item->GetName());
+        if (creatorStatus != PSITEMSTATS_CREATOR_PUBLIC)
+            itemName.AppendFmt(" of %s", client->GetName());
+        csString personalisedName(itemName);
+
+        item->SetName(personalisedName);
+
+        // copies the template creative data from the item stats in the item
+        // instances for use by the player
+        item->PrepareCreativeItemInstance();
     }
     else
     {
-        item->SetItemQuality(stats->GetQuality());
-    }
+    	// Spawn normal item.
 
-    if (msg.lockable)
-    {
-        item->SetLockpickSkill(skill);
-        item->SetLockStrength(msg.lstr);
+    	// randomize if requested
+        if (msg.random)
+        {
+            LootRandomizer* lootRandomizer = psserver->GetSpawnManager()->GetLootRandomizer();
+            item = lootRandomizer->RandomizeItem(item, msg.quality );
+        }
+
+        item->SetStackCount(msg.count);
+        item->SetIsLockable(msg.lockable);
+        item->SetIsLocked(msg.locked);
+        item->SetIsPickupable(msg.pickupable);
+        item->SetIsCD(msg.collidable);
+        item->SetIsUnpickable(msg.Unpickable);
+        item->SetIsTransient(msg.Transient);
+
+        //These are setting only flags. When modify gets valid permission update also here accordly
+        if(psserver->GetCacheManager()->GetCommandManager()->Validate(client->GetSecurityLevel(), "/modify"))
+        {
+            item->SetIsSettingItem(msg.SettingItem);
+            item->SetIsNpcOwned(msg.NPCOwned);
+        }
+
+        if (msg.quality > 0)
+        {
+            item->SetItemQuality(msg.quality);
+            // Setting craft quality as well if quality given by user
+            item->SetMaxItemQuality(msg.quality);
+        }
+        else
+        {
+            item->SetItemQuality(stats->GetQuality());
+        }
+
+        if (msg.lockable)
+        {
+            item->SetLockpickSkill(skill);
+            item->SetLockStrength(msg.lstr);
+        }
     }
-
-    // Place the new item in the GM's inventory
-    csString text;
+    
     item->SetLoaded();  // Item is fully created
     if (charData->Inventory().Add(item))
     {

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

Revision: 7673
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7673&view=rev
Author:   weltall2
Date:     2011-10-16 18:22:15 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
fixed slide amount for instances

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-10-14 12:58:43 UTC (rev 7672)
+++ trunk/src/server/adminmanager.cpp	2011-10-16 18:22:15 UTC (rev 7673)
@@ -6771,7 +6771,8 @@
 
     float slideAmount = (data->slideAmount == 0)?1:data->slideAmount; // default to 1
 
-    if (slideAmount > 1000 || slideAmount < -1000 || slideAmount != slideAmount) // Check bounds and NaN
+    if ((slideAmount > 1000 || slideAmount < -1000 || slideAmount != slideAmount) &&
+         toupper(data->direction.GetAt(0)) != 'I') // Check bounds and NaN
     {
         psserver->SendSystemError(me->clientnum, "Invalid slide amount");
         return;

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

Revision: 7725
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7725&view=rev
Author:   weltall2
Date:     2011-11-19 14:53:52 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
missing line

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-11-19 14:35:21 UTC (rev 7724)
+++ trunk/src/server/adminmanager.cpp	2011-11-19 14:53:52 UTC (rev 7725)
@@ -6868,6 +6868,7 @@
                     psserver->SendSystemError(client->GetClientNum(), response);
                     return false;
                 }
+            }
         }
 
         // Move the item

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

Revision: 7727
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7727&view=rev
Author:   weltall2
Date:     2011-11-19 15:35:54 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
expanded info output

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-11-19 14:59:08 UTC (rev 7726)
+++ trunk/src/server/adminmanager.cpp	2011-11-19 15:35:54 UTC (rev 7727)
@@ -4595,6 +4595,8 @@
                   info += " 'unpickable'";
               if ( flags & PSITEM_FLAG_NOPICKUP )
                   info += " 'no pickup'";
+              if(flags & PSITEM_FLAG_NOPICKUPWEAK)
+                  info += " 'no pickup weak'";
               if ( flags & PSITEM_FLAG_KEY )
                   info += " 'key'";
               if ( flags & PSITEM_FLAG_MASTERKEY )

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

Revision: 7793
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7793&view=rev
Author:   weltall2
Date:     2011-12-09 12:24:25 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
added a safeguard against quest ids lingering in the db but removed from the quest.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-12-07 21:38:51 UTC (rev 7792)
+++ trunk/src/server/adminmanager.cpp	2011-12-09 12:24:25 UTC (rev 7793)
@@ -10941,7 +10941,8 @@
                 {
                     //get the quest data from the cache so we can print it's name without accessing the db again
                     psQuest* currQuest = psserver->GetCacheManager()->GetQuestByID(result[currResult].GetUInt32("quest_id"));
-                    csString QuestName = currQuest->GetName();
+                    //check if the quest is valid else show it's id
+                    csString QuestName = currQuest ? csString(currQuest->GetName()) : csString("Missing quest: ") + result[currResult]["quest_id"];
                     if(!data->questName.Length() || QuestName.StartsWith(data->questName,true)) //check if we are searching a particular quest
                         psserver->SendSystemInfo(me->clientnum, "Quest name: %s. Status: %s", QuestName.GetData(), result[currResult]["status"]);
                 }

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

Revision: 7860
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7860&view=rev
Author:   magodra
Date:     2011-12-20 13:06:30 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
- Fixed output when using /killnpc pid:<PID> to display the resolved PID.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-12-20 11:19:06 UTC (rev 7859)
+++ trunk/src/server/adminmanager.cpp	2011-12-20 13:06:30 UTC (rev 7860)
@@ -547,7 +547,12 @@
             }
             else
             {
-                psserver->SendSystemInfo(me->clientnum,"PID:%s resolved to online client %s", ShowID(targetID), target.GetData());
+                targetActor = targetObject->GetActorPtr();
+                targetClient = targetObject->GetClient();
+                target = (targetClient)?targetClient->GetName():targetObject->GetName();
+                targetID = targetObject->GetPID();
+
+                psserver->SendSystemInfo(me->clientnum,"%s resolved to online client %s", ShowID(targetID), target.GetData());
             }
         }
         else if (IsAllowedTargetType(ADMINCMD_TARGET_AREA) && word.StartsWith("area:",true))

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

Revision: 7936
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7936&view=rev
Author:   magodra
Date:     2011-12-28 18:14:44 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
- Added display of prev and next path point for /path info command.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-12-28 18:04:53 UTC (rev 7935)
+++ trunk/src/server/adminmanager.cpp	2011-12-28 18:14:44 UTC (rev 7936)
@@ -6358,10 +6358,13 @@
         {
             psserver->SendSystemInfo(me->clientnum,
                                      "Found point(%d) %d of path: %s(%d) at range %.2f\n"
+                                     "Prev point ID: %d Next point ID: %d\n" 
                                      "Start WP: %s(%d) End WP: %s(%d)\n"
                                      "Flags: %s",
                                      point->GetID(),indexPoint,pathPoint->GetName(),
                                      pathPoint->GetID(),rangePoint,
+                                     indexPoint-1>=0?pathPoint->points[indexPoint-1]->GetID():-1,
+                                     indexPoint+1<pathPoint->points.GetSize()?pathPoint->points[indexPoint+1]->GetID():-1,
                                      pathPoint->start->GetName(),pathPoint->start->GetID(),
                                      pathPoint->end->GetName(),pathPoint->end->GetID(),
                                      pathPoint->GetFlags().GetDataSafe());

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

Revision: 7945
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7945&view=rev
Author:   weltall2
Date:     2011-12-30 16:27:04 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
removed clientarget from /npc it should avoid /npc to work alone (would need /npc target at least)

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-12-30 02:03:50 UTC (rev 7944)
+++ trunk/src/server/adminmanager.cpp	2011-12-30 16:27:04 UTC (rev 7945)
@@ -4017,7 +4017,7 @@
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/info", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/charlist", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/inspect", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/npc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_CLIENTTARGET));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/npc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_NPC ));
     //has got its own class (but this is not really needed yet)
     // RegisterMsgFactoryFunction(new AdminCmdDataTarget("/setstackable", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)); //natoka: actually here is a need for ADMIN_TARGET_ITEM
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/divorce", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));

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

Revision: 7949
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7949&view=rev
Author:   weltall2
Date:     2011-12-31 08:36:32 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
added a confirmation message

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-12-31 08:35:52 UTC (rev 7948)
+++ trunk/src/server/adminmanager.cpp	2011-12-31 08:36:32 UTC (rev 7949)
@@ -11447,10 +11447,12 @@
     }
     else if(data->subCmd == "path")
     {
-            delete pathNetwork;
-            pathNetwork = new psPathNetwork();
-            pathNetwork->Load(EntityManager::GetSingleton().GetEngine(),db,
-                      EntityManager::GetSingleton().GetWorld());
+        delete pathNetwork;
+        pathNetwork = new psPathNetwork();
+        pathNetwork->Load(EntityManager::GetSingleton().GetEngine(),db,
+                  EntityManager::GetSingleton().GetWorld());
+        psserver->SendSystemOK(client->GetClientNum(), "Successfully reloaded math scripts.");
+
     }
 }
 

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

Revision: 7952
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7952&view=rev
Author:   weltall2
Date:     2011-12-31 11:34:10 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
fixed messages

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-12-31 08:40:25 UTC (rev 7951)
+++ trunk/src/server/adminmanager.cpp	2011-12-31 11:34:10 UTC (rev 7952)
@@ -3647,7 +3647,7 @@
 
 csString AdminCmdDataReload::GetHelpMessage()
 {
-    return "Syntax: \"" + command + " item <itemID>/script/serveroptions\"";
+    return "Syntax: \"" + command + " item <itemID>/script/serveroptions/mathscript/path\"";
 }
 
 AdminCmdDataListWarnings::AdminCmdDataListWarnings(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
@@ -11451,7 +11451,7 @@
         pathNetwork = new psPathNetwork();
         pathNetwork->Load(EntityManager::GetSingleton().GetEngine(),db,
                   EntityManager::GetSingleton().GetWorld());
-        psserver->SendSystemOK(client->GetClientNum(), "Successfully reloaded math scripts.");
+        psserver->SendSystemOK(client->GetClientNum(), "Successfully reloaded path network.");
 
     }
 }

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

Revision: 7954
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7954&view=rev
Author:   weltall2
Date:     2011-12-31 12:34:21 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
missing plus

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2011-12-31 12:33:25 UTC (rev 7953)
+++ trunk/src/server/adminmanager.cpp	2011-12-31 12:34:21 UTC (rev 7954)
@@ -3657,7 +3657,7 @@
 
 csString AdminCmdDataReload::GetHelpMessage()
 {
-    return "Syntax: \"" + command + " " + subCommandList.GetHelpMessage() "\"";
+    return "Syntax: \"" + command + " " + subCommandList.GetHelpMessage() + "\"";
 }
 
 AdminCmdDataListWarnings::AdminCmdDataListWarnings(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)

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

Revision: 7999
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7999&view=rev
Author:   weltall2
Date:     2012-01-13 21:22:48 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
Update the proxylist when changing traits so they are correctly changed

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-01-13 21:22:39 UTC (rev 7998)
+++ trunk/src/server/adminmanager.cpp	2012-01-13 21:22:48 UTC (rev 7999)
@@ -11464,6 +11464,8 @@
 
             psTraitChangeMessage message(client->GetClientNum(), target->GetActor()->GetEID(), str);
             message.Multicast( target->GetActor()->GetMulticastClients(), 0, PROX_LIST_ANY_RANGE );
+            //update everything needed for bgloader to pick changes correctly.
+            data->targetObject->UpdateProxList(true);
 
             psserver->SendSystemOK(client->GetClientNum(), "Trait successfully changed");
             return;

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

Revision: 8050
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8050&view=rev
Author:   weltall2
Date:     2012-01-30 08:41:35 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
changed the scope of an useless check and commented it out as it's useless and caused crashes

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-01-28 18:38:30 UTC (rev 8049)
+++ trunk/src/server/adminmanager.cpp	2012-01-30 08:41:35 UTC (rev 8050)
@@ -525,23 +525,26 @@
             // because the target* may not be online
             targetObject = msgManager->FindObjectByString(word, NULL);
             
-            if (!targetObject && GetPlayerAccountIDByPID(me->clientnum, word)) 
+            if(!targetObject)
             {
-                // try to find an online player for the name resolved
-                // from the pid
-                // (GetPlayerClient sets targetClient accordingly)
-                /*if (!GetPlayerClient(msgManager, me->clientnum, target, false))
-                {
-                    // error duplicate or not found at all
-                    if (duplicateActor)
+                //if(GetPlayerAccountIDByPID(me->clientnum, word))
+                //{
+                    // try to find an online player for the name resolved
+                    // from the pid
+                    // (GetPlayerClient sets targetClient accordingly)
+                    /*if (!GetPlayerClient(msgManager, me->clientnum, target, false))
                     {
-                        psserver->SendSystemError(me->clientnum,"PID resolves to multiple online clients!");
-                        return false;
-                    }
-                    else
-                    {*/
-                        // player is offline
-                psserver->SendSystemInfo(me->clientnum,"PID:%s no online client", ShowID(targetID));
+                        // error duplicate or not found at all
+                        if (duplicateActor)
+                        {
+                            psserver->SendSystemError(me->clientnum,"PID resolves to multiple online clients!");
+                            return false;
+                        }
+                        else
+                        {*/
+                            // player is offline
+                    psserver->SendSystemInfo(me->clientnum,"PID:%s no online client", ShowID(targetID));
+                        //}
                     //}
                 //}
             }

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

Revision: 8101
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8101&view=rev
Author:   magodra
Date:     2012-02-26 18:08:00 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
- Fixed updated of segments when waypoints are adjusted.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-02-26 13:18:52 UTC (rev 8100)
+++ trunk/src/server/adminmanager.cpp	2012-02-26 18:08:00 UTC (rev 8101)
@@ -5973,13 +5973,8 @@
         {
             psPathPoint* point = iter.Next();
             
-            // Don't send enpoints of paths
-            if (!point->GetWaypoint())
-            {
-                psStopEffectMessage msg(client->GetClientNum(), point->GetEffectID(this));
-                msg.SendMessage();
-            }
-            
+            psStopEffectMessage msg(client->GetClientNum(), point->GetEffectID(this));
+            msg.SendMessage();
         }
     }
 }
@@ -6064,7 +6059,6 @@
             }
 
             int index = point->GetPathIndex();
-
             if (index > 0)
             {
                 const psPathPoint* prev = point->GetPath()->GetPoint(index-1);
@@ -6124,6 +6118,32 @@
                 // Display
                 psEffectMessage show(client->GetClientNum(),"admin_path_point",point->GetPosition(),0,0,point->GetEffectID(this),point->GetRadius());
                 show.SendMessage();
+
+                int index = point->GetPathIndex();
+                if (index > 0)
+                {
+                    const psPathPoint* prev = point->GetPath()->GetPoint(index-1);
+
+                    // Check that the point is in same sector.
+                    // TODO fix for other sectors
+                    if (prev->GetSector(EntityManager::GetSingleton().GetEngine()) == sector)
+                    {
+                        csVector3 delta = point->GetPosition() - prev->GetPosition();
+                        
+                        float angle = atan2(delta.x,delta.z);
+                        float length = delta.Norm();
+                        
+                        psEffectMessage msg(client->GetClientNum(),"admin_path_segment",
+                                            point->GetPosition(),0,0,point->GetEffectID(this),angle,length,point->GetRadius(),prev->GetRadius());
+                        msg.SendMessage();
+                    }
+                }
+
+                if (index < (point->GetPath()->GetNumPoints()-1))
+                {
+                    UpdateDisplayPath(point->GetPath()->GetPoint(index+1));
+                }
+                
             }
         }
     }
@@ -6151,6 +6171,14 @@
                 psEffectMessage show(client->GetClientNum(),"admin_waypoint",wp->GetPosition(),0,0,
                                      wp->GetEffectID(this),wp->GetRadius());
                 show.SendMessage();
+
+                csPDelArray<Edge>::Iterator iter = wp->edges.GetIterator();
+                while (iter.HasNext())
+                {
+                    Edge* edge = iter.Next();
+
+                    UpdateDisplayPath(edge->GetStartPoint());
+                }
             }
         }
     }

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

Revision: 8320
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8320&view=rev
Author:   lpancallo
Date:     2012-05-29 10:24:42 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Added missing npcowned flag on /info 

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-05-28 21:02:57 UTC (rev 8319)
+++ trunk/src/server/adminmanager.cpp	2012-05-29 10:24:42 UTC (rev 8320)
@@ -4848,6 +4848,8 @@
                   info += " 'collide'";
               if ( flags & PSITEM_FLAG_SETTINGITEM)
                   info += " 'settingitem'";
+              if ( flags & PSITEM_FLAG_NPCOWNED)
+                  info += " 'npcowned'";
           }
 
           psserver->SendSystemInfo(client->GetClientNum(),info);

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

Revision: 8327
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8327&view=rev
Author:   lpancallo
Date:     2012-05-29 22:43:36 +0000 (Tue, 29 May 2012)
Log Message:
-----------
automatic code formatting.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-05-29 18:47:55 UTC (rev 8326)
+++ trunk/src/server/adminmanager.cpp	2012-05-29 22:43:36 UTC (rev 8327)
@@ -95,47 +95,50 @@
 /** This class asks user to confirm that he really wants to do the area target he/she requested */
 class AreaTargetConfirm : public PendingQuestion
 {
-    public:
-        AreaTargetConfirm(AdminManager* msgmanager, const csString in_msg, csString in_player, const csString & question, Client *in_client)
-            : PendingQuestion(in_client->GetClientNum(),question, psQuestionMessage::generalConfirm)
-        {   //save variables for later use
-            this->command = in_msg;
-            this->client  = in_client;
-            this->player  = in_player;
-            this->msgmanager = msgmanager;
+public:
+    AreaTargetConfirm(AdminManager* msgmanager, const csString in_msg, csString in_player, const csString & question, Client *in_client)
+        : PendingQuestion(in_client->GetClientNum(),question, psQuestionMessage::generalConfirm)
+    {
+        //save variables for later use
+        this->command = in_msg;
+        this->client  = in_client;
+        this->player  = in_player;
+        this->msgmanager = msgmanager;
+    }
+
+    /// Handles the user choice
+    virtual void HandleAnswer(const csString & answer)
+    {
+        if (answer != "yes")   //if we haven't got a confirm just get out of here
+        {
+            return;
         }
 
-        /// Handles the user choice
-        virtual void HandleAnswer(const csString & answer)
+        //decode the area command and get the list of objects to work on
+        csArray<csString> filters = msgmanager->DecodeCommandArea(client, player);
+        csArray<csString>::Iterator it(filters.GetIterator());
+        while (it.HasNext())
         {
-            if (answer != "yes") //if we haven't got a confirm just get out of here
-                return;
+            csString cur_player = it.Next(); //get the data about the specific entity on this iteration
 
-            //decode the area command and get the list of objects to work on
-            csArray<csString> filters = msgmanager->DecodeCommandArea(client, player);
-            csArray<csString>::Iterator it(filters.GetIterator());
-            while (it.HasNext())
+            gemObject * targetobject = psserver->GetAdminManager()->FindObjectByString(cur_player, client->GetActor());
+            if (targetobject == client->GetActor())
             {
-                csString cur_player = it.Next(); //get the data about the specific entity on this iteration
+                continue;
+            }
 
-                gemObject * targetobject = psserver->GetAdminManager()->FindObjectByString(cur_player, client->GetActor());
-                if(targetobject == client->GetActor())
-                {
-                    continue;
-                }
-
-                csString cur_command = command;  //get the original command inside a variable where we will change it according to cur_player
-                cur_command.ReplaceAll(player.GetData(), cur_player.GetData()); //replace the area command with the eid got from the iteration
-                psAdminCmdMessage cmd(cur_command.GetData(),client->GetClientNum()); //prepare the new message
-                cmd.FireEvent(); //send it to adminmanager
-            }
+            csString cur_command = command;  //get the original command inside a variable where we will change it according to cur_player
+            cur_command.ReplaceAll(player.GetData(), cur_player.GetData()); //replace the area command with the eid got from the iteration
+            psAdminCmdMessage cmd(cur_command.GetData(),client->GetClientNum()); //prepare the new message
+            cmd.FireEvent(); //send it to adminmanager
         }
+    }
 
-    protected:
-        csString command;   ///< The complete command sent from the client originally (without any modification)
-        Client *client;     ///< Originating client of the command
-        csString player;    ///< Normally this should be the area:x:x command extrapolated from the original command
-        AdminManager* msgmanager;
+protected:
+    csString command;   ///< The complete command sent from the client originally (without any modification)
+    Client *client;     ///< Originating client of the command
+    csString player;    ///< Normally this should be the area:x:x command extrapolated from the original command
+    AdminManager* msgmanager;
 };
 
 psRewardData::psRewardData(Reward_Type prewardType)
@@ -148,19 +151,19 @@
     return true;
 }
 
-psRewardDataExperience::psRewardDataExperience(int pexpDelta) 
-: psRewardData(REWARD_EXPERIENCE)
+psRewardDataExperience::psRewardDataExperience(int pexpDelta)
+    : psRewardData(REWARD_EXPERIENCE)
 {
     expDelta = pexpDelta;
 }
 
 bool psRewardDataExperience::IsZero()
 {
-    return ( expDelta == 0 );
+    return (expDelta == 0);
 }
 
-psRewardDataFaction::psRewardDataFaction(csString pfactionName, int pfactionDelta) 
-: psRewardData(REWARD_FACTION)
+psRewardDataFaction::psRewardDataFaction(csString pfactionName, int pfactionDelta)
+    : psRewardData(REWARD_FACTION)
 {
     factionName = pfactionName;
     factionDelta = pfactionDelta;
@@ -172,7 +175,7 @@
 }
 
 psRewardDataSkill::psRewardDataSkill(csString pskillName, int pskillDelta, int pskillCap, bool prelativeSkill)
-: psRewardData(REWARD_SKILL)
+    : psRewardData(REWARD_SKILL)
 {
     skillName = pskillName;
     skillDelta = pskillDelta;
@@ -186,7 +189,7 @@
 }
 
 psRewardDataMoney::psRewardDataMoney(csString pmoneyType, int pmoneyCount, bool prandom)
-: psRewardData(REWARD_MONEY), moneyType(pmoneyType), moneyCount(pmoneyCount), random(prandom)
+    : psRewardData(REWARD_MONEY), moneyType(pmoneyType), moneyCount(pmoneyCount), random(prandom)
 {
 }
 
@@ -196,7 +199,7 @@
 }
 
 psRewardDataItem::psRewardDataItem(csString pitemName, int pstackCount)
-: psRewardData(REWARD_ITEM)
+    : psRewardData(REWARD_ITEM)
 {
     itemName = pitemName;
     stackCount = pstackCount;
@@ -223,14 +226,14 @@
 
 
 AdminCmdData::AdminCmdData(csString commandName, WordArray &words)
-: command(commandName), help(false), valid(true)
+    : command(commandName), help(false), valid(true)
 {
     // when help is requested, return immediate
     if (IsHelp(words[1]))
         return;
 
     // parse nothing, so words array must only contain the command
-    if (words.GetCount() != 1) 
+    if (words.GetCount() != 1)
     {
         valid = false;
     }
@@ -267,7 +270,7 @@
         return true;
 
     csString escape;
-    db->Escape( escape, cmd );
+    db->Escape(escape, cmd);
     int result = db->Command("INSERT INTO gm_command_log "
                              "(account_id,gm,command,player,ex_time) "
                              "VALUES (%u,%u,\"%s\",%u,Now())", gmClient->GetAccountID().Unbox(), gmClient->GetPID().Unbox(), escape.GetData(), playerID.Unbox());
@@ -356,7 +359,7 @@
 
     //first of all check if db hits are allowed. most commands don't
     //work with the database so there is no use to hit the db for that.
-    if(!IsAllowedTargetType(ADMINCMD_TARGET_DATABASE))
+    if (!IsAllowedTargetType(ADMINCMD_TARGET_DATABASE))
         return false;
 
     PID pid = PID(strtoul(word.Slice(4).GetData(), NULL, 10));
@@ -384,7 +387,7 @@
     targetTypes |= ADMINCMD_TARGET_PID;
 
     psserver->SendSystemInfo(gmClientNum, "Account ID of player (pid:%s) %s is %s.",
-                                 target.GetData(), ShowID(targetID), ShowID(targetAccountID));
+                             target.GetData(), ShowID(targetID), ShowID(targetAccountID));
 
     return true;
 }
@@ -408,7 +411,7 @@
             // otherwise query the database
             GetPlayerAccountIDByName(gmClientNum, target, true);
         }
-    } 
+    }
     return targetAccountID;
 }
 
@@ -416,7 +419,7 @@
 {
     //first of all check if db hits are allowed. most commands don't
     //work with the database so there is no use to hit the db for that.
-    if(!IsAllowedTargetType(ADMINCMD_TARGET_DATABASE))
+    if (!IsAllowedTargetType(ADMINCMD_TARGET_DATABASE))
         return false;
 
     // try to find an offline player by name and resolve to a pid
@@ -424,9 +427,9 @@
     // normalize and escape name (to avoid security issues)
     db->Escape(name, NormalizeCharacterName(word).GetData());
     Result result(db->Select("SELECT account_id, id FROM characters where name='%s'",name.GetData()));
-    
+
     //nothing here, try with another name
-    if (!result.IsValid() || result.Count() == 0) 
+    if (!result.IsValid() || result.Count() == 0)
     {
         if (reporterror)
         {
@@ -434,8 +437,8 @@
         }
         return false;
     }
-    else if (result.Count() != 1) 
-    //more than one result it means we have duplicates, refrain from continuing
+    else if (result.Count() != 1)
+        //more than one result it means we have duplicates, refrain from continuing
     {
         psserver->SendSystemError(gmClientNum,"Multiple characters with same name '%s'. Use pid.",name.GetData());
         return false;
@@ -474,10 +477,10 @@
 bool AdminCmdTargetParser::GetPlayerClient(AdminManager* msgManager, size_t gmClientNum, const csString& playerName, bool allowduplicate)
 {
     targetClient = msgManager->FindPlayerClient(playerName); // Other player?
-    if(targetClient)
+    if (targetClient)
     {
         //check that the actor name isn't duplicate
-        if(!CharCreationManager::IsUnique(playerName, true)) 
+        if (!CharCreationManager::IsUnique(playerName, true))
         {
             duplicateActor = true;
             if (!allowduplicate)
@@ -524,29 +527,29 @@
             // NOTE: this might not set targetObject, targetActor, targetClient
             // because the target* may not be online
             targetObject = msgManager->FindObjectByString(word, NULL);
-            
-            if(!targetObject)
+
+            if (!targetObject)
             {
                 //if(GetPlayerAccountIDByPID(me->clientnum, word))
                 //{
-                    // try to find an online player for the name resolved
-                    // from the pid
-                    // (GetPlayerClient sets targetClient accordingly)
-                    /*if (!GetPlayerClient(msgManager, me->clientnum, target, false))
+                // try to find an online player for the name resolved
+                // from the pid
+                // (GetPlayerClient sets targetClient accordingly)
+                /*if (!GetPlayerClient(msgManager, me->clientnum, target, false))
+                {
+                    // error duplicate or not found at all
+                    if (duplicateActor)
                     {
-                        // error duplicate or not found at all
-                        if (duplicateActor)
-                        {
-                            psserver->SendSystemError(me->clientnum,"PID resolves to multiple online clients!");
-                            return false;
-                        }
-                        else
-                        {*/
-                            // player is offline
-                    psserver->SendSystemInfo(me->clientnum,"PID:%s no online client", ShowID(targetID));
-                        //}
-                    //}
+                        psserver->SendSystemError(me->clientnum,"PID resolves to multiple online clients!");
+                        return false;
+                    }
+                    else
+                    {*/
+                // player is offline
+                psserver->SendSystemInfo(me->clientnum,"PID:%s no online client", ShowID(targetID));
                 //}
+                //}
+                //}
             }
             else
             {
@@ -564,16 +567,16 @@
             csString question; //used to hold the generated question for the client
             //first part of the question add also the command which will be used on the area if confirmed (the name not the arguments)
             question.Format("Are you sure you want to execute %s on:\n", msg.cmd.GetData());
-                            //command.GetDataSafe());
+            //command.GetDataSafe());
             csArray<csString> filters = msgManager->DecodeCommandArea(client, word); //decode the area command
             csArray<csString>::Iterator it(filters.GetIterator());
-            if(filters.GetSize())
+            if (filters.GetSize())
             {
                 while (it.HasNext()) //iterate the resulting entities
                 {
                     csString player = it.Next();
                     targetObject = msgManager->FindObjectByString(player,client->GetActor()); //search for the entity in order to work on it
-                    if(targetObject && targetObject != client->GetActor()) //just to be sure
+                    if (targetObject && targetObject != client->GetActor()) //just to be sure
                     {
                         question += targetObject->GetName(); //get the name of the target in order to show it nicely
                         question += '\n';
@@ -597,7 +600,7 @@
             {
                 // targetclient, online, duplicateActor are set accordingly
                 // by GetPlayerClient
-                if(GetPlayerClient(msgManager, me->clientnum, word, true))
+                if (GetPlayerClient(msgManager, me->clientnum, word, true))
                 {
                     targetTypes |= ADMINCMD_TARGET_PLAYER;
                 }
@@ -607,7 +610,7 @@
                     return false;
                 }
                 // if the command supports pid handling
-                else if(IsAllowedTargetType(ADMINCMD_TARGET_PID))
+                else if (IsAllowedTargetType(ADMINCMD_TARGET_PID))
                 {
                     GetPlayerAccountIDByPIDFromName(me->clientnum, word, false);
                 }
@@ -623,7 +626,7 @@
             else if (IsAllowedTargetType(ADMINCMD_TARGET_OBJECT) ||
                      IsAllowedTargetType(ADMINCMD_TARGET_NPC)    ||
                      IsAllowedTargetType(ADMINCMD_TARGET_ITEM))
-            // Not found yet
+                // Not found yet
             {
                 targetObject = msgManager->FindObjectByString(word,client->GetActor()); // Find by ID or name
                 if (targetObject)
@@ -631,7 +634,7 @@
                     targetTypes |= ADMINCMD_TARGET_OBJECT;
                 }
                 else
-                // no object selected try the clients target
+                    // no object selected try the clients target
                 {
                     tryClientTarget = true;
                 }
@@ -649,7 +652,7 @@
     {
         tryClientTarget = true;
     }
-   
+
     // take the target of the client (when client selected something)
     if (tryClientTarget && IsAllowedTargetType(ADMINCMD_TARGET_CLIENTTARGET))
     {
@@ -660,7 +663,7 @@
             psserver->SendSystemError(me->clientnum,"You must have a target selected.");
             return false;
         }
-        else if (targetObject) 
+        else if (targetObject)
         {
             targetTypes |= ADMINCMD_TARGET_CLIENTTARGET;
         }
@@ -685,7 +688,7 @@
                 // it is a npc, but npc is not an allowed target, so reset
                 Reset();
             }
-            else 
+            else
             {
                 // it is definitely not a player (because it is a npc)
                 targetTypes &= ~(ADMINCMD_TARGET_PLAYER);
@@ -700,7 +703,7 @@
         target = (targetClient)?targetClient->GetName():targetObject->GetName();
         targetID = targetObject->GetPID();
     }
-    
+
     // Set additional targetTypes accordingly for me & player
     if (targetClient)
     {
@@ -726,11 +729,11 @@
             username.Downcase();
             db->Escape(usernameEscaped, username.GetData());
             result = db->Select("SELECT id FROM accounts WHERE username = '%s' LIMIT 1",usernameEscaped.GetData());
-            if ( result.IsValid() && result.Count() == 1 )
+            if (result.IsValid() && result.Count() == 1)
             {
                 AccountID accountID = AccountID(result[0].GetUInt32("id"));
                 if (accountID.IsValid())
-                {   
+                {
                     targetAccountID = accountID;
                     target = word;
                     return true;
@@ -785,12 +788,12 @@
 
     // concatenate all subcommands
     csHash<csString, csString>::GlobalIterator it = subCommands.GetIterator();
-    while(it.HasNext())
+    while (it.HasNext())
     {
         csTuple2<csString,csString> tuple = it.NextTuple();
         help += "|" + tuple.second;
     }
-    
+
     // remove the starting '|' character
     help.SetAt(0, ' ');
     help.LTrim();
@@ -912,7 +915,7 @@
 
 csString AdminCmdRewardParser::GetHelpMessage()
 {
-    return "REWARD: \n   " + // rewardTypes.GetHelpMessage() + "\n" + "   " 
+    return "REWARD: \n   " + // rewardTypes.GetHelpMessage() + "\n" + "   "
            rewardTypes.GetHelpMessage("exp") + "\n" +
            "   " + rewardTypes.GetHelpMessage("item") + "\n" +
            "   " + rewardTypes.GetHelpMessage("skill") + "\n" +
@@ -921,7 +924,7 @@
 }
 
 AdminCmdOnOffToggleParser::AdminCmdOnOffToggleParser(ADMINCMD_SETTING_ONOFF defaultValue)
-: value(defaultValue)
+    : value(defaultValue)
 {
 }
 
@@ -971,7 +974,7 @@
 }
 
 AdminCmdDataTarget::AdminCmdDataTarget(csString commandName, int targetTypes, AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData(commandName), AdminCmdTargetParser(targetTypes) 
+    : AdminCmdData(commandName), AdminCmdTargetParser(targetTypes)
 {
     size_t index = 1;
 
@@ -986,7 +989,7 @@
     }
     // if first word is not a target and the client has not selected a target
     else if (!IsTargetType(ADMINCMD_TARGET_CLIENTTARGET) &&
-                    !IsTargetType(ADMINCMD_TARGET_STRING))
+             !IsTargetType(ADMINCMD_TARGET_STRING))
     {
         ParseError(me, "No target specified");
     }
@@ -1008,7 +1011,7 @@
 }
 
 AdminCmdDataTargetReason::AdminCmdDataTargetReason(csString commandName, AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget(commandName, ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget(commandName, ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
@@ -1043,8 +1046,8 @@
 ADMINCMDFACTORY_IMPLEMENT_MSG_FACTORY_CREATE_WITH_CMD(AdminCmdDataTargetReason)
 
 /*
-AdminCmdData* AdminCmdDataTargetReason::CreateCmdData(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words) 
-{ 
+AdminCmdData* AdminCmdDataTargetReason::CreateCmdData(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
+{
     return new AdminCmdDataTargetReason(command, msgManager, me, msg, client, words);
 }
 */
@@ -1055,7 +1058,7 @@
 }
 
 AdminCmdDataDeath::AdminCmdDataDeath(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/death",  ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_EID)
+    : AdminCmdDataTarget("/death",  ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_EID)
 {
     size_t index = 1;
     bool found = false;
@@ -1101,7 +1104,7 @@
 }
 
 AdminCmdDataDeleteChar::AdminCmdDataDeleteChar(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/deletechar", ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID), requestor(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
+    : AdminCmdDataTarget("/deletechar", ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID), requestor(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
 
@@ -1129,7 +1132,7 @@
         }
     }
     else
-    { 
+    {
         ParseError(me, "No target specified");
     }
 }
@@ -1146,11 +1149,11 @@
 
 
 AdminCmdDataUpdateRespawn::AdminCmdDataUpdateRespawn(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/updaterespawn", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/updaterespawn", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found = false; // true when first word is a target string
-    
+
     // when help is requested, return immediate
     if (IsHelp(words[index]))
         return;
@@ -1192,7 +1195,7 @@
 }
 
 AdminCmdDataBan::AdminCmdDataBan(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/ban", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
+    : AdminCmdDataTarget("/ban", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_ACCOUNT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
     bool found;
@@ -1207,15 +1210,15 @@
     {
         index++;
     }
-    
+
     // if not enough remaining words
-    if ( words.GetCount() <= index + 1)
+    if (words.GetCount() <= index + 1)
     {
         ParseError(me, "Not enough parameters");
     }
     // either a target was in the first word or
     // the client has got a valid target
-    else if (found || IsTargetType(ADMINCMD_TARGET_CLIENTTARGET)) 
+    else if (found || IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))
     {
         // try to parse numbers
         minutes = words.GetInt(index);
@@ -1263,7 +1266,7 @@
 }
 
 AdminCmdDataKillNPC::AdminCmdDataKillNPC(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/killnpc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE), reload(false)
+    : AdminCmdDataTarget("/killnpc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE), reload(false)
 {
     size_t index = 1;
     bool found;
@@ -1272,7 +1275,7 @@
     if (IsHelp(words[index]))
         return;
 
-    // try first word as a target 
+    // try first word as a target
     if ((found = ParseTarget(msgManager, me, msg, client, words[index])))
     {
         index++;
@@ -1287,7 +1290,7 @@
             index++;
             reload = true;
         }
-        else if (words.GetCount() > index) 
+        else if (words.GetCount() > index)
         {
             ParseError(me, "Too many parameters");
         }
@@ -1306,7 +1309,7 @@
 }
 
 AdminCmdDataPercept::AdminCmdDataPercept(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/percept", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET )
+    : AdminCmdDataTarget("/percept", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
@@ -1315,7 +1318,7 @@
     if (IsHelp(words[index]))
         return;
 
-    // try first word as a target 
+    // try first word as a target
     if ((found = ParseTarget(msgManager, me, msg, client, words[index])))
     {
         index++;
@@ -1329,10 +1332,10 @@
         {
             ParseError(me, "Missing perception");
         }
-        
+
         type = words[index++];
 
-        if (words.GetCount() > index) 
+        if (words.GetCount() > index)
         {
             ParseError(me, "Too many parameters");
         }
@@ -1351,7 +1354,7 @@
 }
 
 AdminCmdDataChangeNPCType::AdminCmdDataChangeNPCType(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/changenpctype", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), npcType("")
+    : AdminCmdDataTarget("/changenpctype", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), npcType("")
 {
     size_t index = 1;
     bool found;
@@ -1360,7 +1363,7 @@
     if (IsHelp(words[index]))
         return;
 
-    // try first word as a target 
+    // try first word as a target
     if ((found = ParseTarget(msgManager, me, msg, client, words[index])))
     {
         index++;
@@ -1375,7 +1378,7 @@
             npcType = words[index];
             index++;
         }
-        else if (words.GetCount() > index) 
+        else if (words.GetCount() > index)
         {
             ParseError(me, "Too many parameters");
         }
@@ -1399,7 +1402,7 @@
 
 
 AdminCmdDataSetStackable::AdminCmdDataSetStackable(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/setstackable", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET), subCommandList("info on off reset help")
+    : AdminCmdDataTarget("/setstackable", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET), subCommandList("info on off reset help")
 {
     size_t index = 1;
     bool found;
@@ -1413,7 +1416,7 @@
     {
         index++;
     }
-   
+
     // missing further words
     if (words.GetCount() == index)
     {
@@ -1454,7 +1457,7 @@
 
 // loadquest is only responsible for loading and reloading quests
 AdminCmdDataLoadQuest::AdminCmdDataLoadQuest(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/loadquest")
+    : AdminCmdData("/loadquest")
 {
     size_t index = 1;
 
@@ -1485,7 +1488,7 @@
 }
 
 AdminCmdDataItem::AdminCmdDataItem(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/item", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_STRING), random(false), quality(50)
+    : AdminCmdDataTarget("/item", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_STRING), random(false), quality(50)
 {
     size_t index = 1;
 
@@ -1495,7 +1498,8 @@
 
     // /item is allowed
     if (words.GetCount() == index)
-    {// no action required
+    {
+        // no action required
     }
     // /item <item> [random] <quality>
     else if (words.GetCount() >=2)
@@ -1504,7 +1508,7 @@
         if (ParseTarget(msgManager, me, msg, client, words[index]))
         {
             index++;
-            
+
             // random is optional
             csString cc = words[index];
             if (words[index]=="random")
@@ -1521,7 +1525,7 @@
                 ParseError(me, "Too many parameters");
             }
         }
-        else 
+        else
         {
             ParseError(me, "No target given");
         }
@@ -1540,9 +1544,9 @@
 }
 
 AdminCmdDataKey::AdminCmdDataKey(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/key", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_CLIENTTARGET),
-        subCommandList("make makemaster copy clearlocks skel"),
-        subTargetCommandList("changelock makeunlockable securitylockable addlock removelock")
+    : AdminCmdDataTarget("/key", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_CLIENTTARGET),
+      subCommandList("make makemaster copy clearlocks skel"),
+      subTargetCommandList("changelock makeunlockable securitylockable addlock removelock")
 {
     size_t index = 1;
     bool found;
@@ -1558,11 +1562,11 @@
     }
 
     //check the subcommand and if it needs a target if the target was found
-    if(subCommandList.IsSubCommand(words[index]))
+    if (subCommandList.IsSubCommand(words[index]))
     {
         subCommand = words[index++];
     }
-    else if(subTargetCommandList.IsSubCommand(words[index]))
+    else if (subTargetCommandList.IsSubCommand(words[index]))
     {
         // if first word a target or client selected a valid target
         if (found || IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))
@@ -1590,7 +1594,7 @@
 }
 
 AdminCmdDataRunScript::AdminCmdDataRunScript(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/runscript", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET), origObj(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/runscript", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET), origObj(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     // when help is requested, return immediate
@@ -1602,16 +1606,16 @@
     //first take the name of the script
     scriptName = words[index++];
     //if there are more entries probably we have a target
-    if(words.GetCount() >= index + 1)
+    if (words.GetCount() >= index + 1)
     {
         //check first the target
-        if(ParseTarget(msgManager, me, msg, client, words[index++]))
+        if (ParseTarget(msgManager, me, msg, client, words[index++]))
         {
             //if there is another field we have also an origin
-            if(words.GetCount() == index + 1)
+            if (words.GetCount() == index + 1)
             {
                 //check the origin if it's valid
-                if(!origObj.ParseTarget(msgManager, me, msg, client, words[index++]))
+                if (!origObj.ParseTarget(msgManager, me, msg, client, words[index++]))
                 {
                     ParseError(me,"Invalid origin target given");
                 }
@@ -1638,7 +1642,7 @@
 }
 
 AdminCmdDataCrystal::AdminCmdDataCrystal(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/crystal", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_STRING)
+    : AdminCmdDataTarget("/crystal", ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_STRING)
 {
     // when help is requested, return immediate
     if (IsHelp(words[1]))
@@ -1666,7 +1670,7 @@
 }
 
 AdminCmdDataTeleport::AdminCmdDataTeleport(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/teleport", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_DATABASE), destList("here there last spawn restore"), destObj(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM)
+    : AdminCmdDataTarget("/teleport", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_DATABASE), destList("here there last spawn restore"), destObj(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM)
 {
     destList.Push("map", "(<map name>|here) | (<sector name> <x> <y> <z>) [<instance>]");
     size_t index = 1;
@@ -1690,7 +1694,7 @@
             dest = words[index++];
             // current word is not a default target
             // but it might be 'map'
-            if(dest == "map")
+            if (dest == "map")
             {
                 // map target specified by map name
                 if (words.GetCount() == index + 1)
@@ -1753,16 +1757,16 @@
 
 csString AdminCmdDataTeleport::GetHelpMessage()
 {
-    return "Syntax: \"" + command + " <subject> <destination>\"\n" 
-                                 "Subject    : " + GetHelpMessagePartForTarget() + "\n"
-                                 "Destination: me [<instance>]/target/<object name>/<NPC name>/<player name>/eid:<EID>/pid:<PID>/\n"
-                                 "             here [<instance>]/last/spawn/restore/map [<map name>|here] <x> <y> <z> [<instance>]\n"
-                                 "             there <instance>\n"
-                                 "             restore";
+    return "Syntax: \"" + command + " <subject> <destination>\"\n"
+           "Subject    : " + GetHelpMessagePartForTarget() + "\n"
+           "Destination: me [<instance>]/target/<object name>/<NPC name>/<player name>/eid:<EID>/pid:<PID>/\n"
+           "             here [<instance>]/last/spawn/restore/map [<map name>|here] <x> <y> <z> [<instance>]\n"
+           "             there <instance>\n"
+           "             restore";
 }
 
 AdminCmdDataSlide::AdminCmdDataSlide(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/slide", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/slide", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
@@ -1792,12 +1796,12 @@
 
 csString AdminCmdDataSlide::GetHelpMessage()
 {
-   return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() +
+    return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() +
            " [direction] [distance]\nAllowed directions: U D L R F B T I";
 }
 
 AdminCmdDataChangeName::AdminCmdDataChangeName(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/changename", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE), uniqueName(true), uniqueFirstName(true)
+    : AdminCmdDataTarget("/changename", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE), uniqueName(true), uniqueFirstName(true)
 {
     size_t index = 1;
     bool found;
@@ -1859,12 +1863,12 @@
 
 csString AdminCmdDataChangeName::GetHelpMessage()
 {
-   return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() +
+    return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() +
            " [force|forceall] <NewName> [NewLastName]\"";
 }
 
 AdminCmdDataChangeGuildName::AdminCmdDataChangeGuildName(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/changeguildname")
+    : AdminCmdData("/changeguildname")
 {
     // when help is requested, return immediate
     if (IsHelp(words[1]))
@@ -1889,7 +1893,7 @@
 }
 
 AdminCmdDataChangeGuildLeader::AdminCmdDataChangeGuildLeader(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/changeguildleader", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
+    : AdminCmdDataTarget("/changeguildleader", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
     bool found = false;
@@ -1923,7 +1927,7 @@
 }
 
 AdminCmdDataPetition::AdminCmdDataPetition(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/petition")
+    : AdminCmdData("/petition")
 {
     // when help is requested, return immediate
     if (IsHelp(words[1]))
@@ -1948,7 +1952,7 @@
 }
 
 AdminCmdDataImpersonate::AdminCmdDataImpersonate(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/impersonate", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_OBJECT)
+    : AdminCmdDataTarget("/impersonate", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_OBJECT)
 {
     size_t index = 1;
     bool found = false;
@@ -1959,7 +1963,7 @@
         return;
 
     // when first parameter a valid player name or 'target' or 'text'
-    if(words[index] == "text")
+    if (words[index] == "text")
     {
         found = true;
         target = words[index];
@@ -1975,21 +1979,23 @@
     {
         commandMod = words[index];
         commandMod.Downcase();
-        if ( commandMod == "say" || commandMod == "shout" || commandMod == "worldshout" )
-        { // command mode (if supplied)
+        if (commandMod == "say" || commandMod == "shout" || commandMod == "worldshout")
+        {
+            // command mode (if supplied)
             index++;
         }
-        else if(commandMod == "anim")
+        else if (commandMod == "anim")
         {
             index++;
             //check if a duration is specified
-            if(words.GetCount() > index + 1)
+            if (words.GetCount() > index + 1)
             {
                 duration = words.GetInt(index++);
             }
         }
         else
-        { // default is to use say
+        {
+            // default is to use say
             commandMod = "say";
         }
         text = words.GetTail(index);
@@ -2005,11 +2011,11 @@
 csString AdminCmdDataImpersonate::GetHelpMessage()
 {
     return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + "] [say|shout|worldshout|anim] <text/[anim duration] anim name>\"\n"
-            "If name is \"text\" the given text is used as it is.";
+           "If name is \"text\" the given text is used as it is.";
 }
 
 AdminCmdDataDeputize::AdminCmdDataDeputize(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/deputize", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/deputize", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found = false;
@@ -2018,7 +2024,7 @@
     if (IsHelp(words[1]))
         return;
 
-    // when first parameter a valid player name or 'target' 
+    // when first parameter a valid player name or 'target'
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
@@ -2041,11 +2047,11 @@
 csString AdminCmdDataDeputize::GetHelpMessage()
 {
     return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + "] reset|player|test|gm|developer\"\n"
-            "Different gm levels can be attained by using gm1..gm5 instead of gm.";
+           "Different gm levels can be attained by using gm1..gm5 instead of gm.";
 }
 
 AdminCmdDataAward::AdminCmdDataAward(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/award", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/award", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
 
@@ -2072,11 +2078,11 @@
 csString AdminCmdDataAward::GetHelpMessage()
 {
     return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + "] {REWARD}\"\n" +
-            rewardList.GetHelpMessage();
+           rewardList.GetHelpMessage();
 }
 
 AdminCmdDataItemTarget::AdminCmdDataItemTarget(csString commandName, AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget(commandName, ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA |ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET), stackCount(0)
+    : AdminCmdDataTarget(commandName, ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA |ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET), stackCount(0)
 {
     size_t index = 1;
     bool found = false;
@@ -2085,7 +2091,7 @@
     if (IsHelp(words[1]))
         return;
 
-    // when first parameter a valid player name or 'target' 
+    // when first parameter a valid player name or 'target'
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
@@ -2128,13 +2134,13 @@
 }
 
 AdminCmdDataCheckItem::AdminCmdDataCheckItem(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataItemTarget("/checkitem", msgManager, me, msg, client, words)
+    : AdminCmdDataItemTarget("/checkitem", msgManager, me, msg, client, words)
 {
     /*
     size_t index = 1;
     bool found = false;
 
-    // when first parameter a valid player name or 'target' 
+    // when first parameter a valid player name or 'target'
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
@@ -2165,7 +2171,7 @@
 }
 
 AdminCmdDataSectorTarget::AdminCmdDataSectorTarget(csString commandName, AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData(commandName), isClientSector(false), sectorInfo(NULL)
+    : AdminCmdData(commandName), isClientSector(false), sectorInfo(NULL)
 {
     // when help is requested, return immediate
     if (IsHelp(words[1]))
@@ -2189,10 +2195,10 @@
     // reset sector name
     sectorName = "";
     // when string to parse is not empty
-    if(!target.IsEmpty())
+    if (!target.IsEmpty())
     {
         //if here was provided just get the sector of the client directly
-        if(target == "here")
+        if (target == "here")
         {
             return GetSectorOfClient(client);
         }
@@ -2201,7 +2207,7 @@
         sectorName = target;
         targetIsSector = true;
     }
-    
+
     // when sectorinfo is not set, neither a sectorname was given
     // nor the current client position revealed a sector
     if (!sectorInfo)
@@ -2210,7 +2216,7 @@
         sectorName = "";
         return false;
     }
-    
+
     return targetIsSector;
 }
 
@@ -2232,7 +2238,7 @@
 
     //csVector3 pos;
     //client->GetActor()->GetPosition(pos,here);
-    if(!here)
+    if (!here)
     {
         sectorName.Clear();
         sectorInfo = NULL;
@@ -2248,7 +2254,7 @@
 
 
 AdminCmdDataWeather::AdminCmdDataWeather(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataSectorTarget("/weather"), enabled(false)
+    : AdminCmdDataSectorTarget("/weather"), enabled(false)
 {
     size_t index = 1;
 
@@ -2258,7 +2264,7 @@
 
     // try to parse the first word as a sector or find the current sector
     // of client
-    if(ParseTarget(msgManager, me, msg, client, words[index]))
+    if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         index++;
     }
@@ -2272,10 +2278,10 @@
     // if a sector was found
     if (sectorInfo)
     {
-        if(words.GetCount() == index + 2)
+        if (words.GetCount() == index + 2)
         {
-            
-            if(words[index] == "on")
+
+            if (words[index] == "on")
             {
                 enabled = true;
             }
@@ -2288,15 +2294,15 @@
                 ParseError(me, "State must be either on or off");
             }
             index++;
-            if(words[index] == "rain")
+            if (words[index] == "rain")
             {
                 type = psWeatherMessage::RAIN;
             }
-            else if(words[index] == "fog")
+            else if (words[index] == "fog")
             {
                 type = psWeatherMessage::FOG;
             }
-            else if(words[index] == "snow")
+            else if (words[index] == "snow")
             {
                 type = psWeatherMessage::SNOW;
             }
@@ -2326,7 +2332,7 @@
 }
 
 AdminCmdDataWeatherEffect::AdminCmdDataWeatherEffect(csString commandName, AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataSectorTarget(commandName), enabled(false), particleCount(4000), interval(600000), fadeTime(10000)
+    : AdminCmdDataSectorTarget(commandName), enabled(false), particleCount(4000), interval(600000), fadeTime(10000)
 {
     size_t index = 1;
 
@@ -2336,7 +2342,7 @@
 
     // try to parse the first word as a sector or find the current sector
     // of client
-    if(ParseTarget(msgManager, me, msg, client, words[1]))
+    if (ParseTarget(msgManager, me, msg, client, words[1]))
     {
         index++;
     }
@@ -2362,7 +2368,7 @@
             interval = words.GetInt(3);
             fadeTime = words.GetInt(4);
         }
-        else if(words[index] == "start")
+        else if (words[index] == "start")
         {
             enabled = true;
         }
@@ -2387,7 +2393,7 @@
 }
 
 AdminCmdDataFog::AdminCmdDataFog(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataSectorTarget("/fog"), enabled(false), density(200), fadeTime(10000), interval(600000), r(200), g(200), b(200)
+    : AdminCmdDataSectorTarget("/fog"), enabled(false), density(200), fadeTime(10000), interval(600000), r(200), g(200), b(200)
 {
     size_t index = 1;
 
@@ -2397,7 +2403,7 @@
 
     // try to parse the first word as a sector or find the current sector
     // of client
-    if(ParseTarget(msgManager, me, msg, client, words[index]))
+    if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         index++;
     }
@@ -2412,7 +2418,7 @@
     if (sectorInfo)
     {
         //This turns off the fog.
-        if (words.GetCount() == index+1 && (words[index] == "stop" || words[index] == "-1" ))
+        if (words.GetCount() == index+1 && (words[index] == "stop" || words[index] == "-1"))
         {
             enabled = false;
         }
@@ -2426,7 +2432,7 @@
             interval = words.GetInt(index++);
             fadeTime = words.GetInt(index++);
         }
-        else if(words[index] == "start")
+        else if (words[index] == "start")
         {
             enabled = true;
         }
@@ -2451,7 +2457,7 @@
 }
 
 AdminCmdDataModify::AdminCmdDataModify(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/modify", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), attributeList("pickupable unpickable transient npcowned collide settingitem pickupableweak")
+    : AdminCmdDataTarget("/modify", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), attributeList("pickupable unpickable transient npcowned collide settingitem pickupableweak")
 {
     size_t index = 1;
     bool found = false;
@@ -2460,7 +2466,7 @@
     if (IsHelp(words[1]))
         return;
 
-    // when first word is a valid target 
+    // when first word is a valid target
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
@@ -2495,11 +2501,11 @@
             z = words.GetFloat(index++);
             rot = words.GetFloat(index);
         }
-        else if(subCommand == "pickskill")
+        else if (subCommand == "pickskill")
         {
             skillName = words[index];
         }
-        else if(attributeList.IsSubCommand(subCommand))
+        else if (attributeList.IsSubCommand(subCommand))
         {
             if (words.GetCount() == index+1)
             {
@@ -2523,7 +2529,7 @@
             }
         }
         // everything else is a syntax error
-        else if(subCommand != "remove")
+        else if (subCommand != "remove")
         {
             ParseError(me,"Invalid subcommand");
         }
@@ -2540,18 +2546,18 @@
 csString AdminCmdDataModify::GetHelpMessage()
 {
     return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() + " <SUBCOMMAND>\"\n"
-            "SUBCOMMAND: intervals <interval> <intervalcap>\n"
-            "            amount <amount>\n"
-            "            level <level>\n"
-            "            range <range>\n"
-            "            move <x> <y> <z> [<y>]\n"
-            "            pickskill <skillname>\n"
-            "            ATTRIBUTE true|false\n"
-            "ATTRIBUTE: " + attributeList.GetHelpMessage();
+           "SUBCOMMAND: intervals <interval> <intervalcap>\n"
+           "            amount <amount>\n"
+           "            level <level>\n"
+           "            range <range>\n"
+           "            move <x> <y> <z> [<y>]\n"
+           "            pickskill <skillname>\n"
+           "            ATTRIBUTE true|false\n"
+           "ATTRIBUTE: " + attributeList.GetHelpMessage();
 }
 
 AdminCmdDataMorph::AdminCmdDataMorph(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/morph", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_EID)
+    : AdminCmdDataTarget("/morph", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_EID)
 {
     size_t index = 1;
     bool found = false;
@@ -2560,21 +2566,21 @@
     if (IsHelp(words[1]))
         return;
 
-    // when first word is a valid target 
+    // when first word is a valid target
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
         index++;
     }
     //always allow list whathever there is a target or not
-    if(words.GetCount() == index + 1 && words[index] == "list")
+    if (words.GetCount() == index + 1 && words[index] == "list")
     {
         subCommand = words[index++];
         if (words.GetCount() > index + 1)
             ParseError(me, "Subcommand " + subCommand + " does not have any parameters");
     }
     // when first word is a target or the client has selected a target
-    else if(words.GetCount() >= index + 1 && (found || (IsTargetType(ADMINCMD_TARGET_CLIENTTARGET)))) 
+    else if (words.GetCount() >= index + 1 && (found || (IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))))
     {
         // test for a subcommand then
         if (words[index] == "list" || words[index] == "reset")
@@ -2588,7 +2594,7 @@
             raceName = words[index++];
             //if there is another entry (specifying the gender)
             //use it else use a default.
-            if(words.GetCount() == index + 1)
+            if (words.GetCount() == index + 1)
             {
                 genderName = words[index++];
             }
@@ -2613,7 +2619,7 @@
 }
 
 AdminCmdDataSetSkill::AdminCmdDataSetSkill(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/setskill", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), sourcePlayer(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), subCommand(),  skillData("",0,0,false)
+    : AdminCmdDataTarget("/setskill", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), sourcePlayer(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET), subCommand(),  skillData("",0,0,false)
 {
     size_t index = 1;
     bool found = false;
@@ -2622,7 +2628,7 @@
     if (IsHelp(words[1]))
         return;
 
-    // when first word is a valid target 
+    // when first word is a valid target
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
@@ -2631,7 +2637,7 @@
     // when first word is a target or the client has selected a target
     if (words.GetCount() == index + 2 && (found || IsTargetType(ADMINCMD_TARGET_CLIENTTARGET)))
     {
-        if (words[index] == "copy") 
+        if (words[index] == "copy")
         {
             subCommand = words[index++];
             // if parsing the word fails
@@ -2644,7 +2650,7 @@
                     ParseError(me,"No source given");
                 }
             }
-        } 
+        }
         else
         {
             skillData.skillName = words[index++];
@@ -2675,12 +2681,12 @@
 csString AdminCmdDataSetSkill::GetHelpMessage()
 {
     return "Syntax: \"" + command + " [TARGET] <skillname>|'all' [+-]<value>\"\n"
-            " or \"" + command + " [TARGET] copy <source>\"\n"
-            "TARGET: " + GetHelpMessagePartForTarget();
+           " or \"" + command + " [TARGET] copy <source>\"\n"
+           "TARGET: " + GetHelpMessagePartForTarget();
 }
 
 AdminCmdDataSet::AdminCmdDataSet(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/set", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_ME), subCommandList("list gm player"), attributeList("invincible invincibility invisibility invisible viewall nevertired nofalldamage infiniteinventory questtester infinitemana instantcast givekillexp attackable buddyhide"), setting(AdminCmdOnOffToggleParser::ADMINCMD_SETTING_TOGGLE)
+    : AdminCmdDataTarget("/set", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_ME), subCommandList("list gm player"), attributeList("invincible invincibility invisibility invisible viewall nevertired nofalldamage infiniteinventory questtester infinitemana instantcast givekillexp attackable buddyhide"), setting(AdminCmdOnOffToggleParser::ADMINCMD_SETTING_TOGGLE)
 {
     size_t index = 1;
     bool found = false;
@@ -2689,14 +2695,14 @@
     if (IsHelp(words[1]))
         return;
 
-    // when first word is a valid target 
+    // when first word is a valid target
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
         index++;
     }
     // when first word is a target or the client has selected a target
-    if (words.GetCount() >= index + 1 && (found || (IsTargetType(ADMINCMD_TARGET_CLIENTTARGET)))) 
+    if (words.GetCount() >= index + 1 && (found || (IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))))
     {
         // sub commands for doing meta stuff of the command
         if (subCommandList.IsSubCommand(words[index]))
@@ -2727,7 +2733,7 @@
         // not a subcommand or attribute
         else
         {
-            ParseError(me, words[index] + " is not a supported attribute" );
+            ParseError(me, words[index] + " is not a supported attribute");
         }
     }
     // no target -> syntax error
@@ -2742,12 +2748,12 @@
 csString AdminCmdDataSet::GetHelpMessage()
 {
     return "Syntax: \"" + command + " " + subCommandList.GetHelpMessage() +
-            "|" + attributeList.GetHelpMessage() + " [" +
-            setting.GetHelpMessage() + "]\"";
+           "|" + attributeList.GetHelpMessage() + " [" +
+           setting.GetHelpMessage() + "]\"";
 }
 
 AdminCmdDataSetLabelColor::AdminCmdDataSetLabelColor(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/setlabelcolor", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA  | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_EID), labelTypeList("normal alive dead npc tester gm gm1 player")
+    : AdminCmdDataTarget("/setlabelcolor", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA  | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_EID), labelTypeList("normal alive dead npc tester gm gm1 player")
 {
     size_t index = 1;
     bool found = false;
@@ -2756,14 +2762,14 @@
     if (IsHelp(words[1]))
         return;
 
-    // when first word is a valid target 
+    // when first word is a valid target
     if (ParseTarget(msgManager, me, msg, client, words[index]))
     {
         found = true;
         index++;
     }
     // when first word is a target or the client has selected a target
-    if (words.GetCount() >= index + 1 && (found || (IsTargetType(ADMINCMD_TARGET_CLIENTTARGET)))) 
+    if (words.GetCount() >= index + 1 && (found || (IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))))
     {
         if (labelTypeList.IsSubCommand(words[index]))
         {
@@ -2791,11 +2797,11 @@
 csString AdminCmdDataSetLabelColor::GetHelpMessage()
 {
     return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() +
-            " " + labelTypeList.GetHelpMessage() + "\"";
+           " " + labelTypeList.GetHelpMessage() + "\"";
 }
 
 AdminCmdDataAction::AdminCmdDataAction(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataSectorTarget("/action"), subCommandList("create_entrance")
+    : AdminCmdDataSectorTarget("/action"), subCommandList("create_entrance")
 {
     size_t index = 1;
 
@@ -2845,7 +2851,7 @@
 AdminCmdDataPath::AdminCmdDataPath(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
     : AdminCmdData("/path"), aliasSubCommandList("add remove rotation"), wpList("waypoints points"), subCmd(), defaultRadius(2.0),radius(0.0)
 {
-    // register sub commands with their extended help message 
+    // register sub commands with their extended help message
     subCommandList.Push("adjust","[<radius>]");
     subCommandList.Push("alias", "[add|remove|rotation]<alias> [<rotation angle>] [<search radius>]");
     subCommandList.Push("display","[points|waypoints]");
@@ -2887,7 +2893,7 @@
         else if (subCmd == "alias")
         {
             aliasSubCmd = words[index++];
-            
+
             if (aliasSubCommandList.IsSubCommand(aliasSubCmd))
             {
                 if (aliasSubCmd == "add")
@@ -2917,7 +2923,7 @@
                         ParseError(me,"Missing argument <alias>");
                         return;
                     }
-                    
+
                     if (!words.GetFloat(index++,rotationAngle))
                     {
                         ParseError(me,"Missing argument <rotation angle> or isn't a float value.");
@@ -2941,7 +2947,8 @@
                 if (words[index] == "waypoints")
                 {
                     cmdTarget = "W";
-                } else
+                }
+                else
                 {
                     cmdTarget = "P";
                 }
@@ -2958,11 +2965,11 @@
             csString wpOrPath = words[index++];
             if (wpOrPath == "wp")
             {
-              wpOrPathIsWP = true;
+                wpOrPathIsWP = true;
             }
             else if (wpOrPath == "path")
             {
-              wpOrPathIsWP = false;
+                wpOrPathIsWP = false;
             }
             else
             {
@@ -2983,7 +2990,8 @@
                 if (words[index] == "waypoints")
                 {
                     cmdTarget = "W";
-                } else
+                }
+                else
                 {
                     cmdTarget = "P";
                 }
@@ -3014,18 +3022,20 @@
                 if (words.GetCount() <= index)
                 {
                     ParseError(me,"Expected either id or name.");
-                } else if (words.GetInt(index,id)) // Is it an id?
+                }
+                else if (words.GetInt(index,id))   // Is it an id?
                 {
                     // We got an id
                     waypointPathIndex = id;
                     wpOrPathIsIndex = true;
-                } else
+                }
+                else
                 {
                     // We got a name
                     waypointPathName = words[index];
                     wpOrPathIsIndex = false;
- 
-                    if ( !wpOrPathIsWP )
+
+                    if (!wpOrPathIsWP)
                     {
                         ParseError(me,"Name not supported for points.");
                     }
@@ -3042,7 +3052,7 @@
             else if (subSubCmd == "add")
             {
                 subCmd = "point add";
-            } 
+            }
             else if (subSubCmd == "remove")
             {
                 subCmd = "point remove";
@@ -3125,7 +3135,7 @@
 }
 
 AdminCmdDataLocation::AdminCmdDataLocation(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/location")
+    : AdminCmdData("/location")
 {
 
     subCommandList.Push("add","<type> <name> <radius> [<rotation angle>]");
@@ -3180,13 +3190,13 @@
             {
                 ParseError(me, "Required radius not given or not an float value.");
             }
-            
+
             // Get optional rotation angle for this location.
             if (!words.GetFloat(index++,rotAngle))
             {
                 rotAngle = 0.0;
             }
-            
+
         }
         else if (subCommand == "display" || subCommand == "show")
         {
@@ -3226,7 +3236,7 @@
             else if (subSubCmd == "add")
             {
                 subCommand = "type add";
-            } 
+            }
             else if (subSubCmd == "delete" || subSubCmd == "remove")
             {
                 subCommand = "type delete";
@@ -3236,7 +3246,7 @@
                 ParseError(me,"No type given.");
             }
         }
-        
+
     }
     // first wird is not a valid subcommand
     else
@@ -3257,7 +3267,7 @@
 }
 
 AdminCmdDataGameMasterEvent::AdminCmdDataGameMasterEvent(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/event"), subCommandList("help list"), subCmd(), player(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdData("/event"), subCommandList("help list"), subCmd(), player(ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET)
 {
     // register subcommands along with their help message
     subCommandList.Push("create","<name> <description>");
@@ -3291,7 +3301,7 @@
                 gmeventDesc = words.GetTail(index);
             }
             else
-            // missing desc
+                // missing desc
             {
                 ParseError(me, "Missing event description");
             }
@@ -3324,7 +3334,7 @@
         else if (subCmd == "reward")
         {
             // "/event reward [range # | all | [player_name]] <#> item"
-            
+
             if (words[index] == "all")
             {
                 commandMod = words[index++];
@@ -3369,7 +3379,7 @@
             if (player.ParseTarget(msgManager,me,msg,client,words[index]))
             {
                 index++;
-            } 
+            }
             else if (words.GetCount() >= index && !player.IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))
             {
                 ParseError(me, "Too many parameters for " + subCmd);
@@ -3410,7 +3420,7 @@
 }
 
 AdminCmdDataBadText::AdminCmdDataBadText(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/badtext", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/badtext", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
@@ -3468,8 +3478,8 @@
 }
 
 AdminCmdDataQuest::AdminCmdDataQuest(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/quest", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE),
-        subCommandList("complete list discard assign")
+    : AdminCmdDataTarget("/quest", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE),
+      subCommandList("complete list discard assign")
 {
     size_t index = 1;
     bool found;
@@ -3522,12 +3532,12 @@
 
 csString AdminCmdDataQuest::GetHelpMessage()
 {
-    return "Syntax: \"" + command + " [" + subCommandList.GetHelpMessage() + 
-            "] [questname]\"\n";
+    return "Syntax: \"" + command + " [" + subCommandList.GetHelpMessage() +
+           "] [questname]\"\n";
 }
 
 AdminCmdDataSetQuality::AdminCmdDataSetQuality(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/setquality", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA |ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/setquality", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA |ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
@@ -3579,7 +3589,7 @@
 }
 
 AdminCmdDataSetTrait::AdminCmdDataSetTrait(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/settrait", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/settrait", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
@@ -3603,17 +3613,17 @@
         {
             race = words[index++];
             csString gen = words[index++];
-        
+
             // parse the different gender types
-            if(gen == "m" || gen == "male")
+            if (gen == "m" || gen == "male")
             {
                 gender = PSCHARACTER_GENDER_MALE;
             }
-            else if(gen == "f" || gen == "female")
+            else if (gen == "f" || gen == "female")
             {
                 gender = PSCHARACTER_GENDER_FEMALE;
             }
-            else if(gen == "n" || gen == "none")
+            else if (gen == "n" || gen == "none")
             {
                 gender = PSCHARACTER_GENDER_NONE;
             }
@@ -3640,7 +3650,7 @@
             ParseError(me, "Not enough arguments for setting trait");
         }
     }
-    else 
+    else
     {
         ParseError(me, "Neither 'list' command invoked, nor target selected");
     }
@@ -3650,13 +3660,13 @@
 
 csString AdminCmdDataSetTrait::GetHelpMessage()
 {
-    return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() + 
-            "] <trait>\"\n"
-            + command + " list <race> <gender>";
+    return "Syntax: \"" + command + " [" + GetHelpMessagePartForTarget() +
+           "] <trait>\"\n"
+           + command + " list <race> <gender>";
 }
 
 AdminCmdDataSetItem::AdminCmdDataSetItem(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/setitemname", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/setitemname", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID |ADMINCMD_TARGET_CLIENTTARGET)
 
 {
     size_t index = 1;
@@ -3708,7 +3718,7 @@
 }
 
 AdminCmdDataReload::AdminCmdDataReload(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/reload"), itemID(0)
+    : AdminCmdData("/reload"), itemID(0)
 {
     subCommandList.Push("item","<itemID> - reloads the specified item");
     subCommandList.Push("serveroptions","#Reload all the server options");
@@ -3718,15 +3728,15 @@
     size_t index = 1;
 
     // when help is requested, return immediate
-    if(IsHelp(words[1]))
+    if (IsHelp(words[1]))
         return;
 
-    if(words.GetCount() > index && subCommandList.IsSubCommand(words[index]))
+    if (words.GetCount() > index && subCommandList.IsSubCommand(words[index]))
     {
         subCmd = words[index++];
     }
 
-    if(subCmd == "item")
+    if (subCmd == "item")
     {
         itemID = words.GetInt(index++);
         if (itemID == 0)
@@ -3735,7 +3745,7 @@
         }
     }
 
-    if(words.GetCount() > index)
+    if (words.GetCount() > index)
     {
         ParseError(me, "Too many arguments");
     }
@@ -3749,7 +3759,7 @@
 }
 
 AdminCmdDataListWarnings::AdminCmdDataListWarnings(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/listwarnings", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
+    : AdminCmdDataTarget("/listwarnings", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE)
 {
     size_t index = 1;
     bool found;
@@ -3777,7 +3787,7 @@
 }
 
 AdminCmdDataDisableQuest::AdminCmdDataDisableQuest(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/disablequest")
+    : AdminCmdData("/disablequest")
 {
     size_t index = 1;
 
@@ -3807,7 +3817,7 @@
 }
 
 AdminCmdDataSetKillExp::AdminCmdDataSetKillExp(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
- : AdminCmdDataTarget("/setkillexp", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/setkillexp", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
@@ -3850,32 +3860,32 @@
 }
 
 AdminCmdDataAssignFaction::AdminCmdDataAssignFaction(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdDataTarget("/assignfaction", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
+    : AdminCmdDataTarget("/assignfaction", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)
 {
     size_t index = 1;
     bool found;
 
     // when help is requested, return immediate
-    if(IsHelp(words[1]))
+    if (IsHelp(words[1]))
         return;
 
     // try to parse first word as a target
-    if((found = ParseTarget(msgManager, me, msg, client, words[index])))
+    if ((found = ParseTarget(msgManager, me, msg, client, words[index])))
     {
         index++;
     }
 
     // when first word is a target or the client target has a valid target
-    if(found || IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))
+    if (found || IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))
     {
         // two required arguments
-        if(words.GetCount() == index + 2)
+        if (words.GetCount() == index + 2)
         {
             factionName = words[index++];
             factionPoints = words.GetInt(index++);
         }
         // otherwise too long/short
-        else if(words.GetCount() < index + 2)
+        else if (words.GetCount() < index + 2)
         {
             ParseError(me, "Not enough arguments");
         }
@@ -3899,7 +3909,7 @@
 }
 
 AdminCmdDataServerQuit::AdminCmdDataServerQuit(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/serverquit")
+    : AdminCmdData("/serverquit")
 {
     // when help is requested, return immediate
     if (IsHelp(words[1]))
@@ -3910,7 +3920,7 @@
     {
         time = words.GetInt(index++);
         //optional parameter
-        if(words.GetCount() == index + 1)
+        if (words.GetCount() == index + 1)
             reason = words.GetTail(index);
     }
     else
@@ -3927,7 +3937,7 @@
 }
 
 AdminCmdDataNPCClientQuit::AdminCmdDataNPCClientQuit(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client *client, WordArray &words)
-: AdminCmdData("/npcclientquit")
+    : AdminCmdData("/npcclientquit")
 {
     // when help is requested, return immediate
     if (IsHelp(words[1]))
@@ -3957,7 +3967,7 @@
 }
 
 AdminCmdDataRndMsgTest::AdminCmdDataRndMsgTest(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage& msg, Client *client, WordArray &words)
-: AdminCmdData("/rndmsgtest")
+    : AdminCmdData("/rndmsgtest")
 {
     size_t index = 1;
 
@@ -3987,7 +3997,7 @@
 }
 
 AdminCmdDataList::AdminCmdDataList(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage& msg, Client *client, WordArray &words)
-: AdminCmdData("/list"), subCommandList("map")
+    : AdminCmdData("/list"), subCommandList("map")
 {
     size_t index = 1;
 
@@ -4010,9 +4020,9 @@
 
 
 AdminCmdDataTime::AdminCmdDataTime(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage& msg, Client *client, WordArray &words)
-: AdminCmdData("/time")
+    : AdminCmdData("/time")
 {
-    // register sub commands with their extended help message 
+    // register sub commands with their extended help message
     subCommandList.Push("show","#Show the current game time");
     subCommandList.Push("set","<hour> <minutes>");
 
@@ -4096,7 +4106,7 @@
     RegisterMsgFactoryFunction(new AdminCmdDataDeputize());
 
     RegisterMsgFactoryFunction(new AdminCmdDataAward());
-    RegisterMsgFactoryFunction(new AdminCmdDataItemTarget("/giveitem")); 
+    RegisterMsgFactoryFunction(new AdminCmdDataItemTarget("/giveitem"));
     RegisterMsgFactoryFunction(new AdminCmdDataItemTarget("/takeitem"));
     RegisterMsgFactoryFunction(new AdminCmdDataCheckItem());
     RegisterMsgFactoryFunction(new AdminCmdDataSectorTarget("/thunder"));
@@ -4148,7 +4158,7 @@
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/info", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_OBJECT | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/charlist", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_CLIENTTARGET | ADMINCMD_TARGET_DATABASE));
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/inspect", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_NPC | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
-    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/npc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_NPC ));
+    RegisterMsgFactoryFunction(new AdminCmdDataTarget("/npc", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_NPC));
     //has got its own class (but this is not really needed yet)
     // RegisterMsgFactoryFunction(new AdminCmdDataTarget("/setstackable", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ITEM | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET)); //natoka: actually here is a need for ADMIN_TARGET_ITEM
     RegisterMsgFactoryFunction(new AdminCmdDataTarget("/divorce", ADMINCMD_TARGET_TARGET | ADMINCMD_TARGET_PID | ADMINCMD_TARGET_AREA | ADMINCMD_TARGET_ME | ADMINCMD_TARGET_PLAYER | ADMINCMD_TARGET_EID | ADMINCMD_TARGET_CLIENTTARGET));
@@ -4197,7 +4207,7 @@
 
     // this makes sure that the player dictionary exists on start up.
     npcdlg = new psNPCDialog(NULL);
-    npcdlg->Initialize( db );
+    npcdlg->Initialize(db);
 
     locations = new LocationManager();
     locations->Load(EntityManager::GetSingleton().GetEngine(),db);
@@ -4231,7 +4241,7 @@
     return command.Slice(command.FindFirst(' ')+1,8) == "me reset";
 }
 
-//TODO: To be expanded to make the implementation better than how it is now 
+//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)
 {
@@ -4242,7 +4252,7 @@
 {
     AdminCmdData* data;
     psAdminCmdMessage msg(me);
-    WordArray words (msg.cmd, false);
+    WordArray words(msg.cmd, false);
 
     // retrieve command data factory for this command
     data = dataFactory->FindFactory(words[0]);
@@ -4250,11 +4260,11 @@
     // unknown admin command encountered (should not happen)
     if (!data)
     {
-        csString info ("\"" + words[0] + "\" not registered admin command");
+        csString info("\"" + words[0] + "\" not registered admin command");
         psserver->SendSystemInfo(me->clientnum,info.GetDataSafe());
         return;
     }
-    
+
     // Decode the string from the message into a struct with data elements
     data = data->CreateCmdData(this,me,msg,client,words);
     if (!data->valid)
@@ -4265,7 +4275,7 @@
     }
 
     // Security check
-    if ( me->clientnum != 0 && !IsReseting(msg.cmd) && !psserver->CheckAccess(client, data->command))
+    if (me->clientnum != 0 && !IsReseting(msg.cmd) && !psserver->CheckAccess(client, data->command))
         return;
 
     if (data->help || !data->valid)
@@ -4276,7 +4286,7 @@
 
     if (me->clientnum)
     {
-        data->LogGMCommand( client, msg.cmd );
+        data->LogGMCommand(client, msg.cmd);
     }
 
     //This will not show anything on client side because for example in area commands
@@ -4285,7 +4295,7 @@
     //If this has to behave differently (for example area commands should be dispatched)
     //override the function.
 
-    if(data->IsQuietInvalid())
+    if (data->IsQuietInvalid())
     {
         return;
     }
@@ -4382,11 +4392,11 @@
     {
         KickPlayer(me, msg, data, client);
     }
-    else if (data->command == "/death" )
+    else if (data->command == "/death")
     {
         Death(me, msg, data, client);
     }
-    else if (data->command == "/impersonate" )
+    else if (data->command == "/impersonate")
     {
         Impersonate(me, msg, data, client);
     }
@@ -4394,59 +4404,59 @@
     {
         TempSecurityLevel(me, msg, data, client);
     }
-    else if (data->command == "/deletechar" )
+    else if (data->command == "/deletechar")
     {
-        DeleteCharacter( me, msg, data, client );
+        DeleteCharacter(me, msg, data, client);
     }
-    else if (data->command == "/changename" )
+    else if (data->command == "/changename")
     {
-        ChangeName( me, msg, data, client);
+        ChangeName(me, msg, data, client);
     }
     else if (data->command == "/changeguildname")
     {
-        RenameGuild( me, msg, data, client );
+        RenameGuild(me, msg, data, client);
     }
     else if (data->command == "/changeguildleader")
     {
-        ChangeGuildLeader( me, msg, data, client );
+        ChangeGuildLeader(me, msg, data, client);
     }
-    else if (data->command == "/banname" )
+    else if (data->command == "/banname")
     {
-        BanName( me, msg, data, client );
+        BanName(me, msg, data, client);
     }
-    else if (data->command == "/unbanname" )
+    else if (data->command == "/unbanname")
     {
-        UnBanName( me, msg, data, client );
+        UnBanName(me, msg, data, client);
     }
-    else if (data->command == "/ban" )
+    else if (data->command == "/ban")
     {
-        BanClient( me, msg, data, client );
+        BanClient(me, msg, data, client);
     }
-    else if (data->command == "/unban" )
+    else if (data->command == "/unban")
     {
-        UnbanClient( me, msg, data, client );
+        UnbanClient(me, msg, data, client);
     }
-    else if (data->command == "/banadvisor" )
+    else if (data->command == "/banadvisor")
     {
-        BanAdvisor( me, msg, data, client );
+        BanAdvisor(me, msg, data, client);
     }
-    else if (data->command == "/unbanadvisor" )
+    else if (data->command == "/unbanadvisor")
     {
-        UnbanAdvisor( me, msg, data, client );
+        UnbanAdvisor(me, msg, data, client);
     }
-    else if (data->command == "/award" )
+    else if (data->command == "/award")
     {
         Award(data, client);
     }
-    else if (data->command == "/giveitem" )
+    else if (data->command == "/giveitem")
     {
         TransferItem(me, msg, data, client);
     }
-    else if (data->command == "/takeitem" )
+    else if (data->command == "/takeitem")
     {
         TransferItem(me, msg, data, client);
     }
-    else if (data->command == "/checkitem" )
+    else if (data->command == "/checkitem")
     {
         CheckItem(me, msg, data);
     }
@@ -4462,7 +4472,7 @@
     {
         Inspect(me, msg, data, client);
     }
-    else if ( data->command == "/updaterespawn")
+    else if (data->command == "/updaterespawn")
     {
         UpdateRespawn(data, client);
     }
@@ -4514,7 +4524,7 @@
     {
         HandleBadText(msg, data, client);
     }
-    else if ( data->command == "/loadquest" )
+    else if (data->command == "/loadquest")
     {
         HandleLoadQuest(msg, data, client);
     }
@@ -4584,7 +4594,7 @@
     }
     if (data)
         delete data;
-} 
+}
 
 void AdminManager::HandleList(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData* cmddata,Client *client)
 {
@@ -4610,7 +4620,8 @@
         pos = next +1;
         // find next delimiter (= end of map)
         next = mapnames.FindFirst('|',pos);
-    } while (next < mapnames.Length());
+    }
+    while (next < mapnames.Length());
 }
 
 void AdminManager::HandleTime(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData* cmddata,Client *client)
@@ -4655,12 +4666,12 @@
         questID = result[0].GetInt("id");
     }
 
-    if(!psserver->GetCacheManager()->UnloadQuest(questID))
+    if (!psserver->GetCacheManager()->UnloadQuest(questID))
         psserver->SendSystemError(client->GetClientNum(), "Quest <%s> Could not be unloaded", data->questName.GetData());
     else
         psserver->SendSystemError(client->GetClientNum(), "Quest <%s> unloaded", data->questName.GetData());
 
-    if(!psserver->GetCacheManager()->LoadQuest(questID))
+    if (!psserver->GetCacheManager()->LoadQuest(questID))
     {
         psserver->SendSystemError(client->GetClientNum(), "Quest <%s> Could not be loaded", data->questName.GetData());
         psserver->SendSystemError(client->GetClientNum(), psserver->questmanager->LastError());
@@ -4681,14 +4692,14 @@
         return;
     }
 
-    if(data->targetObject && !data->targetObject->GetCharacterData()) //no need to go on this isn't an npc or pc characther (most probably an item)
+    if (data->targetObject && !data->targetObject->GetCharacterData()) //no need to go on this isn't an npc or pc characther (most probably an item)
     {
         psserver->SendSystemError(me->clientnum,"Charlist can be used only on Player or NPC characters");
         return;
     }
 
     AccountID accountId = data->GetAccountID(me->clientnum);
-    if(data->duplicateActor) //we found more than one result so let's alert the user
+    if (data->duplicateActor) //we found more than one result so let's alert the user
     {
         psserver->SendSystemInfo(client->GetClientNum(), "Player name isn't unique. It's suggested to use pid.");
     }
@@ -4700,15 +4711,15 @@
         if (result2.IsValid() && result2.Count())
         {
 
-            psserver->SendSystemInfo( client->GetClientNum(), "Characters on this account:" );
+            psserver->SendSystemInfo(client->GetClientNum(), "Characters on this account:");
             for (int i = 0; i < (int)result2.Count(); i++)
             {
                 iResultRow& row = result2[i];
                 psserver->SendSystemInfo(client->GetClientNum(), "Player ID: %d, %s %s, last login: %s",
-                                         row.GetUInt32("id"), row["name"], row["lastname"], row["last_login"] );
+                                         row.GetUInt32("id"), row["name"], row["lastname"], row["last_login"]);
             }
         }
-        else if ( !result2.Count() )
+        else if (!result2.Count())
         {
             psserver->SendSystemInfo(me->clientnum, "There are no characters on this account.");
         }
@@ -4734,7 +4745,7 @@
     float loc_x = 0.0f, loc_y = 0.0f, loc_z = 0.0f, loc_yrot = 0.0f;
     int degrees = 0;
 
-    if ( data->targetObject ) //If the target is online or is an item or action location get some data about it like position and eid
+    if (data->targetObject)   //If the target is online or is an item or action location get some data about it like position and eid
     {
         entityId = data->targetObject->GetEID();
         csVector3 pos;
@@ -4744,12 +4755,12 @@
         loc_x = pos.x;
         loc_y = pos.y;
         loc_z = pos.z;
-        degrees = (int)(loc_yrot * 180 / PI );
+        degrees = (int)(loc_yrot * 180 / PI);
 
         instance = data->targetObject->GetInstance();
 
         sectorName = (sector) ? sector->QueryObject()->GetName() : "(null)";
-        
+
         regionName = (sector) ? sector->QueryObject()->GetObjectParent()->GetName() : "(null)";
     }
 
@@ -4782,78 +4793,78 @@
         return;
     }
 
-    if ( data->targetObject && data->targetObject->GetItem() && data->targetObject->GetItem()->GetBaseStats() ) // Item
+    if (data->targetObject && data->targetObject->GetItem() && data->targetObject->GetItem()->GetBaseStats())   // Item
     {
-          psItem* item = data->targetObject->GetItem();
+        psItem* item = data->targetObject->GetItem();
 
-          csString info;
-          info.Format("Item: %s ", item->GetName() );
+        csString info;
+        info.Format("Item: %s ", item->GetName());
 
-          if ( item->GetStackCount() > 1 )
-              info.AppendFmt("(x%d) ", item->GetStackCount() );
+        if (item->GetStackCount() > 1)
+            info.AppendFmt("(x%d) ", item->GetStackCount());
 
-          info.AppendFmt("with item stats ID %u, item ID %u, and %s, is at region %s, position (%1.2f, %1.2f, %1.2f) "
-                         "angle: %d in sector: %s, instance: %d",
-                        item->GetBaseStats()->GetUID(),
-                        item->GetUID(),
-                        ShowID(entityId),
-                        regionName.GetData(),
-                        loc_x, loc_y, loc_z, degrees,
-                        sectorName.GetData(),
-                        instance);
+        info.AppendFmt("with item stats ID %u, item ID %u, and %s, is at region %s, position (%1.2f, %1.2f, %1.2f) "
+                       "angle: %d in sector: %s, instance: %d",
+                       item->GetBaseStats()->GetUID(),
+                       item->GetUID(),
+                       ShowID(entityId),
+                       regionName.GetData(),
+                       loc_x, loc_y, loc_z, degrees,
+                       sectorName.GetData(),
+                       instance);
 
-          if ( item->GetScheduledItem() )
-              info.AppendFmt(", spawns with interval %d + %d max modifier",
-                             item->GetScheduledItem()->GetInterval(),
-                             item->GetScheduledItem()->GetMaxModifier() );
+        if (item->GetScheduledItem())
+            info.AppendFmt(", spawns with interval %d + %d max modifier",
+                           item->GetScheduledItem()->GetInterval(),
+                           item->GetScheduledItem()->GetMaxModifier());
 
 
-          // Get all flags on this item
-          int flags = item->GetFlags();
-          if (flags)
-          {
-              info += ", has flags:";
+        // Get all flags on this item
+        int flags = item->GetFlags();
+        if (flags)
+        {
+            info += ", has flags:";
 
-              if ( flags & PSITEM_FLAG_CRAFTER_ID_IS_VALID )
-                  info += " 'valid crafter id'";
-              if ( flags & PSITEM_FLAG_GUILD_ID_IS_VALID )
-                  info += " 'valid guild id'";
-              if ( flags & PSITEM_FLAG_UNIQUE_ITEM )
-                  info += " 'unique'";
-              if ( flags & PSITEM_FLAG_USES_BASIC_ITEM )
-                  info += " 'uses basic item'";
-              if ( flags & PSITEM_FLAG_PURIFIED )
-                  info += " 'purified'";
-              if ( flags & PSITEM_FLAG_PURIFYING )
-                  info += " 'purifying'";
-              if ( flags & PSITEM_FLAG_LOCKED )
-                  info += " 'locked'";
-              if ( flags & PSITEM_FLAG_LOCKABLE )
-                  info += " 'lockable'";
-              if ( flags & PSITEM_FLAG_SECURITYLOCK )
-                  info += " 'lockable'";
-              if ( flags & PSITEM_FLAG_UNPICKABLE )
-                  info += " 'unpickable'";
-              if ( flags & PSITEM_FLAG_NOPICKUP )
-                  info += " 'no pickup'";
-              if(flags & PSITEM_FLAG_NOPICKUPWEAK)
-                  info += " 'no pickup weak'";
-              if ( flags & PSITEM_FLAG_KEY )
-                  info += " 'key'";
-              if ( flags & PSITEM_FLAG_MASTERKEY )
-                  info += " 'masterkey'";
-              if ( flags & PSITEM_FLAG_TRANSIENT )
-                  info += " 'transient'";
-              if ( flags & PSITEM_FLAG_USE_CD)
-                  info += " 'collide'";
-              if ( flags & PSITEM_FLAG_SETTINGITEM)
-                  info += " 'settingitem'";
-              if ( flags & PSITEM_FLAG_NPCOWNED)
-                  info += " 'npcowned'";
-          }
+            if (flags & PSITEM_FLAG_CRAFTER_ID_IS_VALID)
+                info += " 'valid crafter id'";
+            if (flags & PSITEM_FLAG_GUILD_ID_IS_VALID)
+                info += " 'valid guild id'";
+            if (flags & PSITEM_FLAG_UNIQUE_ITEM)
+                info += " 'unique'";
+            if (flags & PSITEM_FLAG_USES_BASIC_ITEM)
+                info += " 'uses basic item'";
+            if (flags & PSITEM_FLAG_PURIFIED)
+                info += " 'purified'";
+            if (flags & PSITEM_FLAG_PURIFYING)
+                info += " 'purifying'";
+            if (flags & PSITEM_FLAG_LOCKED)
+                info += " 'locked'";
+            if (flags & PSITEM_FLAG_LOCKABLE)
+                info += " 'lockable'";
+            if (flags & PSITEM_FLAG_SECURITYLOCK)
+                info += " 'lockable'";
+            if (flags & PSITEM_FLAG_UNPICKABLE)
+                info += " 'unpickable'";
+            if (flags & PSITEM_FLAG_NOPICKUP)
+                info += " 'no pickup'";
+            if (flags & PSITEM_FLAG_NOPICKUPWEAK)
+                info += " 'no pickup weak'";
+            if (flags & PSITEM_FLAG_KEY)
+                info += " 'key'";
+            if (flags & PSITEM_FLAG_MASTERKEY)
+                info += " 'masterkey'";
+            if (flags & PSITEM_FLAG_TRANSIENT)
+                info += " 'transient'";
+            if (flags & PSITEM_FLAG_USE_CD)
+                info += " 'collide'";
+            if (flags & PSITEM_FLAG_SETTINGITEM)
+                info += " 'settingitem'";
+            if (flags & PSITEM_FLAG_NPCOWNED)
+                info += " 'npcowned'";
+        }
 
-          psserver->SendSystemInfo(client->GetClientNum(),info);
-          return; // Done
+        psserver->SendSystemInfo(client->GetClientNum(),info);
+        return; // Done
     }
 
     char ipaddr[20] = {0};
@@ -4923,25 +4934,25 @@
 
                 dist = EntityManager::GetSingleton().GetWorld()->Distance(pos, sector, myPos, mySector);
             }
-            
 
+
             psserver->SendSystemInfo(client->GetClientNum(),
-                "NPC: <%s, %s, %s> is at region %s, position (%1.2f, %1.2f, %1.2f) at range %.2f "
-                "angle: %d in sector: %s, instance: %d%s%s.",
-                name.GetData(),
-                ShowID(playerId),
-                ShowID(entityId),
-                regionName.GetData(),
-                loc_x,
-                loc_y,
-                loc_z,
-                dist,
-                degrees,
-                sectorName.GetData(),
-                instance,
-                npcChar->GetImperviousToAttack()&ALWAYS_IMPERVIOUS?", is always impervious":"",
-                npcChar->GetImperviousToAttack()&TEMPORARILY_IMPERVIOUS?", is temp impervious":""
-                );
+                                     "NPC: <%s, %s, %s> is at region %s, position (%1.2f, %1.2f, %1.2f) at range %.2f "
+                                     "angle: %d in sector: %s, instance: %d%s%s.",
+                                     name.GetData(),
+                                     ShowID(playerId),
+                                     ShowID(entityId),
+                                     regionName.GetData(),
+                                     loc_x,
+                                     loc_y,
+                                     loc_z,
+                                     dist,
+                                     degrees,
+                                     sectorName.GetData(),
+                                     instance,
+                                     npcChar->GetImperviousToAttack()&ALWAYS_IMPERVIOUS?", is always impervious":"",
+                                     npcChar->GetImperviousToAttack()&TEMPORARILY_IMPERVIOUS?", is temp impervious":""
+                                    );
 
             if (client->GetSecurityLevel() >= GM_LEVEL_0)
             {
@@ -4961,54 +4972,54 @@
 
             if (!pid.IsValid())
             {
-                 psserver->SendSystemError(client->GetClientNum(), "%s is invalid!",data->target.GetData() );
-                 return;
+                psserver->SendSystemError(client->GetClientNum(), "%s is invalid!",data->target.GetData());
+                return;
             }
 
             result = db->Select("SELECT c.id as 'id', c.name as 'name', lastname, account_id, time_connected_sec, loc_instance, "
-                "s.name as 'sector', loc_x, loc_y, loc_z, loc_yrot, advisor_ban from characters c join sectors s on s.id = loc_sector_id "
-                "join accounts a on a.id = account_id where c.id=%u", pid.Unbox());
+                                "s.name as 'sector', loc_x, loc_y, loc_z, loc_yrot, advisor_ban from characters c join sectors s on s.id = loc_sector_id "
+                                "join accounts a on a.id = account_id where c.id=%u", pid.Unbox());
         }
         else
         {
             result = db->Select("SELECT c.id as 'id', c.name as 'name', lastname, account_id, time_connected_sec, loc_instance, "
-                "s.name as 'sector', loc_x, loc_y, loc_z, loc_yrot, advisor_ban from characters c join sectors s on s.id = loc_sector_id "
-                "join accounts a on a.id = account_id where c.name='%s'", data->target.GetData());
+                                "s.name as 'sector', loc_x, loc_y, loc_z, loc_yrot, advisor_ban from characters c join sectors s on s.id = loc_sector_id "
+                                "join accounts a on a.id = account_id where c.name='%s'", data->target.GetData());
         }
 
         if (!result.IsValid() || result.Count() == 0)
         {
-             psserver->SendSystemError(client->GetClientNum(), "Cannot find player %s",data->target.GetData() );
-             return;
+            psserver->SendSystemError(client->GetClientNum(), "Cannot find player %s",data->target.GetData());
+            return;
         }
         else
         {
-             iResultRow& row = result[0];
-             name = row["name"];
-             if (row["lastname"] && strcmp(row["lastname"],""))
-             {
-                  name.Append(" ");
-                  name.Append(row["lastname"]);
-             }
-             playerId = PID(row.GetUInt32("id"));
-             accountId = AccountID(row.GetUInt32("account_id"));
-             ipAddress = "(offline)";
-             timeConnected = row.GetFloat("time_connected_sec") / 3600;
-             securityLevel.Format("%d",GetTrueSecurityLevel(accountId));
-                         sectorName = row["sector"];
-                         instance = row.GetUInt32("loc_instance");
-                         loc_x = row.GetFloat("loc_x");
-                         loc_y = row.GetFloat("loc_y");
-                         loc_z = row.GetFloat("loc_z");
-                         loc_yrot = row.GetFloat("loc_yrot");
-             advisorBanned = row.GetUInt32("advisor_ban") != 0;
+            iResultRow& row = result[0];
+            name = row["name"];
+            if (row["lastname"] && strcmp(row["lastname"],""))
+            {
+                name.Append(" ");
+                name.Append(row["lastname"]);
+            }
+            playerId = PID(row.GetUInt32("id"));
+            accountId = AccountID(row.GetUInt32("account_id"));
+            ipAddress = "(offline)";
+            timeConnected = row.GetFloat("time_connected_sec") / 3600;
+            securityLevel.Format("%d",GetTrueSecurityLevel(accountId));
+            sectorName = row["sector"];
+            instance = row.GetUInt32("loc_instance");
+            loc_x = row.GetFloat("loc_x");
+            loc_y = row.GetFloat("loc_y");
+            loc_z = row.GetFloat("loc_z");
+            loc_yrot = row.GetFloat("loc_yrot");
+            advisorBanned = row.GetUInt32("advisor_ban") != 0;
         }
     }
     BanEntry* ban = psserver->GetAuthServer()->GetBanManager()->GetBanByAccount(accountId);
-    if(ban)
+    if (ban)
     {
         time_t now = time(0);
-        if(ban->end > now)
+        if (ban->end > now)
         {
             BanReason = ban->reason;
             banTimeLeft = ban->end - now;
@@ -5027,10 +5038,10 @@
     if (playerId.IsValid())
     {
         csString info;
-        info.Format("Player: %s has ", name.GetData() );
+        info.Format("Player: %s has ", name.GetData());
 

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8366
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8366&view=rev
Author:   weltall2
Date:     2012-06-28 06:23:11 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
fixed message to be correct with the actual command

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-06-27 13:35:07 UTC (rev 8365)
+++ trunk/src/server/adminmanager.cpp	2012-06-28 06:23:11 UTC (rev 8366)
@@ -2548,7 +2548,7 @@
     return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() + " <SUBCOMMAND>\"\n"
            "SUBCOMMAND: intervals <interval> <intervalcap>\n"
            "            amount <amount>\n"
-           "            level <level>\n"
+           "            picklevel <level>\n"
            "            range <range>\n"
            "            move <x> <y> <z> [<y>]\n"
            "            pickskill <skillname>\n"

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

Revision: 8409
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8409&view=rev
Author:   magodra
Date:     2012-07-31 18:01:07 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
- Added feadback from server upon /npcclientquit.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-07-30 22:33:36 UTC (rev 8408)
+++ trunk/src/server/adminmanager.cpp	2012-07-31 18:01:07 UTC (rev 8409)
@@ -12131,6 +12131,7 @@
     psServerCommandMessage message(0, "quit");
     message.Multicast(psserver->GetNPCManager()->GetSuperClients(), -1, PROX_LIST_ANY_RANGE);
 
+    psserver->SendSystemInfo(client->GetClientNum(),"NPC Client quit requested.");
 }
 
 

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

Revision: 8464
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8464&view=rev
Author:   lpancallo
Date:     2012-10-03 16:42:23 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
Improved comments and fixed wrong error message on setskill while used on an NPC

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2012-10-03 12:58:51 UTC (rev 8463)
+++ trunk/src/server/adminmanager.cpp	2012-10-03 16:42:23 UTC (rev 8464)
@@ -517,11 +517,13 @@
     // Targeting for all commands
     if(word.Length() > 0)
     {
+        // the command allows a target selected by the client
         if(IsAllowedTargetType(ADMINCMD_TARGET_TARGET) && word == "target")
         {
             tryClientTarget = true;
             targetTypes |= ADMINCMD_TARGET_TARGET;
         }
+        // the command allows to use a PID:
         else if(IsAllowedTargetType(ADMINCMD_TARGET_PID) && word.StartsWith("pid:",true))
         {
             // NOTE: this might not set targetObject, targetActor, targetClient
@@ -530,26 +532,8 @@
 
             if(!targetObject)
             {
-                //if(GetPlayerAccountIDByPID(me->clientnum, word))
-                //{
-                // try to find an online player for the name resolved
-                // from the pid
-                // (GetPlayerClient sets targetClient accordingly)
-                /*if (!GetPlayerClient(msgManager, me->clientnum, target, false))
-                {
-                    // error duplicate or not found at all
-                    if (duplicateActor)
-                    {
-                        psserver->SendSystemError(me->clientnum,"PID resolves to multiple online clients!");
-                        return false;
-                    }
-                    else
-                    {*/
                 // player is offline
                 psserver->SendSystemInfo(me->clientnum,"PID:%s no online client", ShowID(targetID));
-                //}
-                //}
-                //}
             }
             else
             {
@@ -561,6 +545,7 @@
                 psserver->SendSystemInfo(me->clientnum,"%s resolved to online client %s", ShowID(targetID), target.GetData());
             }
         }
+        // command allows to target an area
         else if(IsAllowedTargetType(ADMINCMD_TARGET_AREA) && word.StartsWith("area:",true))
         {
             //generate the string
@@ -671,21 +656,13 @@
     // test whether this is a npc or not
     if(targetObject)
     {
-        // natoka: I'm not sure what is better to either query by chartype
-        // or by casting the object as gemNPC and testing it
-        /*
-        if (targetObject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_NPC ||
-           targetObject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_PET ||
-           targetObject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_MOUNT ||
-           targetObject->GetCharacterData()->GetCharType() == PSCHARACTER_TYPE_MOUNTPET)
-        */
-
         gemNPC* npctarget = dynamic_cast<gemNPC*>(targetObject);
         if(npctarget && npctarget->GetClientID() == 0)
         {
             if(!IsAllowedTargetType(ADMINCMD_TARGET_NPC))
             {
                 // it is a npc, but npc is not an allowed target, so reset
+                psserver->SendSystemError(me->clientnum,"Target is an NPC, but server does not allow this command on an npc.");
                 Reset();
             }
             else
@@ -2685,7 +2662,14 @@
     {
         found = true;
         index++;
+        // target is required
     }
+    else
+    {
+        psserver->SendSystemError(me->clientnum,"Provided target is invalid.");
+        return;
+    }
+
     // when first word is a target or the client has selected a target
     if(words.GetCount() == index + 2 && (found || IsTargetType(ADMINCMD_TARGET_CLIENTTARGET)))
     {
@@ -6326,19 +6310,19 @@
             {
                 iSector* sector = iter.Next();
 
-                if (client->GetActor()->GetSector() == sector)
+                if(client->GetActor()->GetSector() == sector)
                 {
                     // Display
                     // TODO: Include sector in psEffectMessage
                     psEffectMessage show(client->GetClientNum(),"admin_waypoint",wp->GetPosition(),0,0,
                                          wp->GetEffectID(this),wp->GetRadius());
                     show.SendMessage();
-                    
+
                     csPDelArray<Edge>::Iterator iter = wp->edges.GetIterator();
                     while(iter.HasNext())
                     {
                         Edge* edge = iter.Next();
-                        
+
                         UpdateDisplayPath(edge->GetStartPoint());
                     }
                 }
@@ -7298,7 +7282,7 @@
             {
                 iSector* sector = iter.Next();
 
-                if (client->GetActor()->GetSector() == sector)
+                if(client->GetActor()->GetSector() == sector)
                 {
                     // Display
                     // TODO: Include sector in psEffectMessage

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

Revision: 8598
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8598&view=rev
Author:   magodra
Date:     2013-02-23 12:09:01 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
- Improved online help for /quest command.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2013-02-18 23:17:24 UTC (rev 8597)
+++ trunk/src/server/adminmanager.cpp	2013-02-23 12:09:01 UTC (rev 8598)
@@ -3575,7 +3575,7 @@
 csString AdminCmdDataQuest::GetHelpMessage()
 {
     return "Syntax: \"" + command + " [" + subCommandList.GetHelpMessage() +
-           "] [questname]\"\n";
+           "] [questname|variable]|variables\"\n";
 }
 
 AdminCmdDataSetQuality::AdminCmdDataSetQuality(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client* client, WordArray &words)

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

Revision: 8615
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8615&view=rev
Author:   magodra
Date:     2013-02-26 21:10:00 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
-Fixed /killnpc to not allow to target a player.(PS#5811)

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2013-02-26 20:31:59 UTC (rev 8614)
+++ trunk/src/server/adminmanager.cpp	2013-02-26 21:10:00 UTC (rev 8615)
@@ -8549,6 +8549,13 @@
 {
     AdminCmdDataKillNPC* data = dynamic_cast<AdminCmdDataKillNPC*>(cmddata);
 
+    if (data->targetObject && data->targetObject->GetClientID())
+    {
+        psserver->SendSystemError(me->clientnum, "You can not kill a Player with this command!");
+        return;
+    }
+    
+
     gemNPC* target = dynamic_cast<gemNPC*>(data->targetObject);
     if(target && target->GetClientID() == 0)
     {

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

Revision: 8672
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8672&view=rev
Author:   magodra
Date:     2013-04-06 12:09:24 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
- Fixed plural on spawn response.

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

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2013-04-05 16:41:20 UTC (rev 8671)
+++ trunk/src/server/adminmanager.cpp	2013-04-06 12:09:24 UTC (rev 8672)
@@ -10225,7 +10225,14 @@
     item->SetLoaded();  // Item is fully created
     if(charData->Inventory().Add(item))
     {
-        text.Format("You spawned %s to your inventory",msg.item.GetData());
+        if (msg.count > 1)
+        {
+            text.Format("You spawned %d %s to your inventory.", msg.count, psString(msg.item).Plural().GetData());            
+        }
+        else
+        {
+            text.Format("You spawned %s to your inventory.", msg.item.GetData());
+        }
     }
     else
     {

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