Changeset 112 for trunk/src/game/Level2.cpp

Timestamp:

11/19/08 13:37:14 (17 years ago)

Author:

yumileroy

Message:

[svn] * Merge CLI Commands with regular commands and give them level4 access. sec_console. Source mangos - thanks to ogeraisi for the amalgamated patch.
* Redid/Fixed/Added some lang strings.
* As usual remember this is a trunk rev so stability only guaranteed on northern countries of Mars and western parts of Pluto. No warranties outside the solar system, sorry :( . Check with your local government or dictator on regulations regarding export.

Original author: KingPin?
Date: 2008-10-26 13:32:42-05:00

Files:

• trunk/src/game/Level2.cpp (modified) (19 diffs)

trunk/src/game/Level2.cpp

@@ -43 +43 @@
 #include <fstream>
 #include <map>
+#include "GlobalEvents.h"
 
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
@@ -100 +101 @@
     }
 
-    if(security >= m_session->GetSecurity())
+    if(m_session && security >= m_session->GetSecurity())
     {
         SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
@@ -166 +167 @@
     }
 
-    if(security >= m_session->GetSecurity())
+    if(m_session && security >= m_session->GetSecurity())
     {
         SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
@@ -556 +557 @@
 bool ChatHandler::HandleLookupFactionCommand(const char* args)
 {
-    if(!*args)
-        return false;
-
-    Player *target = getSelectedPlayer();
-    if (!target)
-    {
-        SendSysMessage(LANG_NO_CHAR_SELECTED);
-        SetSentErrorMessage(true);
-        return false;
-    }
+    if (!*args)
+        return false;
+
+    // Can be NULL at console call
+        Player *target = getSelectedPlayer ();
 
     std::string namepart = args;
     std::wstring wnamepart;
 
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr (namepart,wnamepart))
         return false;
 
     // converting string that we try to find to lower case
-    wstrToLower( wnamepart );
+    wstrToLower (wnamepart);
 
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
-    for (uint32 id = 0; id < sFactionStore.GetNumRows(); id++)
-        //for(FactionStateList::const_iterator itr = target->m_factions.begin(); itr != target->m_factions.end(); ++itr)
-    {
-        FactionEntry const *factionEntry = sFactionStore.LookupEntry(id);
-        //FactionEntry const *factionEntry = sFactionStore.LookupEntry(itr->second.ID);
+    for (uint32 id = 0; id < sFactionStore.GetNumRows(); ++id)
+    {
+        FactionEntry const *factionEntry = sFactionStore.LookupEntry (id);
         if (factionEntry)
         {
-            FactionStateList::const_iterator repItr = target->m_factions.find(factionEntry->reputationListID);
-
-            int loc = m_session->GetSessionDbcLocale();
+            FactionState const* repState = NULL;
+                        if(target)
+                        {
+                                FactionStateList::const_iterator repItr = target->m_factions.find (factionEntry->reputationListID);
+                                if(repItr != target->m_factions.end())
+                                        repState = &repItr->second;
+                        }
+
+            int loc = m_session ? m_session->GetSessionDbcLocale() : sWorld.GetDefaultDbcLocale();
             std::string name = factionEntry->name[loc];
             if(name.empty())
@@ -597 +597 @@
                 for(; loc < MAX_LOCALE; ++loc)
                 {
-                    if(loc==m_session->GetSessionDbcLocale())
+                    if(m_session && loc==m_session->GetSessionDbcLocale())
                         continue;
 
@@ -614 +614 @@
                 // or              "id - [faction] [no reputation]" format
                 std::ostringstream ss;
-                ss << id << " - |cffffffff|Hfaction:" << id << "|h[" << name << " " << localeNames[loc] << "]|h|r";
-
-                if (repItr != target->m_factions.end())
+                if (m_session)
+                                        ss << id << " - |cffffffff|Hfaction:" << id << "|h[" << name << " " << localeNames[loc] << "]|h|r";
+                                else
+                                        ss << id << " - " << name << " " << localeNames[loc];
+
+                if (repState)                               // and then target!=NULL also
                 {
                     ReputationRank rank = target->GetReputationRank(factionEntry);
@@ -623 +626 @@
                     ss << " " << rankName << "|h|r (" << target->GetReputation(factionEntry) << ")";
 
-                    if(repItr->second.Flags & FACTION_FLAG_VISIBLE)
+                    if(repState->Flags & FACTION_FLAG_VISIBLE)
                         ss << GetTrinityString(LANG_FACTION_VISIBLE);
-                    if(repItr->second.Flags & FACTION_FLAG_AT_WAR)
+                    if(repState->Flags & FACTION_FLAG_AT_WAR)
                         ss << GetTrinityString(LANG_FACTION_ATWAR);
-                    if(repItr->second.Flags & FACTION_FLAG_PEACE_FORCED)
+                    if(repState->Flags & FACTION_FLAG_PEACE_FORCED)
                         ss << GetTrinityString(LANG_FACTION_PEACE_FORCED);
-                    if(repItr->second.Flags & FACTION_FLAG_HIDDEN)
+                    if(repState->Flags & FACTION_FLAG_HIDDEN)
                         ss << GetTrinityString(LANG_FACTION_HIDDEN);
-                    if(repItr->second.Flags & FACTION_FLAG_INVISIBLE_FORCED)
+                    if(repState->Flags & FACTION_FLAG_INVISIBLE_FORCED)
                         ss << GetTrinityString(LANG_FACTION_INVISIBLE_FORCED);
-                    if(repItr->second.Flags & FACTION_FLAG_INACTIVE)
+                    if(repState->Flags & FACTION_FLAG_INACTIVE)
                         ss << GetTrinityString(LANG_FACTION_INACTIVE);
                 }
@@ -1703 +1706 @@
         }
 
-        if(name==m_session->GetPlayer()->GetName())
+        if(m_session && name==m_session->GetPlayer()->GetName())
         {
             SendSysMessage(LANG_COMMAND_KICKSELF);
@@ -1810 +1813 @@
         username = fields[0].GetCppString();
         security = fields[1].GetUInt32();
-        if(m_session->GetSecurity() >= security)
+        
+                if(!m_session || m_session->GetSecurity() >= security)
         {
             last_ip = fields[2].GetCppString();
@@ -1892 +1896 @@
     if (!px)
     {
+                if(!m_session)
+                {
+                        SendSysMessage(LANG_PLAYER_NOT_FOUND);
+                        SetSentErrorMessage(true);
+                        return false;
+                }
+
         size_t count;
         QueryResult *result = CharacterDatabase.Query("SELECT COUNT(ticket_id) FROM character_ticket");
@@ -1902 +1913 @@
             count = 0;
 
-        PSendSysMessage(LANG_COMMAND_TICKETCOUNT, count, m_session->GetPlayer()->isAcceptTickets() ?  GetTrinityString(LANG_ON) : GetTrinityString(LANG_OFF));
+        bool accept = m_session->GetPlayer()->isAcceptTickets();
+                
+                PSendSysMessage(LANG_COMMAND_TICKETCOUNT, count, accept ?  GetTrinityString(LANG_ON) : GetTrinityString(LANG_OFF));
         return true;
     }
@@ -1909 +1922 @@
     if(strncmp(px,"on",3) == 0)
     {
+                if(!m_session)
+                {
+                        SendSysMessage(LANG_PLAYER_NOT_FOUND);
+                        SetSentErrorMessage(true);
+                        return false;
+                }
+
         m_session->GetPlayer()->SetAcceptTicket(true);
         SendSysMessage(LANG_COMMAND_TICKETON);
@@ -1917 +1937 @@
     if(strncmp(px,"off",4) == 0)
     {
+                if(!m_session)
+                {
+                        SendSysMessage(LANG_PLAYER_NOT_FOUND);
+                        SetSentErrorMessage(true);
+                        return false;
+                }
+
         m_session->GetPlayer()->SetAcceptTicket(false);
         SendSysMessage(LANG_COMMAND_TICKETOFF);
@@ -3591 +3618 @@
         {
             char const* active = activeEvents.find(id) != activeEvents.end() ? GetTrinityString(LANG_ACTIVE) : "";
-            PSendSysMessage(LANG_EVENT_ENTRY_LIST,id,id,descr.c_str(),active );
+            
+                        if(m_session)
+                                PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,id,id,eventData.description.c_str(),active );
+                        else
+                                PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,id,eventData.description.c_str(),active );
+
             ++counter;
         }
@@ -3616 +3648 @@
         GameEventData const& eventData = events[event_id];
 
-        PSendSysMessage(LANG_EVENT_ENTRY_LIST,event_id,event_id,eventData.description.c_str(),active );
+        if(m_session)
+                        PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,event_id,event_id,eventData.description.c_str(),active );
+                else
+                        PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,event_id,eventData.description.c_str(),active );
+
         ++counter;
     }
@@ -3849 +3885 @@
     }
 
-    if(!*args)
+    if (!*args)
         return false;
 
@@ -3917 +3953 @@
 {
   
-    if(!*args)
-        return false;
-
-    std::string ip = strtok((char*)args, " ");
-    char* limit_str = strtok(NULL, " ");
-    int32 limit = limit_str ? atoi(limit_str) : -1;
-
-    loginDatabase.escape_string(ip);
-
-    QueryResult* result = loginDatabase.PQuery("SELECT id,username FROM account WHERE last_ip = '%s'", ip.c_str());
-
-    return LookupPlayerSearchCommand(result,limit);
+    if (!*args)
+        return false;
+
+    std::string ip = strtok ((char*)args, " ");
+        char* limit_str = strtok (NULL, " ");
+        int32 limit = limit_str ? atoi (limit_str) : -1;
+
+    loginDatabase.escape_string (ip);
+
+    QueryResult* result = loginDatabase.PQuery ("SELECT id,username FROM account WHERE last_ip = '%s'", ip.c_str ());
+
+    return LookupPlayerSearchCommand (result,limit);
 }
 
 bool ChatHandler::HandleLookupPlayerAccountCommand(const char* args)
 {
-    if(!*args)
-        return false;
-
-    std::string account = strtok((char*)args, " ");
-    char* limit_str = strtok(NULL, " ");
-    int32 limit = limit_str ? atoi(limit_str) : -1;
-
-    if(!AccountMgr::normilizeString(account))
-        return false;
-
-    loginDatabase.escape_string(account);
-
-    QueryResult* result = loginDatabase.PQuery("SELECT id,username FROM account WHERE username = '%s'", account.c_str());
-
-    return LookupPlayerSearchCommand(result,limit);
+    if (!*args)
+        return false;
+
+    std::string account = strtok ((char*)args, " ");
+        char* limit_str = strtok (NULL, " ");
+        int32 limit = limit_str ? atoi (limit_str) : -1;
+
+    if (!AccountMgr::normilizeString (account))
+        return false;
+
+    loginDatabase.escape_string (account);
+
+    QueryResult* result = loginDatabase.PQuery ("SELECT id,username FROM account WHERE username = '%s'", account.c_str ());
+
+    return LookupPlayerSearchCommand (result,limit);
 }
 
@@ -3953 +3989 @@
 {
   
-    if(!*args)
-        return false;
-
-    std::string email = strtok((char*)args, " ");
-    char* limit_str = strtok(NULL, " ");
-    int32 limit = limit_str ? atoi(limit_str) : -1;
-
-    loginDatabase.escape_string(email);
-
-    QueryResult* result = loginDatabase.PQuery("SELECT id,username FROM account WHERE email = '%s'", email.c_str());
-
-    return LookupPlayerSearchCommand(result,limit);
+    if (!*args)
+        return false;
+
+    std::string email = strtok ((char*)args, " ");
+        char* limit_str = strtok (NULL, " ");
+        int32 limit = limit_str ? atoi (limit_str) : -1;
+
+    loginDatabase.escape_string (email);
+
+    QueryResult* result = loginDatabase.PQuery ("SELECT id,username FROM account WHERE email = '%s'", email.c_str ());
+
+    return LookupPlayerSearchCommand (result,limit);
 }
 
@@ -4010 +4046 @@
     return true;
 }
+
+/// Triggering corpses expire check in world
+bool ChatHandler::HandleServerCorpsesCommand(const char* /*args*/)
+{
+        CorpsesErase();
+        return true;
+}