Skip to content

Commit 4e7cfe2

Browse files
author
NoFantasy
committed
[1780] Restore compile after changes in KilledMonsterCredit function. Requires Mangos 10363
Restore compile after changes in KilledMonsterCredit function. Requires Mangos 10363 git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1780 5f9c896b-1e26-0410-94da-f77f675e2462
1 parent 4b698ec commit 4e7cfe2

9 files changed

Lines changed: 18 additions & 17 deletions

File tree

‎scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct MANGOS_DLL_DECL netherspite_infernalAI : public ScriptedAI
100100

101101
uint32 HellfireTimer;
102102
uint32 CleanupTimer;
103-
uint32 malchezaar;
103+
uint64 malchezaar;
104104
InfernalPoint *point;
105105

106106
void Reset() {}

‎scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ struct MANGOS_DLL_DECL npc_kalecgosAI : public ScriptedAI
9393
if (Player* pPlayer = i->getSource())
9494
{
9595
if (pSpell && pSpell->EffectMiscValue[0])
96-
pPlayer->KilledMonsterCredit(pSpell->EffectMiscValue[0], 0);
96+
pPlayer->KilledMonsterCredit(pSpell->EffectMiscValue[0]);
9797
}
9898
}
9999
}

‎scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void instance_culling_of_stratholme::UpdateQuestCredit()
175175
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
176176
{
177177
if (Player* pPlayer = itr->getSource())
178-
pPlayer->KilledMonsterCredit(NPC_CRATES_BUNNY, 0);
178+
pPlayer->KilledMonsterCredit(NPC_CRATES_BUNNY);
179179
}
180180
}
181181
}

‎scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct MANGOS_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
8282
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
8383
{
8484
if (Player* pPlayer = itr->getSource())
85-
pPlayer->KilledMonsterCredit(NPC_LODGE_QUEST_TRIGGER, 0);
85+
pPlayer->KilledMonsterCredit(NPC_LODGE_QUEST_TRIGGER);
8686
}
8787
}
8888
}

‎scripts/outland/terokkar_forest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ struct MANGOS_DLL_DECL npc_mana_bomb_exp_triggerAI : public ScriptedAI
768768

769769
m_bIsActivated = true;
770770

771-
pPlayer->KilledMonsterCredit(NPC_MANA_BOMB_KILL_TRIGGER, 0);
771+
pPlayer->KilledMonsterCredit(NPC_MANA_BOMB_KILL_TRIGGER);
772772

773773
pManaBomb = pGo;
774774
}

‎scripts/world/areatrigger_scripts.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ bool AreaTrigger_at_aldurthar_gate(Player* pPlayer, AreaTriggerEntry const* pAt)
7878
{
7979
switch(pAt->id)
8080
{
81-
case TRIGGER_SOUTH: pPlayer->KilledMonsterCredit(NPC_SOUTH_GATE, 0); break;
82-
case TRIGGER_CENTRAL: pPlayer->KilledMonsterCredit(NPC_CENTRAL_GATE, 0); break;
83-
case TRIGGER_NORTH: pPlayer->KilledMonsterCredit(NPC_NORTH_GATE, 0); break;
84-
case TRIGGER_NORTHWEST: pPlayer->KilledMonsterCredit(NPC_NORTHWEST_GATE, 0); break;
81+
case TRIGGER_SOUTH: pPlayer->KilledMonsterCredit(NPC_SOUTH_GATE); break;
82+
case TRIGGER_CENTRAL: pPlayer->KilledMonsterCredit(NPC_CENTRAL_GATE); break;
83+
case TRIGGER_NORTH: pPlayer->KilledMonsterCredit(NPC_NORTH_GATE); break;
84+
case TRIGGER_NORTHWEST: pPlayer->KilledMonsterCredit(NPC_NORTHWEST_GATE); break;
8585
}
8686
return true;
8787
}
@@ -151,7 +151,7 @@ enum
151151
bool AreaTrigger_at_ravenholdt(Player* pPlayer, AreaTriggerEntry const* pAt)
152152
{
153153
if (pPlayer->GetQuestStatus(QUEST_MANOR_RAVENHOLDT) == QUEST_STATUS_INCOMPLETE)
154-
pPlayer->KilledMonsterCredit(NPC_RAVENHOLDT, 0);
154+
pPlayer->KilledMonsterCredit(NPC_RAVENHOLDT);
155155

156156
return false;
157157
}
@@ -178,9 +178,9 @@ bool AreaTrigger_at_warsong_farms(Player* pPlayer, AreaTriggerEntry const* pAt)
178178
{
179179
switch(pAt->id)
180180
{
181-
case AT_SLAUGHTERHOUSE: pPlayer->KilledMonsterCredit(NPC_CREDIT_SLAUGHTERHOUSE, 0); break;
182-
case AT_GRAINERY: pPlayer->KilledMonsterCredit(NPC_CREDIT_GRAINERY, 0); break;
183-
case AT_TORP_FARM: pPlayer->KilledMonsterCredit(NPC_CREDIT_TORP_FARM, 0); break;
181+
case AT_SLAUGHTERHOUSE: pPlayer->KilledMonsterCredit(NPC_CREDIT_SLAUGHTERHOUSE); break;
182+
case AT_GRAINERY: pPlayer->KilledMonsterCredit(NPC_CREDIT_GRAINERY); break;
183+
case AT_TORP_FARM: pPlayer->KilledMonsterCredit(NPC_CREDIT_TORP_FARM); break;
184184
}
185185
}
186186
return true;

‎scripts/world/spell_scripts.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,12 +436,12 @@ bool EffectDummyCreature_spell_dummy_npc(Unit* pCaster, uint32 uiSpellId, SpellE
436436
if (pCreatureTarget->GetEntry() == NPC_ELK)
437437
{
438438
pCreatureTarget->CastSpell(pCreatureTarget, SPELL_LIQUID_FIRE_AURA, true);
439-
((Player*)pCaster)->KilledMonsterCredit(NPC_ELK_BUNNY, 0);
439+
((Player*)pCaster)->KilledMonsterCredit(NPC_ELK_BUNNY);
440440
}
441441
else if (pCreatureTarget->GetEntry() == NPC_GRIZZLY)
442442
{
443443
pCreatureTarget->CastSpell(pCreatureTarget, SPELL_LIQUID_FIRE_AURA, true);
444-
((Player*)pCaster)->KilledMonsterCredit(NPC_GRIZZLY_BUNNY, 0);
444+
((Player*)pCaster)->KilledMonsterCredit(NPC_GRIZZLY_BUNNY);
445445
}
446446
}
447447
return true;

‎sql/Updates/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,5 @@ pkgdata_DATA = \
130130
r1763_mangos.sql \
131131
r1767_mangos.sql \
132132
r1771_scriptdev2.sql \
133-
r1777_scriptdev2.sql
133+
r1777_scriptdev2.sql \
134+
r1780_scriptdev2.sql

‎sql/scriptdev2_script_full.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--
44

55
DELETE FROM sd2_db_version;
6-
INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MaNGOS 10338+) ');
6+
INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MaNGOS 10363+) ');
77

88
--
99
-- Below contains data for table `script_texts` mainly used in C++ parts.

0 commit comments

Comments
 (0)