diff --git a/zone/doors.cpp b/zone/doors.cpp index ba8668f80..24bee901b 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -68,9 +68,9 @@ Doors::Doors(const Door* door) : client_version_mask = door->client_version_mask; } -Doors::Doors(const char *dmodel, float dx, float dy, float dz, float dheading, uint8 dopentype, uint16 dsize) : +Doors::Doors(const char *dmodel, const xyz_heading& position, uint8 dopentype, uint16 dsize) : close_timer(5000), - m_Position(dx, dy, dz, dheading), + m_Position(position), m_Destination(xyz_heading::Origin()) { db_id = database.GetDoorsCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion()); diff --git a/zone/doors.h b/zone/doors.h index f52d04108..cd5fa61a1 100644 --- a/zone/doors.h +++ b/zone/doors.h @@ -13,7 +13,7 @@ class Doors : public Entity { public: Doors(const Door* door); - Doors(const char *dmodel, float dx, float dy, float dz, float dheading, uint8 dopentype = 58, uint16 dsize = 100); + Doors(const char *dmodel, const xyz_heading& position, uint8 dopentype = 58, uint16 dsize = 100); ~Doors(); bool IsDoor() const { return true; } void HandleClick(Client* sender, uint8 trigger); diff --git a/zone/entity.cpp b/zone/entity.cpp index da95f4025..1c17be825 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -3852,7 +3852,7 @@ uint16 EntityList::CreateDoor(const char *model, float x, float y, float z, float heading, uint8 opentype, uint16 size) { if (model) { - Doors *door = new Doors(model, x, y, z, heading, opentype, size); + Doors *door = new Doors(model, xyz_heading(x, y, z, heading), opentype, size); RemoveAllDoors(); zone->LoadZoneDoors(zone->GetShortName(), zone->GetInstanceVersion()); entity_list.AddDoor(door);