Fix some typo and compile errors.

--HG--
branch : trunk

6 files changed, 16 insertions, 23 deletions

diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index 6e38362ef66..47c08137b06 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -107,10 +107,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data)
         bg = sBattleGroundMgr.GetBattleGroundThroughClientInstance(instanceId, bgTypeId);
 
     if (!bg && !(bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId)))
-    {
-        SendBattleGroundOrArenaJoinError(BG_JOIN_ERR_BG_DISABLED);
         return;
-    }
 
     // expected bracket entry
     PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel());
@@ -632,10 +629,8 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data)
 
     //check if any arena enabled
     if (!sBattleGroundMgr.isAnyArenaEnabled())
-    {
-        SendBattleGroundOrArenaJoinError(BG_JOIN_ERR_ARENA_DISABLED);
         return;
-    }
+
     //check existance
     BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BATTLEGROUND_AA);
     if (!bg)
diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp
index 1b487262c13..f6f25267db6 100644
--- a/src/game/DBCStores.cpp
+++ b/src/game/DBCStores.cpp
@@ -554,13 +554,13 @@ void LoadDBCStores(const std::string& dataPath)
     }
 
     // Check loaded DBC files proper version
-    if (!sSpellStore.LookupEntry(74445)            ||       // last added spell in 3.3.2
-        !sMapStore.LookupEntry(718)                ||       // last map added in 3.3.2
-        !sGemPropertiesStore.LookupEntry(1629)     ||       // last gem property added in 3.3.2
-        !sItemExtendedCostStore.LookupEntry(2982)  ||       // last item extended cost added in 3.3.2
-        !sCharTitlesStore.LookupEntry(177)         ||       // last char title added in 3.3.2
-        !sAreaStore.LookupEntry(3461)              ||       // last area (areaflag) added in 3.3.2
-        !sItemStore.LookupEntry(52686))        // last client known item added in 3.3.2
+    if (!sAreaStore.LookupEntry(3617)              ||       // last area (areaflag) added in 3.3.3a
+        !sCharTitlesStore.LookupEntry(177)         ||       // last char title added in 3.3.3a
+        !sGemPropertiesStore.LookupEntry(1629)     ||       // last added spell in 3.3.3a	
+        !sItemStore.LookupEntry(54860)             ||       // last gem property added in 3.3.3a	
+        !sItemExtendedCostStore.LookupEntry(2997)  ||       // last item extended cost added in 3.3.3a
+        !sMapStore.LookupEntry(724)                ||       // last map added in 3.3.3a	
+        !sSpellStore.LookupEntry(76567)            )        // last client known item added in 3.3.3a
     {
         sLog.outError("\nYou have _outdated_ DBC files. Please extract correct versions from current using client.");
         exit(1);
diff --git a/src/game/Group.cpp b/src/game/Group.cpp
index c6179ffe0b6..66b3024ff47 100644
--- a/src/game/Group.cpp
+++ b/src/game/Group.cpp
@@ -144,7 +144,7 @@ bool Group::LoadGroupFromDB(const uint64 &leaderGuid, QueryResult_AutoPtr result
     if (!objmgr.GetPlayerNameByGUID(m_leaderGuid, m_leaderName))
         return false;
 
-    m_groupType  = GroupType(fields[11].GetUInt8());
+    m_groupType  = GroupType((*result)[11].GetUInt8());
 
     if (m_groupType & GROUPTYPE_RAID)
         _initRaidSubGroupsCounter();
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index daf567a361f..f5ab9b28696 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -82,10 +82,8 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recv_data)
 
     // restrict invite to GMs
     if (!sWorld.getConfig(CONFIG_ALLOW_GM_GROUP) && !GetPlayer()->isGameMaster() && player->isGameMaster())
-    {
-        SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_CANT_FIND_TARGET);
         return;
-    }
+
     // can't group with
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam())
     {
@@ -106,7 +104,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recv_data)
 
     if (player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow()))
     {
-        SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_TARGET_IGNORE_YOU);
+        SendPartyResult(PARTY_OP_INVITE, membername, ERR_IGNORING_YOU_S);
         return;
     }
 
diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp
index e28f96c1267..3aceb1d1195 100644
--- a/src/game/PlayerDump.cpp
+++ b/src/game/PlayerDump.cpp
@@ -581,8 +581,8 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                     ROLLBACK(DUMP_FILE_BROKEN);
                 if (!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-                if (!changetokGuid(vals, ITEM_FIELD_ITEM_TEXT_ID+1, itemTexts, objmgr.m_ItemTextId,true))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+//                if (!changetokGuid(vals, ITEM_FIELD_ITEM_TEXT_ID+1, itemTexts, objmgr.m_ItemTextId,true))
+                 //   ROLLBACK(DUMP_FILE_BROKEN);
                 if (!changenth(line, 3, vals.c_str()))
                     ROLLBACK(DUMP_FILE_BROKEN);
                 break;
diff --git a/src/trinityrealm/AuthSocket.cpp b/src/trinityrealm/AuthSocket.cpp
index caff730e64a..6f4f9670514 100644
--- a/src/trinityrealm/AuthSocket.cpp
+++ b/src/trinityrealm/AuthSocket.cpp
@@ -466,13 +466,13 @@ bool AuthSocket::_HandleLogonChallenge()
                     uint8 securityFlags = 0;
                     pkt << uint8(securityFlags);            // security flags (0x0...0x04)
 
-                    if (securityFlags & REALM_AUTH_FAILURE)                // PIN input
+                    if (securityFlags & 0x01)                // PIN input
                     {
                         pkt << uint32(0);
                         pkt << uint64(0) << uint64(0);      // 16 bytes hash?
                     }
 
-                    if (securityFlags & REALM_AUTH_UNKNOWN1)                // Matrix input
+                    if (securityFlags & 0x02)                // Matrix input
                     {
                         pkt << uint8(0);
                         pkt << uint8(0);
@@ -481,7 +481,7 @@ bool AuthSocket::_HandleLogonChallenge()
                         pkt << uint64(0);
                     }
 
-                    if (securityFlags & WOW_FAIL_UNKNOWN_ACCOUNT)                // Security token input
+                    if (securityFlags & 0x04)                // Security token input
                         pkt << uint8(1);
 
                     uint8 secLevel = (*result)[4].GetUInt8();