From 02a457e6011b8e1eb7177befaa5254adcb0e4a8e Mon Sep 17 00:00:00 2001
From: Arthur Dene Ice <addtheice@gmail.com>
Date: Sat, 10 May 2014 18:32:35 -0700
Subject: [PATCH] convert int16 to int8 explicitly

---
 zone/client_packet.cpp | 2 +-
 zone/corpse.cpp        | 6 +++---
 zone/inventory.cpp     | 2 +-
 zone/pathing.cpp       | 2 +-
 zone/trading.cpp       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 1d588a9c9..d43e7f2f3 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -1267,7 +1267,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app)
 		PlayerPositionUpdateServer_Struct* ppu = (PlayerPositionUpdateServer_Struct*)outapp->pBuffer;
 		MakeSpawnUpdate(ppu);
 		if (gmhideme)
-			entity_list.QueueClientsStatus(this,outapp,true,Admin(),250);
+			entity_list.QueueClientsStatus(this,outapp,true,(uint8)Admin(),250);
 		else
 			entity_list.QueueCloseClients(this,outapp,true,300,nullptr,false);
 		safe_delete(outapp);
diff --git a/zone/corpse.cpp b/zone/corpse.cpp
index 9b3fb7f30..57f5e550a 100644
--- a/zone/corpse.cpp
+++ b/zone/corpse.cpp
@@ -445,7 +445,7 @@ std::list<uint32> Corpse::MoveItemToCorpse(Client *client, ItemInst *item, int16
 	ItemInst *interior_item;
 	std::list<uint32> returnlist;
 
-	AddItem(item->GetItem()->ID, item->GetCharges(), equipslot, item->GetAugmentItemID(0), item->GetAugmentItemID(1), item->GetAugmentItemID(2), item->GetAugmentItemID(3), item->GetAugmentItemID(4));
+	AddItem(item->GetItem()->ID, (uint8)item->GetCharges(), equipslot, item->GetAugmentItemID(0), item->GetAugmentItemID(1), item->GetAugmentItemID(2), item->GetAugmentItemID(3), item->GetAugmentItemID(4));
 	returnlist.push_back(equipslot);
 
 	// Qualified bag slot iterations. processing bag slots that don't exist is probably not a good idea.
@@ -459,7 +459,7 @@ std::list<uint32> Corpse::MoveItemToCorpse(Client *client, ItemInst *item, int16
 
 			if(interior_item)
 			{
-				AddItem(interior_item->GetItem()->ID, interior_item->GetCharges(), interior_slot, interior_item->GetAugmentItemID(0), interior_item->GetAugmentItemID(1), interior_item->GetAugmentItemID(2), interior_item->GetAugmentItemID(3), interior_item->GetAugmentItemID(4));
+				AddItem(interior_item->GetItem()->ID, (uint8)interior_item->GetCharges(), interior_slot, interior_item->GetAugmentItemID(0), interior_item->GetAugmentItemID(1), interior_item->GetAugmentItemID(2), interior_item->GetAugmentItemID(3), interior_item->GetAugmentItemID(4));
 				returnlist.push_back(Inventory::CalcSlotId(equipslot, bagindex));
 				client->DeleteItemInInventory(interior_slot, 0, true, false);
 			}
@@ -574,7 +574,7 @@ bool Corpse::Save() {
 			CorpseRace = race;
 	}
 
-	dbpc->race = CorpseRace;
+	dbpc->race = (uint8)CorpseRace;
 	dbpc->class_ = class_;
 	dbpc->gender = gender;
 	dbpc->deity = deity;
diff --git a/zone/inventory.cpp b/zone/inventory.cpp
index 5292dd1c0..56e3b89fe 100644
--- a/zone/inventory.cpp
+++ b/zone/inventory.cpp
@@ -1640,7 +1640,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 		}
 	}
 
-	int matslot = SlotConvert2(dst_slot_id);
+	int matslot = SlotConvert2((uint8)dst_slot_id);
 	if (dst_slot_id<22 && matslot != 0) {
 		SendWearChange(matslot);
 	}
diff --git a/zone/pathing.cpp b/zone/pathing.cpp
index 3f28729a3..7e258fedf 100644
--- a/zone/pathing.cpp
+++ b/zone/pathing.cpp
@@ -1289,7 +1289,7 @@ void PathManager::OpenDoors(int Node1, int Node2, Mob *ForWho)
 
 		if(PathNodes[Node1].Neighbours[i].DoorID >= 0)
 		{
-			Doors *d = entity_list.FindDoor(PathNodes[Node1].Neighbours[i].DoorID);
+			Doors *d = entity_list.FindDoor((uint8)PathNodes[Node1].Neighbours[i].DoorID);
 
 			if(d && !d->IsDoorOpen() )
 			{
diff --git a/zone/trading.cpp b/zone/trading.cpp
index 7313087ad..f6b800fe2 100644
--- a/zone/trading.cpp
+++ b/zone/trading.cpp
@@ -1060,7 +1060,7 @@ void Client::TraderUpdate(uint16 SlotID,uint32 TraderID){
 	EQApplicationPacket* outapp = new EQApplicationPacket(OP_TraderItemUpdate,sizeof(TraderItemUpdate_Struct));
 	TraderItemUpdate_Struct* tus=(TraderItemUpdate_Struct*)outapp->pBuffer;
 	tus->Charges = 0xFFFF;
-	tus->FromSlot = SlotID;
+	tus->FromSlot = (uint8)SlotID;
 	tus->ToSlot = 0xFF;
 	tus->TraderID = TraderID;
 	tus->Unknown000 = 0;