diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp | 2 | ||||
| -rw-r--r-- | src/game/Level2.cpp | 4 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp index d546c5b2d6f..12b28446175 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp @@ -573,7 +573,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI DoCast(m_creature,SPELL_BODY_REGEN,true); m_creature->CastSpell(Head, SPELL_FLYING_HEAD,true); DoCast(m_creature,SPELL_CONFUSE,false); //test - done_by->ProcDamageAndSpell(m_creature,PROC_FLAG_KILL_AND_GET_XP,PROC_FLAG_KILLED,PROC_EX_NONE,0); + done_by->ProcDamageAndSpell(m_creature,PROC_FLAG_KILL,PROC_FLAG_KILLED,PROC_EX_NONE,0); whirlwind = 4000 + (rand()%5)*1000; regen = 0; } diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 063e473504e..319ae608f7c 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1996,7 +1996,7 @@ bool ChatHandler::HandleTicketCommand(const char* args) bool accept = m_session->GetPlayer()->isAcceptTickets(); - PSendSysMessage(LANG_COMMAND_TICKETCOUNT, count, accept ? GetMangosString(LANG_ON) : GetMangosString(LANG_OFF)); + PSendSysMessage(LANG_COMMAND_TICKETCOUNT, count, accept ? GetTrinityString(LANG_ON) : GetTrinityString(LANG_OFF)); return true; } @@ -3523,7 +3523,7 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) if (Utf8FitTo(descr, wnamepart)) { - char const* active = activeEvents.find(id) != activeEvents.end() ? GetMangosString(LANG_ACTIVE) : ""; + char const* active = activeEvents.find(id) != activeEvents.end() ? GetTrinityString(LANG_ACTIVE) : ""; if(m_session) PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,id,id,eventData.description.c_str(),active ); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index faf99eb7ab9..5721a708e3c 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -11003,7 +11003,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss) if(player && player!=pVictim) { if(player->RewardPlayerAndGroupAtKill(pVictim)) - player->ProcDamageAndSpell(pVictim, PROC_FLAG_KILL_AND_GET_XP, PROC_FLAG_KILLED, PROC_EX_NONE, 0); + player->ProcDamageAndSpell(pVictim, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0); else player->ProcDamageAndSpell(pVictim, PROC_FLAG_NONE, PROC_FLAG_KILLED,PROC_EX_NONE, 0); } |