pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 07:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Zone Heading for Binds, Summons, Teleports, and Zoning. (#1328)

Browse Source 
* For as long as I can remember people have had issues with zoning in, facing the wrong way, and walking through a zone line.

With this we will be able to set zone's safe heading as well as preserve heading on summon (NPC or GM) and teleports between zones.

This affects several pre-existing quest methods and extends their parameters to allow for the addition of heading.

The following functions have had heading added.
Lua
- client:SetBindPoint()
- client:SetStartZone()

Perl
- $client->SetBindPoint()
- $client->SetStartZone()
- quest::rebind()

SetStartZone parameter list was fixed also.

This converts some pre-existing methods from glm::vec3() to glm::vec4() and has an overload where necessary to use a glm::vec3() method versus glm::vec4() method.

This shouldn't affect any pre-existing servers and will allow PEQ and others to document safe headings for zones properly.

* Removed possible memory leaks.

* Fix SQL.

* Fix client message.

* Fix debug log.

* Fix log message.

* Fix call in rebind overload.

* Fix floats.

* Add default to column.
This commit is contained in:
Alex
2021-04-22 23:49:44 -04:00
committed by GitHub
parent 5893730704
commit 00fb9bc9f9
41 changed files with 697 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/perl_client.cpp
+24 -44
View File
@@ -753,47 +753,28 @@ XS(XS_Client_SetEXP) {
XS(XS_Client_SetBindPoint); /* prototype to pass -Wmissing-prototypes */
XS(XS_Client_SetBindPoint) {
dXSARGS;
if (items < 1 || items > 6)
Perl_croak(aTHX_ "Usage: Client::SetBindPoint(THIS, int to_zone = -1, int to_instance = 0, float new_x = 0.0f, float new_y = 0.0f, float new_z = 0.0f)"); // @categories Account and Character, Stats and Attributes
if (items < 1 || items > 7)
Perl_croak(aTHX_ "Usage: Client::SetBindPoint(THIS, [int to_zone = -1, int to_instance = 0, float new_x = 0.0f, float new_y = 0.0f, float new_z = 0.0f, float new_heading = 0.0f])"); // @categories Account and Character, Stats and Attributes
{
Client *THIS;
int to_zone;
int to_instance;
float new_x;
float new_y;
float new_z;
int to_zone = -1;
int to_instance = 0;
float new_x = 0.0f, new_y = 0.0f, new_z = 0.0f, new_heading = 0.0f;
VALIDATE_THIS_IS_CLIENT;
if (items < 2)
to_zone = -1;
else {
if (items > 1)
to_zone = (int) SvIV(ST(1));
}
if (items < 3)
to_instance = 0;
else {
if (items > 2)
to_instance = (int) SvIV(ST(2));
}
if (items < 4)
new_x = 0.0f;
else {
if (items > 3)
new_x = (float) SvNV(ST(3));
}
if (items < 5)
new_y = 0.0f;
else {
if (items > 4)
new_y = (float) SvNV(ST(4));
}
if (items < 6)
new_z = 0.0f;
else {
if (items > 5)
new_z = (float) SvNV(ST(5));
}
if (items > 6)
new_heading = (float) SvNV(ST(6));
THIS->SetBindPoint(0, to_zone, to_instance, glm::vec3(new_x, new_y, new_z));
THIS->SetBindPoint2(0, to_zone, to_instance, glm::vec4(new_x, new_y, new_z, new_heading));
}
XSRETURN_EMPTY;
}
@@ -3258,23 +3239,22 @@ XS(XS_Client_GetStartZone) {
XS(XS_Client_SetStartZone);
XS(XS_Client_SetStartZone) {
dXSARGS;
if (items != 2 && items != 5)
Perl_croak(aTHX_
"Usage: Client::SetStartZone(THIS, uint32 zone_id, [float x = 0], [float y = 0], [float z = 0])");
if (items != 2 && items != 5 && items != 6)
Perl_croak(aTHX_ "Usage: Client::SetStartZone(THIS, uint32 zone_id, [float x = 0, float y = 0, float z = 0, [float heading = 0]])");
{
Client *THIS;
uint32 zoneid = (uint32) SvUV(ST(1));
float x = 0;
float y = 0;
float z = 0;
float x = 0.0f, y = 0.0f, z = 0.0f, heading = 0.0f;
VALIDATE_THIS_IS_CLIENT;
if (items == 5) {
x = SvNV(ST(2));
y = SvNV(ST(3));
z = SvNV(ST(4));
x = (float) SvNV(ST(2));
y = (float) SvNV(ST(3));
z = (float) SvNV(ST(4));
}
if (items == 6)
heading = (float) SvNV(ST(5));
THIS->SetStartZone(zoneid, x, y, z);
THIS->SetStartZone(zoneid, x, y, z, heading);
}
XSRETURN_EMPTY;
}
@@ -5485,7 +5465,7 @@ XS(boot_Client) {
newXSproto(strcpy(buf, "SetBaseRace"), XS_Client_SetBaseRace, file, "$$");
newXSproto(strcpy(buf, "SetBecomeNPC"), XS_Client_SetBecomeNPC, file, "$$");
newXSproto(strcpy(buf, "SetBecomeNPCLevel"), XS_Client_SetBecomeNPCLevel, file, "$$");
newXSproto(strcpy(buf, "SetBindPoint"), XS_Client_SetBindPoint, file, "$;$$$$$");
newXSproto(strcpy(buf, "SetBindPoint"), XS_Client_SetBindPoint, file, "$;$$$$$$");
newXSproto(strcpy(buf, "SetConsumption"), XS_Client_SetConsumption, file, "$$$");
newXSproto(strcpy(buf, "SetClientMaxLevel"), XS_Client_SetClientMaxLevel, file, "$$");
newXSproto(strcpy(buf, "SetCustomItemData"), XS_Client_SetCustomItemData, file, "$$$$");
@@ -5509,7 +5489,7 @@ XS(boot_Client) {
newXSproto(strcpy(buf, "SetSecondaryWeaponOrnamentation"), XS_Client_SetSecondaryWeaponOrnamentation, file, "$$");
newXSproto(strcpy(buf, "SetSkill"), XS_Client_SetSkill, file, "$$$");
newXSproto(strcpy(buf, "SetSkillPoints"), XS_Client_SetSkillPoints, file, "$$");
newXSproto(strcpy(buf, "SetStartZone"), XS_Client_SetStartZone, file, "$$");
newXSproto(strcpy(buf, "SetStartZone"), XS_Client_SetStartZone, file, "$$;$$$$");
newXSproto(strcpy(buf, "SetStats"), XS_Client_SetStats, file, "$$$");
newXSproto(strcpy(buf, "SetThirst"), XS_Client_SetThirst, file, "$$");
newXSproto(strcpy(buf, "SetTint"), XS_Client_SetTint, file, "$$$");