Merge branch 'master' into wp_master

This commit is contained in:
Akkadius
2018-05-28 00:33:05 -05:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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;