Remove obsolete table transport_event_scripts.
--HG-- branch : trunk
This commit is contained in:
@@ -480,13 +480,6 @@ bool Transport::RemovePassenger(Player* passenger)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Transport::CheckForEvent(uint32 entry, uint32 wp_id)
|
|
||||||
{
|
|
||||||
uint32 key = entry*100+wp_id;
|
|
||||||
if (objmgr.TransportEventMap.find(key) != objmgr.TransportEventMap.end())
|
|
||||||
GetMap()->ScriptsStart(sEventScripts, objmgr.TransportEventMap[key], this, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Transport::Update(uint32 /*p_time*/)
|
void Transport::Update(uint32 /*p_time*/)
|
||||||
{
|
{
|
||||||
if (m_WayPoints.size() <= 1)
|
if (m_WayPoints.size() <= 1)
|
||||||
@@ -548,9 +541,6 @@ void Transport::Update(uint32 /*p_time*/)
|
|||||||
|
|
||||||
if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES) == 0)
|
if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES) == 0)
|
||||||
sLog.outDetail("%s moved to %d %f %f %f %d", this->m_name.c_str(), m_curr->second.id, m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid);
|
sLog.outDetail("%s moved to %d %f %f %f %d", this->m_name.c_str(), m_curr->second.id, m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid);
|
||||||
|
|
||||||
//Transport Event System
|
|
||||||
CheckForEvent(this->GetEntry(), m_curr->second.id);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ class Transport : public GameObject
|
|||||||
void Update(uint32 p_time);
|
void Update(uint32 p_time);
|
||||||
bool AddPassenger(Player* passenger);
|
bool AddPassenger(Player* passenger);
|
||||||
bool RemovePassenger(Player* passenger);
|
bool RemovePassenger(Player* passenger);
|
||||||
void CheckForEvent(uint32 entry, uint32 wp_id);
|
|
||||||
|
|
||||||
typedef std::set<Player*> PlayerSet;
|
typedef std::set<Player*> PlayerSet;
|
||||||
PlayerSet const& GetPassengers() const { return m_passengers; }
|
PlayerSet const& GetPassengers() const { return m_passengers; }
|
||||||
|
|||||||
@@ -8598,40 +8598,6 @@ CreatureInfo const *GetCreatureInfo(uint32 id)
|
|||||||
return objmgr.GetCreatureTemplate(id);
|
return objmgr.GetCreatureTemplate(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObjectMgr::LoadTransportEvents()
|
|
||||||
{
|
|
||||||
|
|
||||||
QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events");
|
|
||||||
|
|
||||||
if (!result)
|
|
||||||
{
|
|
||||||
barGoLink bar1(1);
|
|
||||||
bar1.step();
|
|
||||||
sLog.outString("\n>> Transport events table is empty \n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
barGoLink bar1(result->GetRowCount());
|
|
||||||
|
|
||||||
do
|
|
||||||
{
|
|
||||||
bar1.step();
|
|
||||||
|
|
||||||
Field *fields = result->Fetch();
|
|
||||||
|
|
||||||
//Load event values
|
|
||||||
uint32 entry = fields[0].GetUInt32();
|
|
||||||
uint32 waypoint_id = fields[1].GetUInt32();
|
|
||||||
uint32 event_id = fields[2].GetUInt32();
|
|
||||||
|
|
||||||
uint32 event_count = (entry*100)+waypoint_id;
|
|
||||||
TransportEventMap[event_count] = event_id;
|
|
||||||
}
|
|
||||||
while (result->NextRow());
|
|
||||||
|
|
||||||
sLog.outString("\n>> Loaded %u transport events \n", result->GetRowCount());
|
|
||||||
}
|
|
||||||
|
|
||||||
CreatureInfo const* GetCreatureTemplateStore(uint32 entry)
|
CreatureInfo const* GetCreatureTemplateStore(uint32 entry)
|
||||||
{
|
{
|
||||||
return sCreatureStorage.LookupEntry<CreatureInfo>(entry);
|
return sCreatureStorage.LookupEntry<CreatureInfo>(entry);
|
||||||
|
|||||||
@@ -382,8 +382,6 @@ class ObjectMgr
|
|||||||
|
|
||||||
typedef std::vector<std::string> ScriptNameMap;
|
typedef std::vector<std::string> ScriptNameMap;
|
||||||
|
|
||||||
UNORDERED_MAP<uint32, uint32> TransportEventMap;
|
|
||||||
|
|
||||||
Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
|
Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
|
||||||
Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); }
|
Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); }
|
||||||
|
|
||||||
@@ -589,8 +587,6 @@ class ObjectMgr
|
|||||||
void LoadGossipScripts();
|
void LoadGossipScripts();
|
||||||
void LoadWaypointScripts();
|
void LoadWaypointScripts();
|
||||||
|
|
||||||
void LoadTransportEvents();
|
|
||||||
|
|
||||||
bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value);
|
bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value);
|
||||||
bool LoadTrinityStrings() { return LoadTrinityStrings(WorldDatabase,"trinity_string",MIN_TRINITY_STRING_ID,MAX_TRINITY_STRING_ID); }
|
bool LoadTrinityStrings() { return LoadTrinityStrings(WorldDatabase,"trinity_string",MIN_TRINITY_STRING_ID,MAX_TRINITY_STRING_ID); }
|
||||||
void LoadDbScriptStrings();
|
void LoadDbScriptStrings();
|
||||||
|
|||||||
@@ -1695,9 +1695,6 @@ void World::SetInitialWorldSettings()
|
|||||||
sLog.outString("Loading Transports...");
|
sLog.outString("Loading Transports...");
|
||||||
MapManager::Instance().LoadTransports();
|
MapManager::Instance().LoadTransports();
|
||||||
|
|
||||||
sLog.outString("Loading Transports Events...");
|
|
||||||
objmgr.LoadTransportEvents();
|
|
||||||
|
|
||||||
sLog.outString("Deleting expired bans...");
|
sLog.outString("Deleting expired bans...");
|
||||||
LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate <= UNIX_TIMESTAMP() AND unbandate<>bandate");
|
LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate <= UNIX_TIMESTAMP() AND unbandate<>bandate");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user