Use int8_t and move Item::isEmpty() checks

diasurgical · Aug 1, 2023 · c6573fc · c6573fc
1 parent c0752ec
commit c6573fc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/pack.cpp b/Source/pack.cpp
@@ -556,9 +556,9 @@ bool UnPackNetPlayer(const PlayerNetPack &packed, Player &player)
 	for (int i = 0; i < NUM_INVLOC; i++) {
 		if (!UnPackNetItem(player, packed.InvBody[i], player.InvBody[i]))
 			return false;
-		auto loc = static_cast<int>(player.GetItemLocation(player.InvBody[i]));
 		if (player.InvBody[i].isEmpty())
 			continue;
+		auto loc = static_cast<int8_t>(player.GetItemLocation(player.InvBody[i]));
 		switch (i) {
 		case INVLOC_HEAD:
 			ValidateField(loc, loc == ILOC_HELM);
@@ -592,9 +592,9 @@ bool UnPackNetPlayer(const PlayerNetPack &packed, Player &player)
 	for (int i = 0; i < MaxBeltItems; i++) {
 		if (!UnPackNetItem(player, packed.SpdList[i], player.SpdList[i]))
 			return false;
-		auto loc = static_cast<int>(player.GetItemLocation(player.SpdList[i]));
 		if (player.SpdList[i].isEmpty())
 			continue;
+		auto loc = static_cast<int8_t>(player.GetItemLocation(player.SpdList[i]));
 		ValidateField(loc, loc == ILOC_BELT);
 	}