Fix some typo and compile errors.

--HG--
branch : trunk
This commit is contained in:
n0n4m3
2010-04-11 11:24:59 +04:00
parent 45e750148a
commit 0d48d3bd8c
6 changed files with 16 additions and 23 deletions
+1 -6
View File
@@ -107,10 +107,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data)
bg = sBattleGroundMgr.GetBattleGroundThroughClientInstance(instanceId, bgTypeId); bg = sBattleGroundMgr.GetBattleGroundThroughClientInstance(instanceId, bgTypeId);
if (!bg && !(bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId))) if (!bg && !(bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId)))
{
SendBattleGroundOrArenaJoinError(BG_JOIN_ERR_BG_DISABLED);
return; return;
}
// expected bracket entry // expected bracket entry
PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel()); PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel());
@@ -632,10 +629,8 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data)
//check if any arena enabled //check if any arena enabled
if (!sBattleGroundMgr.isAnyArenaEnabled()) if (!sBattleGroundMgr.isAnyArenaEnabled())
{
SendBattleGroundOrArenaJoinError(BG_JOIN_ERR_ARENA_DISABLED);
return; return;
}
//check existance //check existance
BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BATTLEGROUND_AA); BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BATTLEGROUND_AA);
if (!bg) if (!bg)
+7 -7
View File
@@ -554,13 +554,13 @@ void LoadDBCStores(const std::string& dataPath)
} }
// Check loaded DBC files proper version // Check loaded DBC files proper version
if (!sSpellStore.LookupEntry(74445) || // last added spell in 3.3.2 if (!sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.3a
!sMapStore.LookupEntry(718) || // last map added in 3.3.2 !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.3a
!sGemPropertiesStore.LookupEntry(1629) || // last gem property added in 3.3.2 !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.3a
!sItemExtendedCostStore.LookupEntry(2982) || // last item extended cost added in 3.3.2 !sItemStore.LookupEntry(54860) || // last gem property added in 3.3.3a
!sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.2 !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.3a
!sAreaStore.LookupEntry(3461) || // last area (areaflag) added in 3.3.2 !sMapStore.LookupEntry(724) || // last map added in 3.3.3a
!sItemStore.LookupEntry(52686)) // last client known item added in 3.3.2 !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."); sLog.outError("\nYou have _outdated_ DBC files. Please extract correct versions from current using client.");
exit(1); exit(1);
+1 -1
View File
@@ -144,7 +144,7 @@ bool Group::LoadGroupFromDB(const uint64 &leaderGuid, QueryResult_AutoPtr result
if (!objmgr.GetPlayerNameByGUID(m_leaderGuid, m_leaderName)) if (!objmgr.GetPlayerNameByGUID(m_leaderGuid, m_leaderName))
return false; return false;
m_groupType = GroupType(fields[11].GetUInt8()); m_groupType = GroupType((*result)[11].GetUInt8());
if (m_groupType & GROUPTYPE_RAID) if (m_groupType & GROUPTYPE_RAID)
_initRaidSubGroupsCounter(); _initRaidSubGroupsCounter();
+2 -4
View File
@@ -82,10 +82,8 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recv_data)
// restrict invite to GMs // restrict invite to GMs
if (!sWorld.getConfig(CONFIG_ALLOW_GM_GROUP) && !GetPlayer()->isGameMaster() && player->isGameMaster()) if (!sWorld.getConfig(CONFIG_ALLOW_GM_GROUP) && !GetPlayer()->isGameMaster() && player->isGameMaster())
{
SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_CANT_FIND_TARGET);
return; return;
}
// can't group with // can't group with
if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam()) 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())) 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; return;
} }
+2 -2
View File
@@ -581,8 +581,8 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
ROLLBACK(DUMP_FILE_BROKEN); ROLLBACK(DUMP_FILE_BROKEN);
if (!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid)) if (!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid))
ROLLBACK(DUMP_FILE_BROKEN); ROLLBACK(DUMP_FILE_BROKEN);
if (!changetokGuid(vals, ITEM_FIELD_ITEM_TEXT_ID+1, itemTexts, objmgr.m_ItemTextId,true)) // if (!changetokGuid(vals, ITEM_FIELD_ITEM_TEXT_ID+1, itemTexts, objmgr.m_ItemTextId,true))
ROLLBACK(DUMP_FILE_BROKEN); // ROLLBACK(DUMP_FILE_BROKEN);
if (!changenth(line, 3, vals.c_str())) if (!changenth(line, 3, vals.c_str()))
ROLLBACK(DUMP_FILE_BROKEN); ROLLBACK(DUMP_FILE_BROKEN);
break; break;
+3 -3
View File
@@ -466,13 +466,13 @@ bool AuthSocket::_HandleLogonChallenge()
uint8 securityFlags = 0; uint8 securityFlags = 0;
pkt << uint8(securityFlags); // security flags (0x0...0x04) pkt << uint8(securityFlags); // security flags (0x0...0x04)
if (securityFlags & REALM_AUTH_FAILURE) // PIN input if (securityFlags & 0x01) // PIN input
{ {
pkt << uint32(0); pkt << uint32(0);
pkt << uint64(0) << uint64(0); // 16 bytes hash? 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);
pkt << uint8(0); pkt << uint8(0);
@@ -481,7 +481,7 @@ bool AuthSocket::_HandleLogonChallenge()
pkt << uint64(0); pkt << uint64(0);
} }
if (securityFlags & WOW_FAIL_UNKNOWN_ACCOUNT) // Security token input if (securityFlags & 0x04) // Security token input
pkt << uint8(1); pkt << uint8(1);
uint8 secLevel = (*result)[4].GetUInt8(); uint8 secLevel = (*result)[4].GetUInt8();