nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-13 07:23:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core: step 1 - starting to fix core warnings

Browse Source 
expecially from headers and some cpp files

Scripts and tools in next steps
This commit is contained in:
Yehonal
2017-09-16 13:47:19 +02:00
parent 584af79efa
commit 3dde305068
22 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scripts/Commands/cs_spectator.cpp
View File

@@ -180,8 +180,8 @@ bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, char c
}
bool bgPreparation = false;
if (!handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS ||
handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_WAIT_JOIN && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS)
if ((!handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS) ||
(handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_WAIT_JOIN && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS))
{
bgPreparation = true;
handler->SendSysMessage("Arena is not in progress yet. You will be invited as soon as it starts.");
@@ -193,7 +193,7 @@ bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, char c
{
handler->PSendSysMessage("To spectate, please fix the following:");
for (std::list<std::string>::const_iterator itr = errors.begin(); itr != errors.end(); ++itr)
handler->PSendSysMessage(("- "+(*itr)).c_str());
handler->PSendSysMessage("- %s",(*itr).c_str());
return true;
}

3
src/scripts/Spells/spell_generic.cpp
View File

@@ -2200,7 +2200,7 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader
// Spell::SendSpellCooldown() skips all spells with TRIGGERED_IGNORE_SPELL_AND_CATEGORY_CD
player->AddSpellAndCategoryCooldowns(GetSpellInfo(), GetCastItem() ? GetCastItem()->GetEntry() : 0, GetSpell());
if (player->GetTeamId(true) == TEAM_HORDE)
if (player->GetTeamId(true) == TEAM_HORDE) {
if (GetSpellInfo()->Id == SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER)
{
WorldPacket data;
@@ -2225,6 +2225,7 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader
player->GetSession()->SendPacket(&data2);
}
}
}
void Register()

2
src/scripts/Spells/spell_item.cpp
View File

@@ -1053,6 +1053,8 @@ class spell_item_oracle_ablutions : public SpellScriptLoader
case POWER_ENERGY:
caster->CastSpell(caster, SPELL_ABLUTION_ENERGY, true);
break;
default:
break;
}
if (Player* player = caster->ToPlayer())
{

2
src/scripts/Spells/spell_quest.cpp
View File

@@ -1197,6 +1197,8 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader
if (creatureTarget->GetEntry() == NPC_SICKLY_DEER)
newEntry = NPC_CURED_DEER;
break;
default:
break;
}
if (newEntry)
{

2
src/scripts/Spells/spell_shaman.cpp
View File

@@ -662,7 +662,7 @@ class spell_sha_earth_shield : public SpellScriptLoader
AddPct(amount, glyphe->GetAmount());
// xinef: Improved Shields
if (baseAmount = amount - baseAmount)
if ((baseAmount = amount - baseAmount))
if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_AURA_ADD_PCT_MODIFIER, SPELLFAMILY_SHAMAN, 19, EFFECT_1))
{
ApplyPct(baseAmount, aurEff->GetAmount());