pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-07 07:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into wp_master

Browse Source
This commit is contained in:
Akkadius 2018-05-28 00:33:05 -05:00
commit a87bf5681f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/races.cpp
View File

@ -1596,7 +1596,7 @@ float GetRaceGenderDefaultHeight(int race, int gender)
const auto size = sizeof(male_height) / sizeof(male_height[0]); const auto size = sizeof(male_height) / sizeof(male_height[0]);
if (race > size) if (race >= size)
return 6.0f; return 6.0f;
if (gender == 1) if (gender == 1)

2
zone/npc.cpp
View File

@ -135,7 +135,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, const glm::vec4& position, int if
respawn2 = in_respawn; respawn2 = in_respawn;
swarm_timer.Disable(); swarm_timer.Disable();
if (size < 0.0f) if (size <= 0.0f)
size = GetRaceGenderDefaultHeight(race, gender); size = GetRaceGenderDefaultHeight(race, gender);
taunting = false; taunting = false;