From 72349ddbb66ba0c536cdace045e974c96fd8e15a Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Mon, 28 May 2018 01:23:35 -0400 Subject: [PATCH 1/2] Fix condition to set default heights Was off by 1, if the height > 0 they don't get default height --- zone/npc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/npc.cpp b/zone/npc.cpp index 96df168ff..ae4dae217 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -135,7 +135,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, const glm::vec4& position, int if respawn2 = in_respawn; swarm_timer.Disable(); - if (size < 0.0f) + if (size <= 0.0f) size = GetRaceGenderDefaultHeight(race, gender); taunting = false; From c487acbf1a710fc9a8c9a6f2a0612e308a6d9784 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Mon, 28 May 2018 01:30:32 -0400 Subject: [PATCH 2/2] Off by 1 error in size check --- common/races.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/races.cpp b/common/races.cpp index 1e4d88664..331ee8e7e 100644 --- a/common/races.cpp +++ b/common/races.cpp @@ -1596,7 +1596,7 @@ float GetRaceGenderDefaultHeight(int race, int gender) const auto size = sizeof(male_height) / sizeof(male_height[0]); - if (race > size) + if (race >= size) return 6.0f; if (gender == 1)