mob constructor converted to xyz_heading

zone/beacon.cpp

@@ -43,7 +43,7 @@ extern Zone* zone;
 Beacon::Beacon(Mob *at_mob, int lifetime)
 :Mob
 (
-	nullptr, nullptr, 0, 0, 0, INVISIBLE_MAN, 0, BT_NoTarget, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	nullptr, nullptr, 0, 0, 0, INVISIBLE_MAN, 0, BT_NoTarget, 0, 0, 0, 0, 0, at_mob->GetPosition(), 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 ),
 		remove_timer(lifetime),
@@ -57,12 +57,6 @@ Beacon::Beacon(Mob *at_mob, int lifetime)
 	spell_iterations = 0;
 	caster_id = 0;
 
-	// copy location
-	m_Position.m_X = at_mob->GetX();
-	m_Position.m_Y = at_mob->GetY();
-	m_Position.m_Z = at_mob->GetZ();
-	m_Position.m_Heading = at_mob->GetHeading();
-
 	if(lifetime)
 	{
 		remove_timer.Start();

zone/client.cpp

@@ -89,10 +89,7 @@ Client::Client(EQStreamInterface* ieqs)
 	0,	// npctypeid
 	0,	// size
 	0.7,	// runspeed
-	0,	// heading
+	xyz_heading::Origin(),
-	0,	// x
-	0,	// y
-	0,	// z
 	0,	// light
 	0xFF,	// texture
 	0xFF,	// helmtexture

zone/corpse.cpp

@@ -146,8 +146,7 @@ Corpse::Corpse(NPC* in_npc, ItemList* in_itemlist, uint32 in_npctypeid, const NP
 // vesuvias - appearence fix
 : Mob("Unnamed_Corpse","",0,0,in_npc->GetGender(),in_npc->GetRace(),in_npc->GetClass(),BT_Humanoid,//bodytype added
 	in_npc->GetDeity(),in_npc->GetLevel(),in_npc->GetNPCTypeID(),in_npc->GetSize(),0,
-	in_npc->GetHeading(),in_npc->GetX(),in_npc->GetY(),in_npc->GetZ(),0,
+	in_npc->GetPosition(), 0, in_npc->GetTexture(),in_npc->GetHelmTexture(),
-	in_npc->GetTexture(),in_npc->GetHelmTexture(),
 	0,0,0,0,0,0,0,0,0,
 	0,0,0,0,0,0,0,0,0,0,0,0xff,0,0,0,0,0,0,0,0,0),
 	corpse_decay_timer(in_decaytime),
@@ -212,10 +211,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob (
 	0,								  // uint32		in_npctype_id,
 	client->GetSize(),				  // float		in_size,
 	0,								  // float		in_runspeed,
-	client->GetHeading(),			  // float		in_heading,
+	client->GetPosition(),
-	client->GetX(),					  // float		in_x_pos,
-	client->GetY(),					  // float		in_y_pos,
-	client->GetZ(),					  // float		in_z_pos,
 	0,								  // uint8		in_light,
 	client->GetTexture(),			  // uint8		in_texture,
 	client->GetHelmTexture(),		  // uint8		in_helmtexture,
@@ -441,10 +437,7 @@ in_level,
 0,
 in_size,
 0,
-in_heading,
+xyz_heading(in_x, in_y,in_z,in_heading),
-in_x,
-in_y,
-in_z,
 0,
 in_texture,
 in_helmtexture,

zone/mob.cpp

@@ -45,11 +45,7 @@ Mob::Mob(const char* in_name,
 		uint32		in_npctype_id,
 		float		in_size,
 		float		in_runspeed,
-		float		in_heading,
+		const xyz_heading& position,
-		float		in_x_pos,
-		float		in_y_pos,
-		float		in_z_pos,
-
 		uint8		in_light,
 		uint8		in_texture,
 		uint8		in_helmtexture,
@@ -101,8 +97,8 @@ Mob::Mob(const char* in_name,
 		m_FearWalkTarget(-999999.0f,-999999.0f,-999999.0f),
 		m_TargetLocation(xyz_location::Origin()),
 		m_TargetV(xyz_location::Origin()),
-		flee_timer(FLEE_CHECK_TIMER)
+		flee_timer(FLEE_CHECK_TIMER),
-
+		m_Position(position)
 {
 	targeted = 0;
 	tar_ndx=0;
@@ -149,10 +145,6 @@ Mob::Mob(const char* in_name,
 	if (runspeed < 0 || runspeed > 20)
 		runspeed = 1.25f;
 
-	m_Position.m_Heading = in_heading;
-	m_Position.m_X = in_x_pos;
-	m_Position.m_Y = in_y_pos;
-	m_Position.m_Z = in_z_pos;
 	light		= in_light;
 	texture		= in_texture;
 	helmtexture	= in_helmtexture;

zone/mob.h

@@ -71,10 +71,7 @@ public:
 		uint32		in_npctype_id,
 		float		in_size,
 		float		in_runspeed,
-		float		in_heading,
+		const xyz_heading& position,
-		float		in_x_pos,
-		float		in_y_pos,
-		float		in_z_pos,
 		uint8		in_light,
 		uint8		in_texture,
 		uint8		in_helmtexture,

zone/npc.cpp

@@ -68,10 +68,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, const xyz_heading& position, int
 		d->npc_id,
 		d->size,
 		d->runspeed,
-		position.m_Heading,
+		position,
-		position.m_X,
-		position.m_Y,
-		position.m_Z,
 		d->light,
 		d->texture,
 		d->helmtexture,