Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14782 from doctaweeks/fixes-for-6.x

Browse Source 
Minor fixes for 6.x
(cherry picked from commit 0cf0209741)

Conflicts:
	src/server/bnetserver/Main.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
	src/server/game/Battlegrounds/Zones/BattlegroundTP.h
	src/server/game/Chat/Channels/Channel.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.h
	src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
	src/server/shared/Cryptography/SHA256.h
This commit is contained in:
MitchesD
2015-05-30 19:34:25 +02:00
committed by DDuarte
parent 79dd72ae70
commit db8fdd94ed
14 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/AI/CoreAI/UnitAI.h
View File

@@ -128,7 +128,7 @@ class UnitAI
virtual void InitializeAI() { if (!me->isDead()) Reset(); }
virtual void Reset() { };
virtual void Reset() { }
// Called when unit is charmed
virtual void OnCharmed(bool apply) = 0;

6
src/server/game/Accounts/RBAC.h
View File

@@ -802,6 +802,7 @@ class RBACData
* @return Success or failure (with reason) to grant the permission
*
* Example Usage:
* @code
* // previously defined "RBACData* rbac" with proper initialization
* uint32 permissionId = 2;
* if (rbac->GrantRole(permissionId) == RBAC_IN_DENIED_LIST)
@@ -825,6 +826,7 @@ class RBACData
* @return Success or failure (with reason) to deny the permission
*
* Example Usage:
* @code
* // previously defined "RBACData* rbac" with proper initialization
* uint32 permissionId = 2;
* if (rbac->DenyRole(permissionId) == RBAC_ID_DOES_NOT_EXISTS)
@@ -849,6 +851,7 @@ class RBACData
* @return Success or failure (with reason) to remove the permission
*
* Example Usage:
* @code
* // previously defined "RBACData* rbac" with proper initialization
* uint32 permissionId = 2;
* if (rbac->RevokeRole(permissionId) == RBAC_OK)
@@ -939,9 +942,6 @@ class RBACData
*
* Given a list of permissions, gets all the inherited permissions
* @param permissions The list of permissions to expand
*
* @return new list of permissions containing original permissions and
* all other pemissions that are linked to the original ones
*/
void ExpandPermissions(RBACPermissionContainer& permissions);

2
src/server/game/Battlegrounds/BattlegroundQueue.h
View File

@@ -106,7 +106,7 @@ class BattlegroundQueue
class SelectionPool
{
public:
SelectionPool(): PlayerCount(0) { };
SelectionPool(): PlayerCount(0) { }
void Init();
bool AddGroup(GroupQueueInfo* ginfo, uint32 desiredCount);
bool KickGroup(uint32 size);

2
src/server/game/Chat/Channels/Channel.h
View File

@@ -184,7 +184,7 @@ class Channel
void DeVoice(ObjectGuid guid1, ObjectGuid guid2);
void JoinNotify(ObjectGuid guid); // invisible notify
void LeaveNotify(ObjectGuid guid); // invisible notify
void SetOwnership(bool ownership) { _ownership = ownership; };
void SetOwnership(bool ownership) { _ownership = ownership; }
static void CleanOldChannelsInDB();
private:

6
src/server/game/Entities/Player/Player.h
View File

@@ -346,9 +346,9 @@ struct Runes
struct EnchantDuration
{
EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) { };
EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) { }
EnchantDuration(Item* _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot),
leftduration(_leftduration){ ASSERT(item); };
leftduration(_leftduration){ ASSERT(item); }
Item* item;
EnchantmentSlot slot;
@@ -1839,7 +1839,7 @@ class Player : public Unit, public GridObject<Player>
bool UpdatePosition(const Position &pos, bool teleport = false) { return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); }
void UpdateUnderwaterState(Map* m, float x, float y, float z) override;
void SendMessageToSet(WorldPacket* data, bool self) override {SendMessageToSetInRange(data, GetVisibilityRange(), self); };// overwrite Object::SendMessageToSet
void SendMessageToSet(WorldPacket* data, bool self) override {SendMessageToSetInRange(data, GetVisibilityRange(), self); }// overwrite Object::SendMessageToSet
void SendMessageToSetInRange(WorldPacket* data, float fist, bool self) override;// overwrite Object::SendMessageToSetInRange
void SendMessageToSetInRange(WorldPacket* data, float dist, bool self, bool own_team_only);
void SendMessageToSet(WorldPacket* data, Player const* skipped_rcvr) override;

2
src/server/game/Entities/Unit/Unit.h
View File

@@ -1896,7 +1896,7 @@ class Unit : public WorldObject
void TauntApply(Unit* victim);
void TauntFadeOut(Unit* taunter);
ThreatManager& getThreatManager() { return m_ThreatManager; }
void addHatedBy(HostileReference* pHostileReference) { m_HostileRefManager.insertFirst(pHostileReference); };
void addHatedBy(HostileReference* pHostileReference) { m_HostileRefManager.insertFirst(pHostileReference); }
void removeHatedBy(HostileReference* /*pHostileReference*/) { /* nothing to do yet */ }
HostileRefManager& getHostileRefManager() { return m_HostileRefManager; }

2
src/server/game/Events/GameEventMgr.h
View File

@@ -96,7 +96,7 @@ class GameEventMgr
{
private:
GameEventMgr();
~GameEventMgr() { };
~GameEventMgr() { }
public:
static GameEventMgr* instance()

2
src/server/game/Groups/Group.h
View File

@@ -218,7 +218,7 @@ class Group
ObjectGuid GetMasterLooterGuid() const;
ItemQualities GetLootThreshold() const;
uint32 GetDbStoreId() const { return m_dbStoreId; };
uint32 GetDbStoreId() const { return m_dbStoreId; }
// member manipulation methods
bool IsMember(ObjectGuid guid) const;

2
src/server/game/Movement/MotionMaster.h
View File

@@ -182,7 +182,7 @@ class MotionMaster //: private std::stack<MovementGenerator *>
void MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ);
void MoveJumpTo(float angle, float speedXY, float speedZ);
void MoveJump(Position const& pos, float speedXY, float speedZ, uint32 id = EVENT_JUMP)
{ MoveJump(pos.m_positionX, pos.m_positionY, pos.m_positionZ, speedXY, speedZ, id); };
{ MoveJump(pos.m_positionX, pos.m_positionY, pos.m_positionZ, speedXY, speedZ, id); }
void MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id = EVENT_JUMP);
void MoveCirclePath(float x, float y, float z, float radius, bool clockwise, uint8 stepCount);
void MoveFall(uint32 id = 0);

2
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
View File

@@ -102,7 +102,7 @@ public:
}
}
virtual void Update(uint32 /*diff*/) // correct order goes form 1-6
virtual void Update(uint32 /*diff*/) override // correct order goes form 1-6
{
switch (State)
{

2
src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
View File

@@ -202,7 +202,7 @@ class boss_archaedas : public CreatureScript
DoMeleeAttackIfReady();
}
void JustDied (Unit* /*killer*/)
void JustDied (Unit* /*killer*/) override
{
instance->SetData(DATA_ANCIENT_DOOR, DONE); // open the vault door
instance->SetData(DATA_MINIONS, SPECIAL); // deactivate his minions

8
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
View File

@@ -261,13 +261,13 @@ class OPvPCapturePointNA : public OPvPCapturePoint
public:
OPvPCapturePointNA(OutdoorPvP* pvp);
bool Update(uint32 diff);
bool Update(uint32 diff) override;
void ChangeState();
void ChangeState() override;
void FillInitialWorldStates(WorldPacket & data);
void FillInitialWorldStates(WorldPacket & data) override;
bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go);
bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go) override;
int32 HandleOpenGo(Player* player, ObjectGuid guid) override;

12
src/server/scripts/Spells/spell_quest.cpp
View File

@@ -339,7 +339,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q11396_11399_scourging_crystal_controller_SpellScript();
};
}
};
// 43882 Scourging Crystal Controller Dummy
@@ -375,7 +375,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript
SpellScript* GetSpellScript() const override
{
return new spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript();
};
}
};
// http://www.wowhead.com/quest=11515 Blood for Blood
@@ -856,7 +856,7 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_symbol_of_life_dummy_SpellScript();
};
}
};
// http://www.wowhead.com/quest=12659 Scalps!
@@ -899,7 +899,7 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q12659_ahunaes_knife_SpellScript();
};
}
};
enum StoppingTheSpread
@@ -945,7 +945,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q9874_liquid_fire_SpellScript();
};
}
};
enum SalvagingLifesStength
@@ -989,7 +989,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q12805_lifeblood_dummy_SpellScript();
};
}
};
/*

4
src/server/shared/Cryptography/SHA1.h
View File

@@ -39,8 +39,8 @@ class SHA1Hash
void Initialize();
void Finalize();
uint8 *GetDigest(void) { return mDigest; };
int GetLength(void) const { return SHA_DIGEST_LENGTH; };
uint8 *GetDigest(void) { return mDigest; }
int GetLength(void) const { return SHA_DIGEST_LENGTH; }
private:
SHA_CTX mC;