*Add condition for ghostlands.cpp

*Remove unused creature_movement - by EIFEL

--HG--
branch : trunk
This commit is contained in:
Blaymoira
2008-12-26 17:49:45 +01:00
parent 9cd608739d
commit db1a5d4ba0
2 changed files with 2 additions and 1 deletions
@@ -162,6 +162,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
{ {
m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
GameObject* Cage = FindGameObject(GO_CAGE); GameObject* Cage = FindGameObject(GO_CAGE);
if(Cage)
Cage->SetGoState(0); Cage->SetGoState(0);
DoSay(SAY_START, LANG_UNIVERSAL, player); DoSay(SAY_START, LANG_UNIVERSAL, player);
break; break;
@@ -198,6 +199,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
m_creature->SetOrientation(5.858011); m_creature->SetOrientation(5.858011);
DoSay(SAY_END2, LANG_UNIVERSAL, player); DoSay(SAY_END2, LANG_UNIVERSAL, player);
Unit* CaptainHelios = FindCreature(NPC_CAPTAIN_HELIOS, 50); Unit* CaptainHelios = FindCreature(NPC_CAPTAIN_HELIOS, 50);
if(CaptainHelios)
((Creature*)CaptainHelios)->Say(CAPTAIN_ANSWER, LANG_UNIVERSAL, PlayerGUID); ((Creature*)CaptainHelios)->Say(CAPTAIN_ANSWER, LANG_UNIVERSAL, PlayerGUID);
break; break;
} }
-1
View File
@@ -1519,7 +1519,6 @@ void Creature::DeleteFromDB()
WorldDatabase.BeginTransaction(); WorldDatabase.BeginTransaction();
WorldDatabase.PExecuteLog("DELETE FROM creature WHERE guid = '%u'", m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM creature WHERE guid = '%u'", m_DBTableGuid);
WorldDatabase.PExecuteLog("DELETE FROM creature_addon WHERE guid = '%u'", m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM creature_addon WHERE guid = '%u'", m_DBTableGuid);
WorldDatabase.PExecuteLog("DELETE FROM creature_movement WHERE id = '%u'", m_DBTableGuid);
WorldDatabase.PExecuteLog("DELETE FROM game_event_creature WHERE guid = '%u'", m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM game_event_creature WHERE guid = '%u'", m_DBTableGuid);
WorldDatabase.PExecuteLog("DELETE FROM game_event_model_equip WHERE guid = '%u'", m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM game_event_model_equip WHERE guid = '%u'", m_DBTableGuid);
WorldDatabase.CommitTransaction(); WorldDatabase.CommitTransaction();