Changeset 28 for trunk/src/game/MiscHandler.cpp

Timestamp:

11/19/08 13:24:39 (17 years ago)

Author:

yumileroy

Message:

[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

Original author: Neo2003
Date: 2008-10-09 08:42:22-05:00

Files:

• trunk/src/game/MiscHandler.cpp (modified) (3 diffs)

trunk/src/game/MiscHandler.cpp

@@ -1427 +1427 @@
         GetPlayer()->TeleportTo(mapid,PositionX,PositionY,PositionZ,Orientation);
     else
-        SendNotification("You do not have permission to perform that function");
+        SendNotification(LANG_YOU_NOT_HAVE_PERMISSION);
     sLog.outDebug("Received worldport command from player %s", GetPlayer()->GetName());
 }
@@ -1436 +1436 @@
 
     sLog.outDebug("Received opcode CMSG_WHOIS");
-    std::string charname, acc, email, lastip, msg;
+    std::string charname;
     recv_data >> charname;
 
     if (GetSecurity() < SEC_ADMINISTRATOR)
     {
-        SendNotification("You do not have permission to perform that function");
+        SendNotification(LANG_YOU_NOT_HAVE_PERMISSION);
         return;
     }
@@ -1447 +1447 @@
     if(charname.empty())
     {
-        SendNotification("Please provide character name");
-        return;
-    }
-
-    uint32 accid;
-    Field *fields;
+        SendNotification(LANG_NEED_CHARACTER_NAME);
+        return;
+    }
 
     Player *plr = objmgr.GetPlayer(charname.c_str());
 
-    if(plr)
-        accid = plr->GetSession()->GetAccountId();
-    else
-    {
-        SendNotification("Player %s not found or offline", charname.c_str());
-        return;
-    }
-
-    if(!accid)
-    {
-        SendNotification("Account for character %s not found", charname.c_str());
-        return;
-    }
+    if(!plr)
+    {
+        SendNotification(LANG_PLAYER_NOT_EXIST_OR_OFFLINE, charname.c_str());
+        return;
+    }
+
+    uint32 accid = plr->GetSession()->GetAccountId();
 
     QueryResult *result = loginDatabase.PQuery("SELECT username,email,last_ip FROM account WHERE id=%u", accid);
-    if(result)
-    {
-        fields = result->Fetch();
-        acc = fields[0].GetCppString();
-        if(acc.empty())
-            acc = "Unknown";
-        email = fields[1].GetCppString();
-        if(email.empty())
-            email = "Unknown";
-        lastip = fields[2].GetCppString();
-        if(lastip.empty())
-            lastip = "Unknown";
-        msg = charname + "'s " + "account is " + acc + ", e-mail: " + email + ", last ip: " + lastip;
-
-        WorldPacket data(SMSG_WHOIS, msg.size()+1);
-        data << msg;
-        _player->GetSession()->SendPacket(&data);
-    }
-    else
-        SendNotification("Account for character %s not found", charname.c_str());
+    if(!result)
+    {
+        SendNotification(LANG_ACCOUNT_FOR_PLAYER_NOT_FOUND, charname.c_str());
+        return;
+    }
+
+    Field *fields = result->Fetch();
+    std::string acc = fields[0].GetCppString();
+    if(acc.empty())
+        acc = "Unknown";
+    std::string email = fields[1].GetCppString();
+    if(email.empty())
+        email = "Unknown";
+    std::string lastip = fields[2].GetCppString();
+    if(lastip.empty())
+        lastip = "Unknown";
+
+    std::string msg = charname + "'s " + "account is " + acc + ", e-mail: " + email + ", last ip: " + lastip;
+
+    WorldPacket data(SMSG_WHOIS, msg.size()+1);
+    data << msg;
+    _player->GetSession()->SendPacket(&data);
 
     delete result;
+
     sLog.outDebug("Received whois command from player %s for character %s", GetPlayer()->GetName(), charname.c_str());
 }