diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index 7e9ce1f58..6154967e2 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -425,7 +425,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestFactionRewardStore, dbcPath,"QuestFactionReward.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestSortStore, dbcPath,"QuestSort.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestXPLevelStore, dbcPath,"QuestXP.dbc"); - LoadDBC(availableDbcLocales,bar,bad_dbc_files,sPvPDifficultyStore, dbcPath,"PvpDifficulty.dbc"); + LoadDBC(availableDbcLocales,bar,bad_dbc_files,sPvPDifficultyStore, dbcPath,"PvpDifficulty.dbc"); for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i) if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i)) if (entry->bracketId > MAX_BATTLEGROUND_BRACKETS) diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index 3df6e72a5..2d8fec60d 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -1145,8 +1145,8 @@ struct MovieEntry struct PvPDifficultyEntry { //uint32 id; // 0 m_ID - uint32 mapId; // 1 - uint32 bracketId; // 2 + uint32 mapId; // 1 + uint32 bracketId; // 2 uint32 minLevel; // 3 uint32 maxLevel; // 4 uint32 difficulty; // 5 diff --git a/src/game/Group.cpp b/src/game/Group.cpp index a8745781f..be03e8a00 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -35,7 +35,7 @@ Group::Group() : m_Id(0), m_leaderGuid(0), m_mainTank(0), m_mainAssistant(0), m_groupType(GROUPTYPE_NORMAL), m_dungeonDifficulty(REGULAR_DIFFICULTY), m_raidDifficulty(REGULAR_DIFFICULTY), - m_bgGroup(NULL), m_lootMethod(FREE_FOR_ALL), m_looterGuid(0), m_lootThreshold(ITEM_QUALITY_UNCOMMON), + m_bgGroup(NULL), m_lootMethod(FREE_FOR_ALL), m_looterGuid(0), m_lootThreshold(ITEM_QUALITY_UNCOMMON), m_subGroupsCounts(NULL) { for (int i = 0; i < TARGETICONCOUNT; ++i) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 7fea7afdc..75fa6412c 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -6542,7 +6542,7 @@ void ObjectMgr::LoadQuestPOI() if(points) { - do + do { Field *pointFields = points->Fetch(); int32 x = pointFields[0].GetInt32(); diff --git a/src/game/ObjectPosSelector.cpp b/src/game/ObjectPosSelector.cpp index b8a67a242..8a97b9644 100644 --- a/src/game/ObjectPosSelector.cpp +++ b/src/game/ObjectPosSelector.cpp @@ -21,6 +21,7 @@ ObjectPosSelector::ObjectPosSelector(float x,float y,float size,float dist) : m_center_x(x),m_center_y(y),m_size(size),m_dist(dist) { + // if size == 0, m_anglestep will become 0 -> freeze if(m_size == 0.0f) m_size = DEFAULT_WORLD_OBJECT_SIZE; diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 636e64cfe..18b4af6d2 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1465,7 +1465,7 @@ void Aura::HandleAddModifier(bool apply, bool Real) case 31834: // Light's Grace case 34754: // Clearcasting case 34936: // Backlash - case 44401: // Missile Barrage + case 44401: // Missile Barrage case 48108: // Hot Streak case 51124: // Killing Machine case 54741: // Firestarter @@ -7192,7 +7192,7 @@ void Aura::PeriodicTick() Unit *pCaster = GetCaster(); if(!pCaster) return; - + // heal for caster damage (must be alive) if(m_target != pCaster && GetSpellProto()->SpellVisual[0] == 163 && !pCaster->isAlive()) return; diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 9b7f52c9c..9c7d8f88b 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1676,7 +1676,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx) if (m_caster->GetTypeId()!=TYPEID_PLAYER) return; - // checked in create item check, avoid unexpected + // checked in create item check, avoid unexpected if (Item* item = ((Player*)m_caster)->GetItemByLimitedCategory(ITEM_LIMIT_CATEGORY_MANA_GEM)) if (item->HasMaxCharges()) return; @@ -3892,7 +3892,7 @@ void Spell::DoSummon(SpellEffectIndex eff_idx) spawnCreature->InitStatsForLevel(level, m_caster); spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false); - + spawnCreature->UpdateWalkMode(m_caster); spawnCreature->AIM_Initialize(); diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp index 806d732ad..11643afd3 100644 --- a/src/realmd/AuthSocket.cpp +++ b/src/realmd/AuthSocket.cpp @@ -739,7 +739,7 @@ bool AuthSocket::_HandleLogonProof() sha.Initialize(); sha.UpdateBigNumbers(&A, &M, &K, NULL); sha.Finalize(); - + SendProof(sha); ///- Set _authed to true! @@ -924,7 +924,7 @@ bool AuthSocket::_HandleRealmList() ///- Circle through realms in the RealmList and construct the return packet (including # of user characters in each realm) ByteBuffer pkt; LoadRealmlist(pkt, id); - + ByteBuffer hdr; hdr << (uint8) REALM_LIST; hdr << (uint16)pkt.size(); @@ -936,7 +936,7 @@ bool AuthSocket::_HandleRealmList() } void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid) -{ +{ switch(_build) { case 5875: // 1.12.1 @@ -944,7 +944,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid) { pkt << uint32(0); pkt << uint8(sRealmList.size()); - + for(RealmList::RealmMap::const_iterator i = sRealmList.begin(); i != sRealmList.end(); ++i) { uint8 AmountOfCharacters; @@ -973,12 +973,12 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid) pkt << uint8(i->second.timezone); // realm category pkt << uint8(0x00); // unk, may be realm number/id? } - + pkt << uint8(0x00); pkt << uint8(0x02); break; } - + case 8606: // 2.4.3 case 10505: // 3.2.2a case 11159: // 3.3.0a @@ -987,7 +987,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid) { pkt << uint32(0); pkt << uint16(sRealmList.size()); - + for(RealmList::RealmMap::const_iterator i = sRealmList.begin(); i != sRealmList.end(); ++i) { uint8 AmountOfCharacters; @@ -1018,7 +1018,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid) pkt << uint8(i->second.timezone); // realm category pkt << uint8(0x2C); // unk, may be realm number/id? } - + pkt << uint8(0x10); pkt << uint8(0x00); break; diff --git a/src/realmd/RealmList.cpp b/src/realmd/RealmList.cpp index c6cf03005..129cde2a1 100644 --- a/src/realmd/RealmList.cpp +++ b/src/realmd/RealmList.cpp @@ -51,10 +51,10 @@ void RealmList::Initialize(uint32 updateInterval) } void RealmList::UpdateRealm( uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, uint8 color, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, const char* builds) -{ +{ ///- Create new if not exist or update existed Realm& realm = m_realms[name]; - + realm.m_ID = ID; realm.icon = icon; realm.color = color; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2e93bcb0f..65ae1cdff 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9563" + #define REVISION_NR "9564" #endif // __REVISION_NR_H__