Removed unused access_id from instance_template table (obsolete since access_requirement rewrite)
Fixed build issues with my previous commit --HG-- branch : trunk
This commit is contained in:
@@ -2715,7 +2715,6 @@ DROP TABLE IF EXISTS `instance_template`;
|
||||
CREATE TABLE `instance_template` (
|
||||
`map` smallint(5) unsigned NOT NULL,
|
||||
`parent` int(10) unsigned NOT NULL,
|
||||
`access_id` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`startLocX` float DEFAULT NULL,
|
||||
`startLocY` float DEFAULT NULL,
|
||||
`startLocZ` float DEFAULT NULL,
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `instance_template` DROP `access_id`;
|
||||
@@ -53,14 +53,13 @@ void MapManager::LoadTransports()
|
||||
{
|
||||
bar.step();
|
||||
|
||||
Transport *t = new Transport;
|
||||
|
||||
Field *fields = result->Fetch();
|
||||
|
||||
uint32 entry = fields[0].GetUInt32();
|
||||
std::string name = fields[1].GetCppString();
|
||||
t->m_period = fields[2].GetUInt32();
|
||||
t->ScriptId = objmgr.GetScriptId(fields[3].GetString());
|
||||
uint32 period = fields[2].GetUInt32();
|
||||
uint32 scriptId = objmgr.GetScriptId(fields[3].GetString());
|
||||
|
||||
Transport *t = new Transport(period, scriptId);
|
||||
|
||||
const GameObjectInfo *goinfo = objmgr.GetGameObjectInfo(entry);
|
||||
|
||||
@@ -180,10 +179,9 @@ void MapManager::LoadTransportNPCs()
|
||||
sLog.outString(">> Loaded %u transport npcs", count);
|
||||
}
|
||||
|
||||
Transport::Transport() : GameObject()
|
||||
Transport::Transport(uint32 period, uint32 script) : m_period(period), ScriptId(script), GameObject()
|
||||
{
|
||||
m_updateFlag = (UPDATEFLAG_TRANSPORT | UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_ROTATION);
|
||||
ScriptId = 0;
|
||||
}
|
||||
|
||||
bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags)
|
||||
|
||||
@@ -42,7 +42,7 @@ struct TransportCreatureProto
|
||||
class Transport : public GameObject
|
||||
{
|
||||
public:
|
||||
explicit Transport();
|
||||
Transport(uint32 period, uint32 script);
|
||||
|
||||
bool Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags);
|
||||
bool GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids);
|
||||
@@ -90,11 +90,11 @@ class Transport : public GameObject
|
||||
PlayerSet m_passengers;
|
||||
|
||||
uint32 currenttguid;
|
||||
uint32 m_period;
|
||||
uint32 ScriptId;
|
||||
public:
|
||||
WayPointMap m_WayPoints;
|
||||
uint32 m_nextNodeTime;
|
||||
uint32 m_period;
|
||||
|
||||
private:
|
||||
void TeleportTransport(uint32 newMapid, float x, float y, float z);
|
||||
|
||||
@@ -5113,7 +5113,7 @@ void ObjectMgr::LoadInstanceTemplate()
|
||||
|
||||
for (uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++)
|
||||
{
|
||||
InstanceTemplate* temp = (InstanceTemplate*)GetInstanceTemplate(i);
|
||||
InstanceTemplate* temp = const_cast<InstanceTemplate*>(GetInstanceTemplate(i));
|
||||
if (!temp)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -212,7 +212,6 @@ struct InstanceTemplate
|
||||
{
|
||||
uint32 map;
|
||||
uint32 parent;
|
||||
uint32 access_id;
|
||||
float startLocX;
|
||||
float startLocY;
|
||||
float startLocZ;
|
||||
|
||||
Reference in New Issue
Block a user