Merge branch 'master' of https://github.com/Darkpeninsula/Darkcore

Darkpeninsula · Sep 14, 2012 · d05bb10 · d05bb10
2 parents f25c0b8 + 234af98
commit d05bb10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_argaloth.cpp
@@ -3,21 +3,23 @@
  * Copyright (C) 2011-2012 Project SkyFire <http://www.projectskyfire.org/>
  * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
  * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
+
 #include"ScriptPCH.h"
 #include"baradin_hold.h"
 
@@ -117,7 +119,7 @@ class spell_meteor_slash : public SpellScriptLoader
         {
             PrepareSpellScript(spell_meteor_slash_SpellScript);
 
-            std::list<Unit*>& targetList;
+            std::list<Unit*> targetList;
 
             void FilterTargets(std::list<Unit*>& unitList)
             {
@@ -128,7 +130,7 @@ class spell_meteor_slash : public SpellScriptLoader
             {
                 if(!targetList.empty())
                 {
-                    int32 damage = int32(GetHitDamage() / targetList.size());
+                    int32 dmg = int32(GetHitDamage() / targetList.size());
                     SetHitDamage(dmg);
                 }
             }

diff --git a/src/server/scripts/Maelstrom/kezan.cpp b/src/server/scripts/Maelstrom/kezan.cpp
@@ -76,7 +76,7 @@ class npc_defiant_troll : public CreatureScript
         {
             if (spell->Id == SPELL_LIGHTNING_VISUAL && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(QUEST_GOOD_HELP_IS_HARD_TO_FIND) == QUEST_STATUS_INCOMPLETE && work == false)
             {
-                caster->ToPlayer()->KilledMonsterCredit(DEFFIANT_KILL_CREDIT, me->GetGUID());
+                caster->ToPlayer()->KilledMonsterCredit(DEFIANT_KILL_CREDIT, me->GetGUID());
                 switch (urand(0, 7))
                 {
                     case 0: