mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9564] Remove some trailing whitespace and add comment for last commit.

Browse source 
Signed-off-by: hunuza <hunuza@gmail.com>
This commit is contained in:
hunuza 2010-03-10 13:45:00 +01:00
parent efe0cde815
commit 5d84477f7f
10 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/DBCStores.cpp
View file

@ -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,sQuestFactionRewardStore, dbcPath,"QuestFactionReward.dbc");
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestSortStore, dbcPath,"QuestSort.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,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) for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i)
if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i)) if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i))
if (entry->bracketId > MAX_BATTLEGROUND_BRACKETS) if (entry->bracketId > MAX_BATTLEGROUND_BRACKETS)

4
src/game/DBCStructure.h
View file

@ -1145,8 +1145,8 @@ struct MovieEntry
struct PvPDifficultyEntry struct PvPDifficultyEntry
{ {
//uint32 id; // 0 m_ID //uint32 id; // 0 m_ID
uint32 mapId; // 1 uint32 mapId; // 1
uint32 bracketId; // 2 uint32 bracketId; // 2
uint32 minLevel; // 3 uint32 minLevel; // 3
uint32 maxLevel; // 4 uint32 maxLevel; // 4
uint32 difficulty; // 5 uint32 difficulty; // 5

2
src/game/Group.cpp
View file

@ -35,7 +35,7 @@
Group::Group() : m_Id(0), m_leaderGuid(0), m_mainTank(0), m_mainAssistant(0), m_groupType(GROUPTYPE_NORMAL), 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_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) m_subGroupsCounts(NULL)
{ {
for (int i = 0; i < TARGETICONCOUNT; ++i) for (int i = 0; i < TARGETICONCOUNT; ++i)

2
src/game/ObjectMgr.cpp
View file

@ -6542,7 +6542,7 @@ void ObjectMgr::LoadQuestPOI()
if(points) if(points)
{ {
do do
{ {
Field *pointFields = points->Fetch(); Field *pointFields = points->Fetch();
int32 x = pointFields[0].GetInt32(); int32 x = pointFields[0].GetInt32();

1
src/game/ObjectPosSelector.cpp
View file

@ -21,6 +21,7 @@
ObjectPosSelector::ObjectPosSelector(float x,float y,float size,float dist) ObjectPosSelector::ObjectPosSelector(float x,float y,float size,float dist)
: m_center_x(x),m_center_y(y),m_size(size),m_dist(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) if(m_size == 0.0f)
m_size = DEFAULT_WORLD_OBJECT_SIZE; m_size = DEFAULT_WORLD_OBJECT_SIZE;

4
src/game/SpellAuras.cpp
View file

@ -1465,7 +1465,7 @@ void Aura::HandleAddModifier(bool apply, bool Real)
case 31834: // Light's Grace case 31834: // Light's Grace
case 34754: // Clearcasting case 34754: // Clearcasting
case 34936: // Backlash case 34936: // Backlash
case 44401: // Missile Barrage case 44401: // Missile Barrage
case 48108: // Hot Streak case 48108: // Hot Streak
case 51124: // Killing Machine case 51124: // Killing Machine
case 54741: // Firestarter case 54741: // Firestarter
@ -7192,7 +7192,7 @@ void Aura::PeriodicTick()
Unit *pCaster = GetCaster(); Unit *pCaster = GetCaster();
if(!pCaster) if(!pCaster)
return; return;
// heal for caster damage (must be alive) // heal for caster damage (must be alive)
if(m_target != pCaster && GetSpellProto()->SpellVisual[0] == 163 && !pCaster->isAlive()) if(m_target != pCaster && GetSpellProto()->SpellVisual[0] == 163 && !pCaster->isAlive())
return; return;

4
src/game/SpellEffects.cpp
View file

@ -1676,7 +1676,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
if (m_caster->GetTypeId()!=TYPEID_PLAYER) if (m_caster->GetTypeId()!=TYPEID_PLAYER)
return; 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* item = ((Player*)m_caster)->GetItemByLimitedCategory(ITEM_LIMIT_CATEGORY_MANA_GEM))
if (item->HasMaxCharges()) if (item->HasMaxCharges())
return; return;
@ -3892,7 +3892,7 @@ void Spell::DoSummon(SpellEffectIndex eff_idx)
spawnCreature->InitStatsForLevel(level, m_caster); spawnCreature->InitStatsForLevel(level, m_caster);
spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false); spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false);
spawnCreature->UpdateWalkMode(m_caster); spawnCreature->UpdateWalkMode(m_caster);
spawnCreature->AIM_Initialize(); spawnCreature->AIM_Initialize();

16
src/realmd/AuthSocket.cpp
View file

@ -739,7 +739,7 @@ bool AuthSocket::_HandleLogonProof()
sha.Initialize(); sha.Initialize();
sha.UpdateBigNumbers(&A, &M, &K, NULL); sha.UpdateBigNumbers(&A, &M, &K, NULL);
sha.Finalize(); sha.Finalize();
SendProof(sha); SendProof(sha);
///- Set _authed to true! ///- 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) ///- Circle through realms in the RealmList and construct the return packet (including # of user characters in each realm)
ByteBuffer pkt; ByteBuffer pkt;
LoadRealmlist(pkt, id); LoadRealmlist(pkt, id);
ByteBuffer hdr; ByteBuffer hdr;
hdr << (uint8) REALM_LIST; hdr << (uint8) REALM_LIST;
hdr << (uint16)pkt.size(); hdr << (uint16)pkt.size();
@ -936,7 +936,7 @@ bool AuthSocket::_HandleRealmList()
} }
void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid) void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
{ {
switch(_build) switch(_build)
{ {
case 5875: // 1.12.1 case 5875: // 1.12.1
@ -944,7 +944,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
{ {
pkt << uint32(0); pkt << uint32(0);
pkt << uint8(sRealmList.size()); pkt << uint8(sRealmList.size());
for(RealmList::RealmMap::const_iterator i = sRealmList.begin(); i != sRealmList.end(); ++i) for(RealmList::RealmMap::const_iterator i = sRealmList.begin(); i != sRealmList.end(); ++i)
{ {
uint8 AmountOfCharacters; uint8 AmountOfCharacters;
@ -973,12 +973,12 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
pkt << uint8(i->second.timezone); // realm category pkt << uint8(i->second.timezone); // realm category
pkt << uint8(0x00); // unk, may be realm number/id? pkt << uint8(0x00); // unk, may be realm number/id?
} }
pkt << uint8(0x00); pkt << uint8(0x00);
pkt << uint8(0x02); pkt << uint8(0x02);
break; break;
} }
case 8606: // 2.4.3 case 8606: // 2.4.3
case 10505: // 3.2.2a case 10505: // 3.2.2a
case 11159: // 3.3.0a case 11159: // 3.3.0a
@ -987,7 +987,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
{ {
pkt << uint32(0); pkt << uint32(0);
pkt << uint16(sRealmList.size()); pkt << uint16(sRealmList.size());
for(RealmList::RealmMap::const_iterator i = sRealmList.begin(); i != sRealmList.end(); ++i) for(RealmList::RealmMap::const_iterator i = sRealmList.begin(); i != sRealmList.end(); ++i)
{ {
uint8 AmountOfCharacters; uint8 AmountOfCharacters;
@ -1018,7 +1018,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
pkt << uint8(i->second.timezone); // realm category pkt << uint8(i->second.timezone); // realm category
pkt << uint8(0x2C); // unk, may be realm number/id? pkt << uint8(0x2C); // unk, may be realm number/id?
} }
pkt << uint8(0x10); pkt << uint8(0x10);
pkt << uint8(0x00); pkt << uint8(0x00);
break; break;

4
src/realmd/RealmList.cpp
View file

@ -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) 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 ///- Create new if not exist or update existed
Realm& realm = m_realms[name]; Realm& realm = m_realms[name];
realm.m_ID = ID; realm.m_ID = ID;
realm.icon = icon; realm.icon = icon;
realm.color = color; realm.color = color;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9563" #define REVISION_NR "9564"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__