aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--COPYING14
-rw-r--r--dep/include/g3dlite/G3D/Vector3.inl6
-rw-r--r--dep/include/g3dlite/G3D/g3dmath.inl56
-rw-r--r--dep/src/g3dlite/Box.cpp94
-rw-r--r--src/bindings/scripts/ScriptMgr.cpp4
-rw-r--r--src/bindings/scripts/scripts/go/go_scripts.cpp2
-rw-r--r--src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h2
-rw-r--r--src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp14
-rw-r--r--src/game/BattleGround.cpp34
-rw-r--r--src/game/BattleGround.h4
-rw-r--r--src/game/BattleGroundAB.cpp2
-rw-r--r--src/game/Chat.cpp13
-rw-r--r--src/game/Creature.cpp2
-rw-r--r--src/game/Map.h2
-rw-r--r--src/game/ObjectMgr.cpp20
-rw-r--r--src/game/Player.cpp2
-rw-r--r--src/game/Player.h2
-rw-r--r--src/game/SpellEffects.cpp2
-rw-r--r--src/game/SpellMgr.cpp2
19 files changed, 137 insertions, 140 deletions
diff --git a/COPYING b/COPYING
index d60c31a97a5..bee9f8d231f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
diff --git a/dep/include/g3dlite/G3D/Vector3.inl b/dep/include/g3dlite/G3D/Vector3.inl
index 99110ffc8eb..e2f328165bb 100644
--- a/dep/include/g3dlite/G3D/Vector3.inl
+++ b/dep/include/g3dlite/G3D/Vector3.inl
@@ -13,11 +13,11 @@
//----------------------------------------------------------------------------
#ifdef SSE
- // If you receive an error on this line, it is because you do not have the file
- // xmmintrin.h needed for MMX & SSE extensions. Download and install
+ // If you receive an error on this line, it is because you do not have the file
+ // xmmintrin.h needed for MMX & SSE extensions. Download and install
//
// http://download.microsoft.com/download/vstudio60ent/SP5/Wideband-Full/WIN98Me/EN-US/vs6sp5.exe
- // and
+ // and
// http://download.microsoft.com/download/vb60ent/Update/6/W9X2KXP/EN-US/vcpp5.exe
//
// to get this file.
diff --git a/dep/include/g3dlite/G3D/g3dmath.inl b/dep/include/g3dlite/G3D/g3dmath.inl
index 1068ed5bf81..ad685bc5ce4 100644
--- a/dep/include/g3dlite/G3D/g3dmath.inl
+++ b/dep/include/g3dlite/G3D/g3dmath.inl
@@ -42,46 +42,46 @@ inline int iCeil (double fValue) {
inline int iClamp(int val, int low, int hi) {
debugAssert(low <= hi);
- if (val <= low) {
- return low;
- } else if (val >= hi) {
- return hi;
- } else {
- return val;
- }
+ if (val <= low) {
+ return low;
+ } else if (val >= hi) {
+ return hi;
+ } else {
+ return val;
+ }
}
//----------------------------------------------------------------------------
inline double clamp(double val, double low, double hi) {
debugAssert(low <= hi);
- if (val <= low) {
- return low;
- } else if (val >= hi) {
- return hi;
- } else {
- return val;
- }
+ if (val <= low) {
+ return low;
+ } else if (val >= hi) {
+ return hi;
+ } else {
+ return val;
+ }
}
inline float clamp(float val, float low, float hi) {
debugAssert(low <= hi);
- if (val <= low) {
- return low;
- } else if (val >= hi) {
- return hi;
- } else {
- return val;
- }
+ if (val <= low) {
+ return low;
+ } else if (val >= hi) {
+ return hi;
+ } else {
+ return val;
+ }
}
//----------------------------------------------------------------------------
inline int iWrap(int val, int hi) {
- if (val < 0) {
- return ((val % hi) + hi) % hi;
- } else {
- return val % hi;
- }
+ if (val < 0) {
+ return ((val % hi) + hi) % hi;
+ } else {
+ return val % hi;
+ }
}
//----------------------------------------------------------------------------
@@ -142,11 +142,11 @@ inline double aTan2 (double fY, double fX) {
inline double sign (double fValue) {
if (fValue > 0.0) {
return 1.0;
- }
+ }
if (fValue < 0.0) {
return -1.0;
- }
+ }
return 0.0;
}
diff --git a/dep/src/g3dlite/Box.cpp b/dep/src/g3dlite/Box.cpp
index c30211fd5b9..fd3067048c0 100644
--- a/dep/src/g3dlite/Box.cpp
+++ b/dep/src/g3dlite/Box.cpp
@@ -131,21 +131,21 @@ void Box::getFaceCorners(int f, Vector3& v0, Vector3& v1, Vector3& v2, Vector3&
bool Box::culledBy(
- const Array<Plane>& plane,
- int& cullingPlaneIndex,
- const uint32 inMask,
- uint32& outMask) const {
+ const Array<Plane>& plane,
+ int& cullingPlaneIndex,
+ const uint32 inMask,
+ uint32& outMask) const {
- return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask, outMask);
+ return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask, outMask);
}
bool Box::culledBy(
- const Array<Plane>& plane,
- int& cullingPlaneIndex,
- const uint32 inMask) const {
+ const Array<Plane>& plane,
+ int& cullingPlaneIndex,
+ const uint32 inMask) const {
- return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask);
+ return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask);
}
@@ -154,23 +154,23 @@ int32 Box::dummy = 0;
bool Box::culledBy(
const class Plane* plane,
int numPlanes,
- int& cullingPlane,
- const uint32 _inMask,
+ int& cullingPlane,
+ const uint32 _inMask,
uint32& childMask) const {
- uint32 inMask = _inMask;
- assert(numPlanes < 31);
+ uint32 inMask = _inMask;
+ assert(numPlanes < 31);
childMask = 0;
// See if there is one plane for which all of the
- // vertices are in the negative half space.
+ // vertices are in the negative half space.
for (int p = 0; p < numPlanes; p++) {
- // Only test planes that are not masked
- if ((inMask & 1) != 0) {
-
- Vector3 corner;
+ // Only test planes that are not masked
+ if ((inMask & 1) != 0) {
+
+ Vector3 corner;
int numContained = 0;
int v = 0;
@@ -178,36 +178,36 @@ bool Box::culledBy(
// We can early-out only if we have found one point on each
// side of the plane (i.e. if we are straddling). That
// occurs when (numContained < v) && (numContained > 0)
- for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
+ for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
if (plane[p].halfSpaceContains(getCorner(v))) {
++numContained;
}
- }
+ }
- if (numContained == 0) {
- // Plane p culled the box
- cullingPlane = p;
+ if (numContained == 0) {
+ // Plane p culled the box
+ cullingPlane = p;
// The caller should not recurse into the children,
// since the parent is culled. If they do recurse,
// make them only test against this one plane, which
// will immediately cull the volume.
childMask = 1 << p;
- return true;
+ return true;
} else if (numContained < v) {
// The bounding volume straddled the plane; we have
// to keep testing against this plane
childMask |= (1 << p);
}
- }
+ }
// Move on to the next bit.
- inMask = inMask >> 1;
+ inMask = inMask >> 1;
}
// None of the planes could cull this box
- cullingPlane = -1;
+ cullingPlane = -1;
return false;
}
@@ -215,44 +215,44 @@ bool Box::culledBy(
bool Box::culledBy(
const class Plane* plane,
int numPlanes,
- int& cullingPlane,
- const uint32 _inMask) const {
+ int& cullingPlane,
+ const uint32 _inMask) const {
- uint32 inMask = _inMask;
- assert(numPlanes < 31);
+ uint32 inMask = _inMask;
+ assert(numPlanes < 31);
// See if there is one plane for which all of the
- // vertices are in the negative half space.
+ // vertices are in the negative half space.
for (int p = 0; p < numPlanes; p++) {
- // Only test planes that are not masked
- if ((inMask & 1) != 0) {
-
- bool culled = true;
+ // Only test planes that are not masked
+ if ((inMask & 1) != 0) {
+
+ bool culled = true;
int v;
- // Assume this plane culls all points. See if there is a point
- // not culled by the plane... early out when at least one point
+ // Assume this plane culls all points. See if there is a point
+ // not culled by the plane... early out when at least one point
// is in the positive half space.
- for (v = 0; (v < 8) && culled; ++v) {
+ for (v = 0; (v < 8) && culled; ++v) {
culled = ! plane[p].halfSpaceContains(getCorner(v));
- }
+ }
- if (culled) {
- // Plane p culled the box
- cullingPlane = p;
+ if (culled) {
+ // Plane p culled the box
+ cullingPlane = p;
- return true;
+ return true;
}
- }
+ }
// Move on to the next bit.
- inMask = inMask >> 1;
+ inMask = inMask >> 1;
}
// None of the planes could cull this box
- cullingPlane = -1;
+ cullingPlane = -1;
return false;
}
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 1e8066a5581..ba87254df99 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -2085,7 +2085,7 @@ TRINITY_DLL_EXPORT
bool GOSelect( Player *player, GameObject *_GO, uint32 sender, uint32 action )
{
if(!_GO)
- return false;
+ return false;
debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
@@ -2099,7 +2099,7 @@ TRINITY_DLL_EXPORT
bool GOSelectWithCode( Player *player, GameObject *_GO, uint32 sender, uint32 action, const char* sCode )
{
if(!_GO)
- return false;
+ return false;
debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp
index 9aacd2487e9..cc64074b6bc 100644
--- a/src/bindings/scripts/scripts/go/go_scripts.cpp
+++ b/src/bindings/scripts/scripts/go/go_scripts.cpp
@@ -165,7 +165,7 @@ bool GOHello_go_teleporter(Player *player, GameObject* _GO)
bool GOHello_go_jump_a_tron(Player *player, GameObject* _GO)
{
if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
- player->CastSpell(player,33382,true);
+ player->CastSpell(player,33382,true);
return true;
}
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
index 01c0e1334ac..b60f8eee565 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
@@ -13,7 +13,7 @@
#define TYPE_THRALL_PART4 6
#define DATA_THRALL 7
#define DATA_TARETHA 8
-#define DATA_EPOCH 9
+#define DATA_EPOCH 9
#define WORLD_STATE_OH 2436
#endif
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
index 9ec75c06e0c..f18e29edf6d 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -28,7 +28,7 @@ EndScriptData */
#define THRALL_ENTRY 17876
#define TARETHA_ENTRY 18887
-#define EPOCH_ENTRY 18096
+#define EPOCH_ENTRY 18096
#define DRAKE_ENTRY 17848
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
mThrallEventCount = 0;
ThrallGUID = 0;
TarethaGUID = 0;
- EpochGUID = 0;
+ EpochGUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
Encounter[i] = NOT_STARTED;
@@ -106,9 +106,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
case TARETHA_ENTRY:
TarethaGUID = creature->GetGUID();
break;
- case EPOCH_ENTRY:
- EpochGUID = creature->GetGUID();
- break;
+ case EPOCH_ENTRY:
+ EpochGUID = creature->GetGUID();
+ break;
}
}
@@ -222,8 +222,8 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
return ThrallGUID;
case DATA_TARETHA:
return TarethaGUID;
- case DATA_EPOCH:
- return EpochGUID;
+ case DATA_EPOCH:
+ return EpochGUID;
}
return 0;
}
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 2538bd3434e..c0ec88b78fb 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -524,10 +524,10 @@ void BattleGround::EndBattleGround(uint32 winner)
if(!isArena()){
- if(m_score[GetTeamIndexByTeamId(ALLIANCE)] == m_score[GetTeamIndexByTeamId(HORDE)])
- almost_winning_team = 0; //no real winner
- if(m_score[GetTeamIndexByTeamId(ALLIANCE)] > m_score[GetTeamIndexByTeamId(HORDE)])
- almost_winning_team = ALLIANCE;
+ if(m_score[GetTeamIndexByTeamId(ALLIANCE)] == m_score[GetTeamIndexByTeamId(HORDE)])
+ almost_winning_team = 0; //no real winner
+ if(m_score[GetTeamIndexByTeamId(ALLIANCE)] > m_score[GetTeamIndexByTeamId(HORDE)])
+ almost_winning_team = ALLIANCE;
}
@@ -572,19 +572,19 @@ void BattleGround::EndBattleGround(uint32 winner)
}
else if(winner !=0)
{
- RewardMark(plr,ITEM_LOSER_COUNT);
+ RewardMark(plr,ITEM_LOSER_COUNT);
}
- else if(winner == 0)
- {
- if(sWorld.getConfig(CONFIG_PREMATURE_BG_REWARD)) // We're feeling generous, giving rewards to people who not earned them ;)
- { //nested ifs for the win! its boring writing that, forgive me my unfunniness
-
- if(almost_winning_team == team) //player's team had more points
- RewardMark(plr,ITEM_WINNER_COUNT);
- else
- RewardMark(plr,ITEM_LOSER_COUNT); // if scores were the same, each team gets 1 mark.
- }
- }
+ else if(winner == 0)
+ {
+ if(sWorld.getConfig(CONFIG_PREMATURE_BG_REWARD)) // We're feeling generous, giving rewards to people who not earned them ;)
+ { //nested ifs for the win! its boring writing that, forgive me my unfunniness
+
+ if(almost_winning_team == team) //player's team had more points
+ RewardMark(plr,ITEM_WINNER_COUNT);
+ else
+ RewardMark(plr,ITEM_LOSER_COUNT); // if scores were the same, each team gets 1 mark.
+ }
+ }
plr->CombatStopWithPets(true);
@@ -610,7 +610,7 @@ void BattleGround::EndBattleGround(uint32 winner)
// this way all arena team members will get notified, not only the ones who participated in this match
winner_arena_team->NotifyStatsChanged();
loser_arena_team->NotifyStatsChanged();
- sLog.outDebug("Rated arena match between %s and %s finished, winner: %s", loser_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str());
+ sLog.outDebug("Rated arena match between %s and %s finished, winner: %s", loser_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str());
}
// inform invited players about the removal
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index c9592cebe63..e03e36cbd1e 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -489,7 +489,7 @@ class BattleGround
uint8 m_Events;
bool m_BuffChange;
- uint32 m_score[2]; //array that keeps general team scores, used to determine who gets most marks when bg ends prematurely
+ uint32 m_score[2]; //array that keeps general team scores, used to determine who gets most marks when bg ends prematurely
BGHonorMode m_HonorMode;
private:
@@ -514,7 +514,7 @@ class BattleGround
bool m_PrematureCountDown;
uint32 m_PrematureCountDownTimer;
char const *m_Name;
-
+
/* Player lists */
std::vector<uint64> m_ResurrectQueue; // Player GUID
diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp
index 1cd5cfad420..bbaef37152f 100644
--- a/src/game/BattleGroundAB.cpp
+++ b/src/game/BattleGroundAB.cpp
@@ -195,7 +195,7 @@ void BattleGroundAB::Update(time_t diff)
{
m_lastTick[team] -= BG_AB_TickIntervals[points];
m_TeamScores[team] += BG_AB_TickPoints[points];
- m_score[team] = m_TeamScores[team];
+ m_score[team] = m_TeamScores[team];
m_HonorScoreTics[team] += BG_AB_TickPoints[points];
m_ReputationScoreTics[team] += BG_AB_TickPoints[points];
if( m_ReputationScoreTics[team] >= BG_AB_ReputationScoreTicks[m_HonorMode] )
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 06e3b285d5a..15206f10c29 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -871,9 +871,6 @@ int ChatHandler::ParseCommands(const char* text)
std::string fullcmd = text;
- //if(m_session->GetSecurity() == 0)
- // return 0;
-
/// chat case (.command or !command format)
if(m_session)
{
@@ -895,11 +892,11 @@ int ChatHandler::ParseCommands(const char* text)
++text;
if(!ExecuteCommandInTable(getCommandTable(), text, fullcmd))
- {
- if(m_session && m_session->GetSecurity() == SEC_PLAYER)
- return 0;
- SendSysMessage(LANG_NO_CMD);
- }
+ {
+ if(m_session && m_session->GetSecurity() == SEC_PLAYER)
+ return 0;
+ SendSysMessage(LANG_NO_CMD);
+ }
return 1;
}
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index f86df8485df..e7572bf5e78 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -205,7 +205,7 @@ void Creature::SearchFormation()
uint32 lowguid = GetDBTableGUIDLow();
if(!lowguid)
- return;
+ return;
CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid);
if(frmdata != CreatureGroupMap.end())
diff --git a/src/game/Map.h b/src/game/Map.h
index f72b0c15ec3..f117a1c1cec 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -277,7 +277,7 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
template<class NOTIFIER> void VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier);
- CreatureGroupHolderType CreatureGroupHolder;
+ CreatureGroupHolderType CreatureGroupHolder;
private:
void LoadVMap(int pX, int pY);
void LoadMap(uint32 mapid, uint32 instanceid, int x,int y);
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 31697f31df0..752d34b2284 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -4922,9 +4922,9 @@ void ObjectMgr::LoadAccessRequirements()
uint32 count = 0;
- // 0 1 2 3 4 5 6 7 8 9 10
+ // 0 1 2 3 4 5 6 7 8 9 10
QueryResult *result = WorldDatabase.Query("SELECT id, level_min, level_max, item, item2, heroic_key, heroic_key2, quest_done, quest_failed_text, heroic_quest_done, heroic_quest_failed_text FROM access_requirement");
- if( !result )
+ if( !result )
{
barGoLink bar( 1 );
@@ -5001,14 +5001,14 @@ void ObjectMgr::LoadAccessRequirements()
}
}
- if(ar.heroicQuest)
- {
- if(!mQuestTemplates[ar.heroicQuest])
- {
- sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
- ar.heroicQuest = 0;
- }
- }
+ if(ar.heroicQuest)
+ {
+ if(!mQuestTemplates[ar.heroicQuest])
+ {
+ sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
+ ar.heroicQuest = 0;
+ }
+ }
if(ar.quest)
{
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index d927b162d31..7837a0186eb 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17817,7 +17817,7 @@ template<class T>
void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObject*>& visibleNow)
{
if(!target)
- return;
+ return;
if(HaveAtClient(target))
{
if(!target->isVisibleForInState(this,true))
diff --git a/src/game/Player.h b/src/game/Player.h
index 9ba6c94ae24..7d530a57228 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -840,7 +840,7 @@ struct AccessRequirement
uint32 heroicKey2;
uint32 quest;
std::string questFailedText;
- uint32 heroicQuest;
+ uint32 heroicQuest;
std::string heroicQuestFailedText;
};
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 2ee6c7032b3..0022144e5b1 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4171,7 +4171,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
{
if(itr->second->GetSpellProto()->Dispel == DISPEL_POISON)
{
- totalDamagePercentMod *= 1.5f; // 150% if poisoned
+ totalDamagePercentMod *= 1.5f; // 150% if poisoned
break;
}
}
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 30112caa75a..95ddab074b1 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2209,7 +2209,7 @@ void SpellMgr::LoadSpellCustomAttr()
case 45027: // Revitalize
case 45976: // Muru Portal Channel
case 39365: // Thundering Storm
- case 41071: // Raise Dead
+ case 41071: // Raise Dead
spellInfo->MaxAffectedTargets = 1;
break;
case 41376: // Spite