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

Set door zone to 32 bytes for consistency in copy [skip ci]

Browse Source
This commit is contained in:
Akkadius 2015-02-13 03:50:01 -06:00
parent da425195f9
commit 7ac7914f33
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zone/doors.cpp
View File

@ -41,14 +41,14 @@ extern EntityList entity_list;
extern WorldServer worldserver; extern WorldServer worldserver;
Doors::Doors(const Door* door) : Doors::Doors(const Door* door) :
close_timer(5000), close_timer(5000),
m_Position(door->pos_x, door->pos_y, door->pos_z, door->heading), m_Position(door->pos_x, door->pos_y, door->pos_z, door->heading),
m_Destination(door->dest_x, door->dest_y, door->dest_z, door->dest_heading) m_Destination(door->dest_x, door->dest_y, door->dest_z, door->dest_heading)
{ {
db_id = door->db_id; db_id = door->db_id;
door_id = door->door_id; door_id = door->door_id;
strn0cpy(zone_name,door->zone_name,32); strn0cpy(zone_name, door->zone_name, 32);
strn0cpy(door_name,door->door_name,32); strn0cpy(door_name, door->door_name, 32);
incline = door->incline; incline = door->incline;
opentype = door->opentype; opentype = door->opentype;
guild_id = door->guild_id; guild_id = door->guild_id;
@ -57,7 +57,7 @@ Doors::Doors(const Door* door) :
nokeyring = door->nokeyring; nokeyring = door->nokeyring;
trigger_door = door->trigger_door; trigger_door = door->trigger_door;
trigger_type = door->trigger_type; trigger_type = door->trigger_type;
triggered=false; triggered = false;
door_param = door->door_param; door_param = door->door_param;
size = door->size; size = door->size;
invert_state = door->invert_state; invert_state = door->invert_state;
@ -65,7 +65,7 @@ Doors::Doors(const Door* door) :
close_timer.Disable(); close_timer.Disable();
strn0cpy(dest_zone,door->dest_zone,16); strn0cpy(dest_zone, door->dest_zone, 16);
dest_instance_id = door->dest_instance_id; dest_instance_id = door->dest_instance_id;
is_ldon_door = door->is_ldon_door; is_ldon_door = door->is_ldon_door;
@ -73,14 +73,14 @@ Doors::Doors(const Door* door) :
} }
Doors::Doors(const char *dmodel, const glm::vec4& position, uint8 dopentype, uint16 dsize) : Doors::Doors(const char *dmodel, const glm::vec4& position, uint8 dopentype, uint16 dsize) :
close_timer(5000), close_timer(5000),
m_Position(position), m_Position(position),
m_Destination(glm::vec4()) m_Destination(glm::vec4())
{ {
db_id = database.GetDoorsCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion()); db_id = database.GetDoorsCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion());
door_id = database.GetDoorsDBCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion()); door_id = database.GetDoorsDBCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion());
strn0cpy(zone_name,zone->GetShortName(),32); strn0cpy(zone_name, zone->GetShortName(), 32);
strn0cpy(door_name,dmodel,32); strn0cpy(door_name, dmodel, 32);
incline = 0; incline = 0;
opentype = dopentype; opentype = dopentype;
guild_id = 0; guild_id = 0;
@ -89,7 +89,7 @@ Doors::Doors(const char *dmodel, const glm::vec4& position, uint8 dopentype, uin
nokeyring = 0; nokeyring = 0;
trigger_door = 0; trigger_door = 0;
trigger_type = 0; trigger_type = 0;
triggered=false; triggered = false;
door_param = 0; door_param = 0;
size = dsize; size = dsize;
invert_state = 0; invert_state = 0;
@ -97,7 +97,7 @@ Doors::Doors(const char *dmodel, const glm::vec4& position, uint8 dopentype, uin
close_timer.Disable(); close_timer.Disable();
strn0cpy(dest_zone,"NONE",32); strn0cpy(dest_zone, "NONE", 32);
dest_instance_id = 0; dest_instance_id = 0;
is_ldon_door = 0; is_ldon_door = 0;

2
zone/zonedump.h
View File

@ -182,7 +182,7 @@ struct PlayerCorpse_Struct {
struct Door { struct Door {
uint32 db_id; uint32 db_id;
uint8 door_id; uint8 door_id;
char zone_name[16]; char zone_name[32];
char door_name[32]; char door_name[32];
float pos_x; float pos_x;
float pos_y; float pos_y;