pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-15 17:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

QuestManager::CreateGroundObject converted to xyz_heading

Browse Source
This commit is contained in:
Arthur Ice 2014-11-30 21:42:59 -08:00
parent c3471ed88e
commit 4c5117cabe
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zone/embparser_api.cpp
View File

@ -31,7 +31,7 @@
#include "queryserv.h" #include "queryserv.h"
extern Zone* zone; extern Zone* zone;
extern QueryServ* QServ; extern QueryServ* QServ;
/* /*
@ -1174,7 +1174,7 @@ XS(XS__createguild)
Perl_croak(aTHX_ "Usage: createguild(guild_name, leader)"); Perl_croak(aTHX_ "Usage: createguild(guild_name, leader)");
char * guild_name = (char *)SvPV_nolen(ST(0)); char * guild_name = (char *)SvPV_nolen(ST(0));
char * leader = (char *)SvPV_nolen(ST(1)); char * leader = (char *)SvPV_nolen(ST(1));
quest_manager.CreateGuild(guild_name, leader); quest_manager.CreateGuild(guild_name, leader);
@ -2668,10 +2668,10 @@ XS(XS__CreateGroundObject)
uint16 id = 0; uint16 id = 0;
if(items == 5) if(items == 5)
id = quest_manager.CreateGroundObject(itemid, x, y, z, heading); id = quest_manager.CreateGroundObject(itemid, xyz_heading(x, y, z, heading));
else{ else{
uint32 decay_time = (uint32)SvIV(ST(5)); uint32 decay_time = (uint32)SvIV(ST(5));
id = quest_manager.CreateGroundObject(itemid, x, y, z, heading, decay_time); id = quest_manager.CreateGroundObject(itemid, xyz_heading(x, y, z, heading), decay_time);
} }
XSRETURN_IV(id); XSRETURN_IV(id);
@ -3289,7 +3289,7 @@ XS(XS__GetZoneID)
char *zone = (char *)SvPV_nolen(ST(0)); char *zone = (char *)SvPV_nolen(ST(0));
int32 id = quest_manager.GetZoneID(zone); int32 id = quest_manager.GetZoneID(zone);
XSRETURN_IV(id); XSRETURN_IV(id);
} }
@ -3302,7 +3302,7 @@ XS(XS__GetZoneLongName)
dXSTARG; dXSTARG;
char *zone = (char *)SvPV_nolen(ST(0)); char *zone = (char *)SvPV_nolen(ST(0));
Const_char* RETVAL = quest_manager.GetZoneLongName(zone); Const_char* RETVAL = quest_manager.GetZoneLongName(zone);
sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
XSRETURN(1); XSRETURN(1);
} }
@ -3432,7 +3432,7 @@ XS(XS__clear_npctype_cache)
int32 npctype_id = (int32)SvIV(ST(0)); int32 npctype_id = (int32)SvIV(ST(0));
quest_manager.ClearNPCTypeCache(npctype_id); quest_manager.ClearNPCTypeCache(npctype_id);
} }
XSRETURN_EMPTY; XSRETURN_EMPTY;
} }
@ -3455,11 +3455,11 @@ XS(XS__qs_player_event);
XS(XS__qs_player_event) XS(XS__qs_player_event)
{ {
dXSARGS; dXSARGS;
if (items != 2){ if (items != 2){
Perl_croak(aTHX_ "Usage: qs_player_event(char_id, event_desc)"); Perl_croak(aTHX_ "Usage: qs_player_event(char_id, event_desc)");
} }
else{ else{
int char_id = (int)SvIV(ST(0)); int char_id = (int)SvIV(ST(0));
std::string event_desc = (std::string)SvPV_nolen(ST(1)); std::string event_desc = (std::string)SvPV_nolen(ST(1));
QServ->PlayerLogEvent(Player_Log_Quest, char_id, event_desc); QServ->PlayerLogEvent(Player_Log_Quest, char_id, event_desc);
} }
@ -3494,7 +3494,7 @@ XS(XS__crosszonesignalnpcbynpctypeid)
if (items == 2) { if (items == 2) {
uint32 npctype_id = (uint32)SvIV(ST(0)); uint32 npctype_id = (uint32)SvIV(ST(0));
uint32 data = (uint32)SvIV(ST(1)); uint32 data = (uint32)SvIV(ST(1));
quest_manager.CrossZoneSignalNPCByNPCTypeID(npctype_id, data); quest_manager.CrossZoneSignalNPCByNPCTypeID(npctype_id, data);
} }
@ -3725,8 +3725,8 @@ EXTERN_C XS(boot_quest)
newXS(strcpy(buf, "enablerecipe"), XS__enablerecipe, file); newXS(strcpy(buf, "enablerecipe"), XS__enablerecipe, file);
newXS(strcpy(buf, "disablerecipe"), XS__disablerecipe, file); newXS(strcpy(buf, "disablerecipe"), XS__disablerecipe, file);
newXS(strcpy(buf, "clear_npctype_cache"), XS__clear_npctype_cache, file); newXS(strcpy(buf, "clear_npctype_cache"), XS__clear_npctype_cache, file);
newXS(strcpy(buf, "qs_send_query"), XS__qs_send_query, file); newXS(strcpy(buf, "qs_send_query"), XS__qs_send_query, file);
newXS(strcpy(buf, "qs_player_event"), XS__qs_player_event, file); newXS(strcpy(buf, "qs_player_event"), XS__qs_player_event, file);
newXS(strcpy(buf, "crosszonesetentityvariablebynpctypeid"), XS__crosszonesetentityvariablebynpctypeid, file); newXS(strcpy(buf, "crosszonesetentityvariablebynpctypeid"), XS__crosszonesetentityvariablebynpctypeid, file);
newXS(strcpy(buf, "crosszonesignalnpcbynpctypeid"), XS__crosszonesignalnpcbynpctypeid, file); newXS(strcpy(buf, "crosszonesignalnpcbynpctypeid"), XS__crosszonesignalnpcbynpctypeid, file);
XSRETURN_YES; XSRETURN_YES;

4
zone/lua_general.cpp
View File

@ -685,11 +685,11 @@ int lua_get_level(int type) {
} }
void lua_create_ground_object(uint32 item_id, float x, float y, float z, float h) { void lua_create_ground_object(uint32 item_id, float x, float y, float z, float h) {
quest_manager.CreateGroundObject(item_id, x, y, z, h); quest_manager.CreateGroundObject(item_id, xyz_heading(x, y, z, h));
} }
void lua_create_ground_object(uint32 item_id, float x, float y, float z, float h, uint32 decay_time) { void lua_create_ground_object(uint32 item_id, float x, float y, float z, float h, uint32 decay_time) {
quest_manager.CreateGroundObject(item_id, x, y, z, h, decay_time); quest_manager.CreateGroundObject(item_id, xyz_heading(x, y, z, h), decay_time);
} }
void lua_create_ground_object_from_model(const char *model, 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) {

4
zone/questmgr.cpp
View File

@ -2342,10 +2342,10 @@ int QuestManager::getlevel(uint8 type)
return 0; return 0;
} }
uint16 QuestManager::CreateGroundObject(uint32 itemid, float x, float y, float z, float heading, uint32 decay_time) uint16 QuestManager::CreateGroundObject(uint32 itemid, const xyz_heading& position, uint32 decay_time)
{ {
uint16 entid = 0; //safety check uint16 entid = 0; //safety check
entid = entity_list.CreateGroundObject(itemid, xyz_heading(x, y, z, heading), decay_time); entid = entity_list.CreateGroundObject(itemid, position, decay_time);
return entid; return entid;
} }

4
zone/questmgr.h
View File

@ -207,7 +207,7 @@ public:
void enabletitle(int titleset); void enabletitle(int titleset);
bool checktitle(int titlecheck); bool checktitle(int titlecheck);
void removetitle(int titlecheck); void removetitle(int titlecheck);
uint16 CreateGroundObject(uint32 itemid, float x, float y, float z, float heading, uint32 decay_time = 300000); 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, float x, float y, float z, float heading, uint8 type = 0x00, uint32 decay_time = 0);
void ModifyNPCStat(const char *identifier, const char *newValue); void ModifyNPCStat(const char *identifier, const char *newValue);
void UpdateSpawnTimer(uint32 id, uint32 newTime); void UpdateSpawnTimer(uint32 id, uint32 newTime);
@ -240,7 +240,7 @@ public:
uint16 CreateDoor( const char* model, float x, float y, float z, float heading, uint8 opentype, uint16 size); uint16 CreateDoor( const char* model, float x, float y, float z, float heading, uint8 opentype, uint16 size);
int32 GetZoneID(const char *zone); int32 GetZoneID(const char *zone);
const char *GetZoneLongName(const char *zone); const char *GetZoneLongName(const char *zone);
void CrossZoneSignalPlayerByCharID(int charid, uint32 data); void CrossZoneSignalPlayerByCharID(int charid, uint32 data);
void CrossZoneSignalNPCByNPCTypeID(uint32 npctype_id, uint32 data); void CrossZoneSignalNPCByNPCTypeID(uint32 npctype_id, uint32 data);
void CrossZoneSignalPlayerByName(const char *CharName, uint32 data); void CrossZoneSignalPlayerByName(const char *CharName, uint32 data);
void CrossZoneSetEntityVariableByNPCTypeID(uint32 npctype_id, const char *id, const char *m_var); void CrossZoneSetEntityVariableByNPCTypeID(uint32 npctype_id, const char *id, const char *m_var);