Merge pull request #37 from ManGuyNY/master

Fix build

README.md

@@ -40,3 +40,4 @@ Special thanks to all contributors of the following projects which are make this
 * Wrath of the Vanilla Module for more Vanilla world adjustments
 * Vmangos for Vanilla game and patch progression data
 * SoglaHash for many Naxx 40 scripts and data
+* 55Honey for Acore_ZoneDebuff module, used as basis for damage and HP scaling

src/IndividualProgressionPlayer.cpp

@@ -7,7 +7,7 @@ public:
 
     void OnLogin(Player* player) override
     {
-        if (sIndividualProgression->deathKnightStartingProgression && !sIndividualProgression->hasPassedProgression(player, static_cast<ProgressionState>(sIndividualProgression->deathKnightStartingProgression)))
+        if (player->getClass() == CLASS_DEATH_KNIGHT && sIndividualProgression->deathKnightStartingProgression && !sIndividualProgression->hasPassedProgression(player, static_cast<ProgressionState>(sIndividualProgression->deathKnightStartingProgression)))
         {
             sIndividualProgression->UpdateProgressionState(player, static_cast<ProgressionState>(sIndividualProgression->deathKnightStartingProgression));
         }

src/wotlkScripts/IppWotlkModdedScripts.cpp

@@ -114,7 +114,7 @@ public:
 
         void UpdateAI(uint32 diff) override
         {
-            if (!sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE))
+            if (sWorld->getIntConfig(CONFIG_WINTERGRASP_ENABLE) == 2)
                 return;
 
             ScriptedAI::UpdateAI(diff);