mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 04:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9394] Add expected spell ids to error output.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
marintrica 2010-02-15 21:53:25 +03:00 • committed by VladimirMangos
parent 1697b12406
commit 500b91c049
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/PoolManager.cpp
View file

@ -322,7 +322,7 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj, bool instantly)
if(!instantly) if(!instantly)
{ {
pCreature->SetRespawnTime( pCreature->GetRespawnDelay() ); pCreature->SetRespawnTime( pCreature->GetRespawnDelay() );
if (sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY) || pCreature->isWorldBoss()) if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY) || pCreature->isWorldBoss())
pCreature->SaveRespawnTime(); pCreature->SaveRespawnTime();
} }
map->Add(pCreature); map->Add(pCreature);
@ -365,7 +365,7 @@ void PoolGroup<GameObject>::Spawn1Object(PoolObject* obj, bool instantly)
if(!instantly) if(!instantly)
{ {
pGameobject->SetRespawnTime( pGameobject->GetRespawnDelay() ); pGameobject->SetRespawnTime( pGameobject->GetRespawnDelay() );
if (sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY)) if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY))
pGameobject->SaveRespawnTime(); pGameobject->SaveRespawnTime();
} }
map->Add(pGameobject); map->Add(pGameobject);

4
src/game/Spell.cpp
View file

@ -2525,9 +2525,9 @@ void Spell::cast(bool skipCheck)
if (!m_caster->CheckAndIncreaseCastCounter()) if (!m_caster->CheckAndIncreaseCastCounter())
{ {
if (m_triggeredByAuraSpell) if (m_triggeredByAuraSpell)
sLog.outError("Spell %u triggered by aura spell %u too deep in cast chain for cast. Cast not allowed for prevent overflow stack crash."); sLog.outError("Spell %u triggered by aura spell %u too deep in cast chain for cast. Cast not allowed for prevent overflow stack crash.", m_spellInfo->Id, m_triggeredByAuraSpell->Id);
else else
sLog.outError("Spell %u too deep in cast chain for cast. Cast not allowed for prevent overflow stack crash."); sLog.outError("Spell %u too deep in cast chain for cast. Cast not allowed for prevent overflow stack crash.", m_spellInfo->Id);
SendCastResult(SPELL_FAILED_ERROR); SendCastResult(SPELL_FAILED_ERROR);
finish(false); finish(false);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9393" #define REVISION_NR "9394"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__