Core/Players: Don't set instanceId to 0 when player is on transport during loading, there CAN be transports inside instances
Core/Scripts: Added waypoint id to OnRelocate transport hook Core/Scripts: Make use of ZoneScript::GetGameObjectEntry at gameobject creation (makes it possible to override gameobject entries in instances) Core/Transports: Call InstanceScript::EventInform for transport events Core/Transports: Use guid from db for transports, not just its entry - adds partial support for instancing them (still cannot use transports table for it, but can spawn manually now) Scripts/Icecrown Citadel: Fixed crash in Deathbringer Saurfang when event is started by more than one person (can't do this anymore) Closes isssue #3749. --HG-- branch : trunk
This commit is contained in:
1 parent
320cd16f20
commit
0f9fe8dbeb
12 files changed
+100
-41
No files matched your search
@@ -623,7 +623,7 @@ class TransportScript : public ScriptObject, public UpdatableScript<Transport>
|
||||
virtual void OnRemovePassenger(Transport* /*transport*/, Player* /*player*/) { }
|
||||
|
||||
// Called when a transport moves.
|
||||
virtual void OnRelocate(Transport* /*transport*/, uint32 /*mapId*/, float /*x*/, float /*y*/, float /*z*/) { }
|
||||
virtual void OnRelocate(Transport* /*transport*/, uint32 /*waypointId*/, uint32 /*mapId*/, float /*x*/, float /*y*/, float /*z*/) { }
|
||||
};
|
||||
|
||||
class AchievementCriteriaScript : public ScriptObject
|
||||
@@ -870,7 +870,7 @@ class ScriptMgr
|
||||
void OnAddCreaturePassenger(Transport* transport, Creature* creature);
|
||||
void OnRemovePassenger(Transport* transport, Player* player);
|
||||
void OnTransportUpdate(Transport* transport, uint32 diff);
|
||||
void OnRelocate(Transport* transport, uint32 mapId, float x, float y, float z);
|
||||
void OnRelocate(Transport* transport, uint32 waypointId, uint32 mapId, float x, float y, float z);
|
||||
|
||||
public: /* AchievementCriteriaScript */
|
||||
|
||||
|
||||
Reference in new issue
Block a user