pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 06:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Doors constructor converted to xyz_heading

Browse Source
This commit is contained in:
Arthur Ice 2014-11-30 20:49:48 -08:00
parent 7239a1339e
commit 7ac9a5c5a6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/doors.cpp
View File

@ -68,9 +68,9 @@ Doors::Doors(const Door* door) :
client_version_mask = door->client_version_mask; 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), close_timer(5000),
m_Position(dx, dy, dz, dheading), m_Position(position),
m_Destination(xyz_heading::Origin()) m_Destination(xyz_heading::Origin())
{ {
db_id = database.GetDoorsCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion()); db_id = database.GetDoorsCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion());

2
zone/doors.h
View File

@ -13,7 +13,7 @@ class Doors : public Entity
{ {
public: public:
Doors(const Door* door); 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(); ~Doors();
bool IsDoor() const { return true; } bool IsDoor() const { return true; }
void HandleClick(Client* sender, uint8 trigger); void HandleClick(Client* sender, uint8 trigger);

2
zone/entity.cpp
View File

@ -3852,7 +3852,7 @@ uint16 EntityList::CreateDoor(const char *model, float x, float y, float z,
float heading, uint8 opentype, uint16 size) float heading, uint8 opentype, uint16 size)
{ {
if (model) { 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(); RemoveAllDoors();
zone->LoadZoneDoors(zone->GetShortName(), zone->GetInstanceVersion()); zone->LoadZoneDoors(zone->GetShortName(), zone->GetInstanceVersion());
entity_list.AddDoor(door); entity_list.AddDoor(door);