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

[8476] Revert some recent cleanup changes, some other fixes and cleanups.

Browse source
This commit is contained in:
VladimirMangos 2009-09-05 22:06:53 +04:00
parent bd30769dec
commit 7a2df3c309
7 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/CharacterHandler.cpp
View file

@ -1293,7 +1293,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket &recv_data)
uint8 srcbag, srcslot; uint8 srcbag, srcslot;
recv_data >> srcbag >> srcslot; recv_data >> srcbag >> srcslot;
sLog.outDebug("Item " UI64FMTD ": srcbag %u, srcslot %u", itemGuid, srcbag, srcslot); sLog.outDebug("Item " I64FMT ": srcbag %u, srcslot %u", itemGuid, srcbag, srcslot);
Item *item = _player->GetItemByGuid(itemGuid); Item *item = _player->GetItemByGuid(itemGuid);

2
src/game/Creature.cpp
View file

@ -1462,7 +1462,7 @@ float Creature::GetAttackDistance(Unit const* pl) const
uint32 playerlevel = pl->getLevelForTarget(this); uint32 playerlevel = pl->getLevelForTarget(this);
uint32 creaturelevel = getLevelForTarget(pl); uint32 creaturelevel = getLevelForTarget(pl);
int32 leveldif = playerlevel - creaturelevel; int32 leveldif = int32(playerlevel) - int32(creaturelevel);
// "The maximum Aggro Radius has a cap of 25 levels under. Example: A level 30 char has the same Aggro Radius of a level 5 char on a level 60 mob." // "The maximum Aggro Radius has a cap of 25 levels under. Example: A level 30 char has the same Aggro Radius of a level 5 char on a level 60 mob."
if ( leveldif < - 25) if ( leveldif < - 25)

22
src/game/Guild.h
View file

@ -295,19 +295,19 @@ class Guild
uint32 GetId(){ return m_Id; } uint32 GetId(){ return m_Id; }
const uint64& GetLeader(){ return m_LeaderGuid; } const uint64& GetLeader(){ return m_LeaderGuid; }
std::string GetName(){ return m_Name; } std::string const& GetName() const { return m_Name; }
std::string GetMOTD(){ return MOTD; } std::string const& GetMOTD() const { return MOTD; }
std::string GetGINFO(){ return GINFO; } std::string const& GetGINFO() const { return GINFO; }
uint32 GetCreatedYear(){ return m_CreatedYear; } uint32 GetCreatedYear() const { return m_CreatedYear; }
uint32 GetCreatedMonth(){ return m_CreatedMonth; } uint32 GetCreatedMonth() const { return m_CreatedMonth; }
uint32 GetCreatedDay(){ return m_CreatedDay; } uint32 GetCreatedDay() const { return m_CreatedDay; }
uint32 GetEmblemStyle(){ return m_EmblemStyle; } uint32 GetEmblemStyle() const { return m_EmblemStyle; }
uint32 GetEmblemColor(){ return m_EmblemColor; } uint32 GetEmblemColor() const { return m_EmblemColor; }
uint32 GetBorderStyle(){ return m_BorderStyle; } uint32 GetBorderStyle() const { return m_BorderStyle; }
uint32 GetBorderColor(){ return m_BorderColor; } uint32 GetBorderColor() const { return m_BorderColor; }
uint32 GetBackgroundColor(){ return m_BackgroundColor; } uint32 GetBackgroundColor() const { return m_BackgroundColor; }
void SetLeader(uint64 guid); void SetLeader(uint64 guid);
bool AddMember(uint64 plGuid, uint32 plRank); bool AddMember(uint64 plGuid, uint32 plRank);

4
src/game/MovementHandler.cpp
View file

@ -438,7 +438,7 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recv_data)
if(_player->m_mover->GetGUID() != guid) if(_player->m_mover->GetGUID() != guid)
{ {
sLog.outError("HandleSetActiveMoverOpcode: incorrect mover guid: mover is " UI64FMTD " and should be " UI64FMTD, _player->m_mover->GetGUID(), guid); sLog.outError("HandleSetActiveMoverOpcode: incorrect mover guid: mover is " I64FMT " and should be " I64FMT, _player->m_mover->GetGUID(), guid);
return; return;
} }
} }
@ -453,7 +453,7 @@ void WorldSession::HandleMoveNotActiveMover(WorldPacket &recv_data)
if(_player->m_mover->GetGUID() == old_mover_guid) if(_player->m_mover->GetGUID() == old_mover_guid)
{ {
sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is " UI64FMTD " and should be " UI64FMTD " instead of " UI64FMTD, _player->m_mover->GetGUID(), _player->GetGUID(), old_mover_guid); sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is " I64FMT " and should be " I64FMT " instead of " UI64FMTD, _player->m_mover->GetGUID(), _player->GetGUID(), old_mover_guid);
recv_data.rpos(recv_data.wpos()); // prevent warnings spam recv_data.rpos(recv_data.wpos()); // prevent warnings spam
return; return;
} }

5
src/game/ObjectMgr.cpp
View file

@ -7080,10 +7080,7 @@ bool PlayerCondition::Meets(Player const * player) const
case CONDITION_REPUTATION_RANK: case CONDITION_REPUTATION_RANK:
{ {
FactionEntry const* faction = sFactionStore.LookupEntry(value1); FactionEntry const* faction = sFactionStore.LookupEntry(value1);
// -1 used if faction couldn't be found return faction && player->GetReputationMgr().GetRank(faction) >= int32(value2);
if (player->GetReputationMgr().GetRank(faction) == -1)
return false;
return faction && uint32(player->GetReputationMgr().GetRank(faction)) >= value2;
} }
case CONDITION_TEAM: case CONDITION_TEAM:
return player->GetTeam() == value1; return player->GetTeam() == value1;

2
src/game/SpellMgr.cpp
View file

@ -2989,7 +2989,7 @@ void SpellMgr::CheckUsedSpells(char const* table)
{ {
if(spellEntry->SpellFamilyFlags != 0 || spellEntry->SpellFamilyFlags2 != 0) if(spellEntry->SpellFamilyFlags != 0 || spellEntry->SpellFamilyFlags2 != 0)
{ {
sLog.outError("Spell %u '%s' not fit to (" UI64FMTD "," I32FMT ") but used in %s.", sLog.outError("Spell %u '%s' not fit to (" I64FMT "," I32FMT ") but used in %s.",
spell, name.c_str(), familyMaskA, familyMaskB, code.c_str()); spell, name.c_str(), familyMaskA, familyMaskB, code.c_str());
continue; continue;
} }

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 "8475" #define REVISION_NR "8476"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__