Changeset 42 for trunk/src/game

Timestamp:

11/19/08 13:27:05 (17 years ago)

Author:

yumileroy

Message:

[svn] * Send ShutdownMsg? to console using outstring_log.
* Prevent Client Crashes when MOVEMENTFLAG_ONTRANSPORT and MOVEMENTFLAG_SPLINE2 is set on creatures.
* Implement four new SEC_ADMINISTRATOR commands:

• Group (.group [leader]/[disband]/[remove]) commands.
• GameObject? State (.gobject state <guid> <state>) command.

Original author: Seline
Date: 2008-10-12 18:26:26-05:00

Location:

trunk/src/game

Files:

• Chat.cpp (modified) (4 diffs)
• Chat.h (modified) (3 diffs)
• Level1.cpp (modified) (1 diff)
• Level3.cpp (modified) (2 diffs)
• Object.cpp (modified) (1 diff)
• World.cpp (modified) (1 diff)

trunk/src/game/Chat.cpp

@@ -215 +215 @@
     };
 
+    static ChatCommand groupCommandTable[] =
+    {
+        { "leader",         SEC_ADMINISTRATOR,  &ChatHandler::HandleGroupLeaderCommand,         "", NULL },
+        { "disband",        SEC_ADMINISTRATOR,  &ChatHandler::HandleGroupDisbandCommand,        "", NULL },
+        { "remove",         SEC_ADMINISTRATOR,  &ChatHandler::HandleGroupRemoveCommand,         "", NULL },
+        { NULL,             0,                  NULL,                                           "", NULL }
+    };
+
     static ChatCommand lookupPlayerCommandTable[] =
     {
@@ -341 +349 @@
         { "move",           SEC_GAMEMASTER,     &ChatHandler::HandleMoveObjectCommand,          "", NULL },
         { "near",           SEC_ADMINISTRATOR,  &ChatHandler::HandleNearObjectCommand,          "", NULL },
+        { "state",          SEC_ADMINISTRATOR,  &ChatHandler::HandleObjectStateCommand,         "", NULL },
         { NULL,             0,                  NULL,                                           "", NULL }
     };
@@ -389 +398 @@
         { "lookup",         SEC_ADMINISTRATOR,  NULL,                                           "", lookupCommandTable },
         { "pdump",          SEC_ADMINISTRATOR,  NULL,                                           "", pdumpCommandTable },
+        { "group",          SEC_ADMINISTRATOR,  NULL,                                           "", groupCommandTable },
         { "guild",          SEC_ADMINISTRATOR,  NULL,                                           "", guildCommandTable },
         { "cast",           SEC_ADMINISTRATOR,  NULL,                                           "", castCommandTable },
@@ -1085 +1095 @@
     return objmgr.GetGameTele(cId);
 }
+
+bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, Group* &group, uint64 &guid, bool offline)
+{
+    plr  = NULL;
+    guid = 0;
+
+    if(cname)
+    {
+        std::string name = cname;
+        if(!name.empty())
+        {
+            if(!normalizePlayerName(name))
+            {
+                PSendSysMessage(LANG_PLAYER_NOT_FOUND);
+                SetSentErrorMessage(true);
+                return false;
+            }
+
+            plr = objmgr.GetPlayer(name.c_str());
+            if(offline)
+                guid = objmgr.GetPlayerGUIDByName(name.c_str());
+        }
+    }
+
+    if(plr)
+    {
+        group = plr->GetGroup();
+        if(!guid || !offline)
+            guid = plr->GetGUID();
+    }
+    else
+    {
+        if(getSelectedPlayer())
+            plr = getSelectedPlayer();
+        else
+            plr = m_session->GetPlayer();
+
+        if(!guid || !offline)
+            guid  = plr->GetGUID();
+        group = plr->GetGroup();
+    }
+
+    return true;
+}

trunk/src/game/Chat.h

@@ -240 +240 @@
         bool HandleMoveObjectCommand(const char* args);
         bool HandleTurnObjectCommand(const char* args);
+        bool HandleObjectStateCommand(const char* args);
         bool HandlePInfoCommand(const char* args);
         bool HandlePLimitCommand(const char* args);
@@ -314 +315 @@
         bool HandleAddItemCommand(const char* args);
         bool HandleAddItemSetCommand(const char* args);
+
+        bool HandleGroupLeaderCommand(const char* args);
+        bool HandleGroupDisbandCommand(const char* args);
+        bool HandleGroupRemoveCommand(const char* args);
 
         bool HandleGuildCreateCommand(const char* args);
@@ -394 +399 @@
         uint32    extractSpellIdFromLink(char* text);
         GameTele const* extractGameTeleFromLink(char* text);
+        bool GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, Group* &group, uint64 &guid, bool offline = false);
 
         GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry);

trunk/src/game/Level1.cpp

@@ -123 +123 @@
     if(!*args)
         return false;
-    char str[1024];
+    //char str[1024];
     //sprintf(str, GetMangosString(LANG_ANNOUNCE_COLOR), m_session->GetPlayer()->GetName(), args);
     sWorld.SendWorldText(LANG_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args);

trunk/src/game/Level3.cpp

@@ -2176 +2176 @@
 }
 
+bool ChatHandler::HandleObjectStateCommand(const char* args)
+{
+    // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r
+    char* cId = extractKeyFromLink((char*)args, "Hgameobject");
+    if(!cId)
+        return false;
+
+    uint32 lowguid = atoi(cId);
+    if(!lowguid)
+        return false;
+
+    GameObject* gobj = NULL;
+
+    if(GameObjectData const* goData = objmgr.GetGOData(lowguid))
+        gobj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, goData->id);
+
+    if(!gobj)
+    {
+        PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    char* cstate = strtok(NULL, " ");
+    if(!cstate)
+        return false;
+
+    int32 state = atoi(cstate);
+    if(state < 0)
+        gobj->SendObjectDeSpawnAnim(gobj->GetGUID());
+    else
+        gobj->SetGoState(state);
+
+    return true;
+
+    return true;
+}
+
 bool ChatHandler::HandleListCreatureCommand(const char* args)
 {
@@ -5473 +5511 @@
     return true;
 }
+
+bool ChatHandler::HandleGroupLeaderCommand(const char* args)
+{
+    Player* plr  = NULL;
+    Group* group = NULL;
+    uint64 guid  = 0;
+    char* cname  = strtok((char*)args, " ");
+
+    if(GetPlayerGroupAndGUIDByName(cname, plr, group, guid))
+        if(group && group->GetLeaderGUID() != guid)
+            group->ChangeLeader(guid);
+
+    return true;
+}
+
+bool ChatHandler::HandleGroupDisbandCommand(const char* args)
+{
+    Player* plr  = NULL;
+    Group* group = NULL;
+    uint64 guid  = 0;
+    char* cname  = strtok((char*)args, " ");
+
+    if(GetPlayerGroupAndGUIDByName(cname, plr, group, guid))
+        if(group)
+            group->Disband();
+
+    return true;
+}
+
+bool ChatHandler::HandleGroupRemoveCommand(const char* args)
+{
+    Player* plr  = NULL;
+    Group* group = NULL;
+    uint64 guid  = 0;
+    char* cname  = strtok((char*)args, " ");
+
+    if(GetPlayerGroupAndGUIDByName(cname, plr, group, guid, true))
+        if(group)
+            group->RemoveMember(guid, 0);
+
+    return true;
+}

trunk/src/game/Object.cpp

@@ -265 +265 @@
             {
                 flags2 = ((Unit*)this)->GetUnitMovementFlags();
+                flags2 &= ~MOVEMENTFLAG_ONTRANSPORT;
+                flags2 &= ~MOVEMENTFLAG_SPLINE2;
             }
             break;

trunk/src/game/World.cpp

@@ -2427 +2427 @@
 
         SendServerMessage(msgid,str.c_str(),player);
-        DEBUG_LOG("Server is %s in %s",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"),str.c_str());
+        outstring_log("Server will %s in %s", (m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shutdown"), str.c_str());
     }
 }