Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10319 from joschiwald/casts

Browse Source 
Core/Misc: replace (Player*) casts with ToPlayer()
This commit is contained in:
Nay
2013-07-22 16:26:41 -07:00
parent 3a4e3a5fa9 380cf5d241
commit cd2c33c4eb
15 changed files with 189 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Commands/cs_debug.cpp
View File

@@ -258,7 +258,7 @@ public:
if (!unit || (unit->GetTypeId() != TYPEID_PLAYER))
player = handler->GetSession()->GetPlayer();
else
player = (Player*)unit;
player = unit->ToPlayer();
if (!unit)
unit = player;

5
src/server/scripts/Commands/cs_honor.cpp
View File

@@ -90,8 +90,9 @@ public:
}
// check online security
if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity((Player*)target, 0))
return false;
if (Player* player = target->ToPlayer())
if (handler->HasLowerSecurity(player, 0))
return false;
handler->GetSession()->GetPlayer()->RewardHonor(target, 1);
return true;

12
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -655,11 +655,9 @@ public:
return false;
}
if (target->GetTypeId() == TYPEID_PLAYER)
{
if (handler->HasLowerSecurity((Player*)target, 0, false))
if (Player* player = target->ToPlayer())
if (handler->HasLowerSecurity(player, 0, false))
return false;
}
if (target->IsAlive())
{
@@ -2227,11 +2225,9 @@ public:
return false;
}
if (target->GetTypeId() == TYPEID_PLAYER)
{
if (handler->HasLowerSecurity((Player*)target, 0, false))
if (Player* player = target->ToPlayer())
if (handler->HasLowerSecurity(player, 0, false))
return false;
}
if (!target->IsAlive())
return true;