pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
KimLS
2017-03-26 17:25:01 -07:00
parent cfdbca6f12 940f3b03e8
commit de777fc90f
324 changed files with 13633 additions and 17652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+6 -6
View File
@@ -2183,7 +2183,7 @@ bool Merc::AICastSpell(int8 iChance, uint32 iSpellTypes) {
}
if(castedSpell) {
char* gmsg = 0;
char* gmsg = nullptr;
if(tar != this) {
//we don't need spam of bots healing themselves
@@ -2606,8 +2606,8 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) {
//Check if item focus effect exists for the client.
if (itembonuses.FocusEffects[type]){
const EQEmu::ItemData* TempItem = 0;
const EQEmu::ItemData* UsedItem = 0;
const EQEmu::ItemData* TempItem = nullptr;
const EQEmu::ItemData* UsedItem = nullptr;
uint16 UsedFocusID = 0;
int16 Total = 0;
int16 focus_max = 0;
@@ -4556,7 +4556,7 @@ void Merc::SetTarget(Mob* mob) {
}
Mob* Merc::GetOwnerOrSelf() {
Mob* Result = 0;
Mob* Result = nullptr;
if(this->GetMercOwner())
Result = GetMercOwner();
@@ -4591,7 +4591,7 @@ bool Merc::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::Skil
}
Client* Merc::GetMercOwner() {
Client* mercOwner = 0;
Client* mercOwner = nullptr;
if(GetOwner())
{
@@ -4605,7 +4605,7 @@ Client* Merc::GetMercOwner() {
}
Mob* Merc::GetOwner() {
Mob* Result = 0;
Mob* Result = nullptr;
Result = entity_list.GetMob(GetOwnerID());