diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index b1f3c126d..ef486b68f 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -2699,7 +2699,7 @@ XS(XS__CreateGroundObjectFromModel) if (items > 6) decay_time = (uint32)SvIV(ST(6)); - id = quest_manager.CreateGroundObjectFromModel(modelname, x, y, z, heading, type, decay_time); + id = quest_manager.CreateGroundObjectFromModel(modelname, xyz_heading(x, y, z, heading), type, decay_time); XSRETURN_IV(id); } diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 6513d967f..efc6c48fe 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -693,15 +693,15 @@ void lua_create_ground_object(uint32 item_id, float x, float y, float z, float h } void lua_create_ground_object_from_model(const char *model, float x, float y, float z, float h) { - quest_manager.CreateGroundObjectFromModel(model, x, y, z, h); + quest_manager.CreateGroundObjectFromModel(model, xyz_heading(x, y, z, h)); } void lua_create_ground_object_from_model(const char *model, float x, float y, float z, float h, int type) { - quest_manager.CreateGroundObjectFromModel(model, x, y, z, h, type); + quest_manager.CreateGroundObjectFromModel(model, xyz_heading(x, y, z, h), type); } void lua_create_ground_object_from_model(const char *model, float x, float y, float z, float h, int type, uint32 decay_time) { - quest_manager.CreateGroundObjectFromModel(model, x, y, z, h, type, decay_time); + quest_manager.CreateGroundObjectFromModel(model, xyz_heading(x, y, z, h), type, decay_time); } void lua_create_door(const char *model, float x, float y, float z, float h, int open_type, int size) { diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 5afd56efb..79123f906 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -2349,10 +2349,10 @@ uint16 QuestManager::CreateGroundObject(uint32 itemid, const xyz_heading& positi return entid; } -uint16 QuestManager::CreateGroundObjectFromModel(const char *model, float x, float y, float z, float heading, uint8 type, uint32 decay_time) +uint16 QuestManager::CreateGroundObjectFromModel(const char *model, const xyz_heading& position, uint8 type, uint32 decay_time) { uint16 entid = 0; //safety check - entid = entity_list.CreateGroundObjectFromModel(model, xyz_heading(x, y, z, heading), type, decay_time); + entid = entity_list.CreateGroundObjectFromModel(model, position, type, decay_time); return entid; } diff --git a/zone/questmgr.h b/zone/questmgr.h index 41314b212..1fd028e7b 100644 --- a/zone/questmgr.h +++ b/zone/questmgr.h @@ -208,7 +208,7 @@ public: bool checktitle(int titlecheck); void removetitle(int titlecheck); uint16 CreateGroundObject(uint32 itemid, const xyz_heading& position, uint32 decay_time = 300000); - uint16 CreateGroundObjectFromModel(const char* model, float x, float y, float z, float heading, uint8 type = 0x00, uint32 decay_time = 0); + uint16 CreateGroundObjectFromModel(const char* model, const xyz_heading& position, uint8 type = 0x00, uint32 decay_time = 0); void ModifyNPCStat(const char *identifier, const char *newValue); void UpdateSpawnTimer(uint32 id, uint32 newTime); void MerchantSetItem(uint32 NPCid, uint32 itemid, uint32 quantity = 0);