nchebrov/mod-money-for-kills
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-money-for-kills.git synced 2026-01-13 01:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Config is now read on linux + Warning about Null fixed

Browse Source 
Config fixes thanks to @Nefertum and @Talamortis
This commit is contained in:
Barbz
2018-03-09 19:07:15 +01:00
committed by GitHub
parent 55734f6e4e
commit 76437ce973
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mod_moneyforkills.cpp
View File

@@ -125,7 +125,7 @@ public:
victim->ModifyMoney(-VictimLoot); victim->ModifyMoney(-VictimLoot);
// Inform the player of the corpse loot // Inform the player of the corpse loot
Notify(player, victim, NULL, "Loot", NULL, VictimLoot); Notify(player, victim, NULL, "Loot", 0, VictimLoot);
// Pay the player the additional PVP bounty // Pay the player the additional PVP bounty
player->ModifyMoney(BountyAmount); player->ModifyMoney(BountyAmount);
@@ -218,7 +218,7 @@ public:
player->ModifyMoney(bounty); player->ModifyMoney(bounty);
// Inform the player of the bounty amount // Inform the player of the bounty amount
Notify(player, NULL, killed, KillType, bounty, NULL); Notify(player, NULL, killed, KillType, bounty, 0);
} }
else else
{ {
@@ -238,7 +238,7 @@ public:
playerInGroup->ModifyMoney(bounty); playerInGroup->ModifyMoney(bounty);
// Inform the player of the bounty amount // Inform the player of the bounty amount
Notify(playerInGroup, NULL, killed, KillType, bounty, NULL); Notify(playerInGroup, NULL, killed, KillType, bounty, 0);
} }
else else
{ {
@@ -249,7 +249,7 @@ public:
playerInGroup->ModifyMoney(bounty); playerInGroup->ModifyMoney(bounty);
// Inform the player of the bounty amount // Inform the player of the bounty amount
Notify(playerInGroup, NULL, killed, KillType, bounty, NULL); Notify(playerInGroup, NULL, killed, KillType, bounty, 0);
} }
} }
} }
@@ -391,7 +391,30 @@ public:
} }
}; };
class MoneyForKillsWorld : public WorldScript
{
public:
MoneyForKillsWorld() : WorldScript("MoneyForKillsWorld") { }
void OnBeforeConfigLoad(bool reload) override
{
if (!reload) {
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/mod_moneyforkills.conf";
#ifdef WIN32
cfg_file = "mod_moneyforkills.conf";
#endif
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
}
}
};
void AddMoneyForKillsScripts() void AddMoneyForKillsScripts()
{ {
new MoneyForKills(); new MoneyForKills();
} new MoneyForKillsWorld();
}