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

[7717] Use more safe code in EventAI.

Browse source
This commit is contained in:
VladimirMangos 2009-04-26 18:53:53 +04:00
parent c9d51a6dc7
commit 9dd305b457
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/CreatureEventAI.cpp
View file

@ -39,10 +39,10 @@ int CreatureEventAI::Permissible(const Creature *creature)
CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c) CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c)
{ {
CreatureEventAI_Event_Map::iterator CreatureEvents = CreatureEAI_Mgr.GetCreatureEventAIMap().find(m_creature->GetEntry()); CreatureEventAI_Event_Map::const_iterator CreatureEvents = CreatureEAI_Mgr.GetCreatureEventAIMap().find(m_creature->GetEntry());
if (CreatureEvents != CreatureEAI_Mgr.GetCreatureEventAIMap().end()) if (CreatureEvents != CreatureEAI_Mgr.GetCreatureEventAIMap().end())
{ {
std::vector<CreatureEventAI_Event>::iterator i; std::vector<CreatureEventAI_Event>::const_iterator i;
for (i = (*CreatureEvents).second.begin(); i != (*CreatureEvents).second.end(); ++i) for (i = (*CreatureEvents).second.begin(); i != (*CreatureEvents).second.end(); ++i)
{ {
@ -678,9 +678,9 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
Creature* pCreature = NULL; Creature* pCreature = NULL;
if (param3) if (param3)
pCreature = m_creature->SummonCreature(param1, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, param3); pCreature = m_creature->SummonCreature(param1, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, param3);
else else
pCreature = m_creature->SummonCreature(param1, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); pCreature = m_creature->SummonCreature(param1, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
if (!pCreature) if (!pCreature)
{ {

6
src/game/CreatureEventAIMgr.h
View file

@ -32,9 +32,9 @@ class CreatureEventAIMgr
void LoadCreatureEventAI_Summons(); void LoadCreatureEventAI_Summons();
void LoadCreatureEventAI_Scripts(); void LoadCreatureEventAI_Scripts();
CreatureEventAI_Event_Map& GetCreatureEventAIMap() { return m_CreatureEventAI_Event_Map; } CreatureEventAI_Event_Map const& GetCreatureEventAIMap() const { return m_CreatureEventAI_Event_Map; }
CreatureEventAI_Summon_Map& GetCreatureEventAISummonMap() { return m_CreatureEventAI_Summon_Map; } CreatureEventAI_Summon_Map const& GetCreatureEventAISummonMap() const { return m_CreatureEventAI_Summon_Map; }
CreatureEventAI_TextMap& GetCreatureEventAITextMap() { return m_CreatureEventAI_TextMap; } CreatureEventAI_TextMap const& GetCreatureEventAITextMap() const { return m_CreatureEventAI_TextMap; }
private: private:
CreatureEventAI_Event_Map m_CreatureEventAI_Event_Map; CreatureEventAI_Event_Map m_CreatureEventAI_Event_Map;

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 "7716" #define REVISION_NR "7717"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__