pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use GetRaceGenderDefaultHeight in GetDefaultRaceSize constant

Browse Source
This commit is contained in:
Akkadius 2018-05-28 00:41:32 -05:00
parent a87bf5681f
commit 8a911682bf
2 changed files with 85 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/races.cpp
View File

@ -1349,8 +1349,7 @@ const char* GetPlayerRaceName(uint32 player_race_value)
return GetRaceIDName(GetRaceIDFromPlayerRaceValue(player_race_value)); return GetRaceIDName(GetRaceIDFromPlayerRaceValue(player_race_value));
} }
uint32 GetPlayerRaceValue(uint16 race_id) uint32 GetPlayerRaceValue(uint16 race_id) {
{
switch (race_id) { switch (race_id) {
case HUMAN: case HUMAN:
case BARBARIAN: case BARBARIAN:
@ -1379,8 +1378,7 @@ uint32 GetPlayerRaceValue(uint16 race_id)
} }
} }
uint32 GetPlayerRaceBit(uint16 race_id) uint32 GetPlayerRaceBit(uint16 race_id) {
{
switch (race_id) { switch (race_id) {
case HUMAN: case HUMAN:
return PLAYER_RACE_HUMAN_BIT; return PLAYER_RACE_HUMAN_BIT;
@ -1419,8 +1417,7 @@ uint32 GetPlayerRaceBit(uint16 race_id)
} }
} }
uint16 GetRaceIDFromPlayerRaceValue(uint32 player_race_value) uint16 GetRaceIDFromPlayerRaceValue(uint32 player_race_value) {
{
switch (player_race_value) { switch (player_race_value) {
case PLAYER_RACE_HUMAN: case PLAYER_RACE_HUMAN:
case PLAYER_RACE_BARBARIAN: case PLAYER_RACE_BARBARIAN:

54
zone/mob.cpp
View File

@ -6053,59 +6053,7 @@ void Mob::CommonBreakInvisible()
} }
float Mob::GetDefaultRaceSize() const { float Mob::GetDefaultRaceSize() const {
switch (race) { return GetRaceGenderDefaultHeight(race, gender);
case RACE_HUMAN_1:
return 6.0;
break;
case RACE_BARBARIAN_2:
return 7.0;
break;
case RACE_ERUDITE_3:
return 6.0;
break;
case RACE_WOOD_ELF_4:
return 5.0;
break;
case RACE_HIGH_ELF_5:
return 6.0;
break;
case RACE_DARK_ELF_6:
return 5.0;
break;
case RACE_HALF_ELF_7:
return 5.5;
break;
case RACE_DWARF_8:
return 4.0;
break;
case RACE_TROLL_9:
return 8.0;
break;
case RACE_OGRE_10:
return 9.0;
break;
case RACE_HALFLING_11:
return 3.5;
break;
case RACE_GNOME_12:
return 3.0;
break;
case RACE_IKSAR_128:
return 6.0;
break;
case RACE_VAH_SHIR_130:
return 7.0;
break;
case RACE_FROGLOK_330:
return 5.0;
break;
case RACE_DRAKKIN_522:
return 5.0;
break;
default:
return 6.0;
break;
}
} }