Merge branch 'master' into wp_master

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)

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;