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

Updated EQEmu::deity naming conventions

Browse Source
This commit is contained in:
Uleat 2016-04-22 19:41:11 -04:00
parent f36e041176
commit 7c0eb54df6
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/deity.cpp
View File

@ -20,9 +20,9 @@
#include "deity.h" #include "deity.h"
EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityToDeityBit(DeityType deity) EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type)
{ {
switch (deity) { switch (deity_type) {
case DeityBertoxxulous: case DeityBertoxxulous:
return bit_DeityBertoxxulous; return bit_DeityBertoxxulous;
case DeityBrellSirilis: case DeityBrellSirilis:
@ -63,9 +63,9 @@ EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityToDeityBit(DeityType deity)
}; };
} }
EQEmu::deity::DeityType EQEmu::deity::ConvertDeityBitToDeity(DeityTypeBit deity_bit) EQEmu::deity::DeityType EQEmu::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
{ {
switch (deity_bit) { switch (deity_type_bit) {
case bit_DeityAgnostic: case bit_DeityAgnostic:
return DeityAgnostic; return DeityAgnostic;
case bit_DeityBertoxxulous: case bit_DeityBertoxxulous:
@ -105,9 +105,9 @@ EQEmu::deity::DeityType EQEmu::deity::ConvertDeityBitToDeity(DeityTypeBit deity_
}; };
} }
const char* EQEmu::deity::DeityName(DeityType deity) const char* EQEmu::deity::DeityName(DeityType deity_type)
{ {
switch (deity) { switch (deity_type) {
case DeityBertoxxulous: case DeityBertoxxulous:
return "Bertoxxulous"; return "Bertoxxulous";
case DeityBrellSirilis: case DeityBrellSirilis:

6
common/deity.h
View File

@ -67,9 +67,9 @@ namespace EQEmu
bit_DeityVeeshan = 0x00010000 bit_DeityVeeshan = 0x00010000
}; };
extern DeityTypeBit ConvertDeityToDeityBit(DeityType deity); extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);
extern DeityType ConvertDeityBitToDeity(DeityTypeBit deity_bit); extern DeityType ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit);
extern const char* DeityName(DeityType deity); extern const char* DeityName(DeityType deity_type);
} }
} }

2
zone/mob.h
View File

@ -364,7 +364,7 @@ public:
virtual inline uint16 GetBaseRace() const { return base_race; } virtual inline uint16 GetBaseRace() const { return base_race; }
virtual inline uint8 GetBaseGender() const { return base_gender; } virtual inline uint8 GetBaseGender() const { return base_gender; }
virtual inline uint16 GetDeity() const { return deity; } virtual inline uint16 GetDeity() const { return deity; }
virtual EQEmu::deity::DeityTypeBit GetDeityBit() { return EQEmu::deity::ConvertDeityToDeityBit((EQEmu::deity::DeityType)deity); } virtual EQEmu::deity::DeityTypeBit GetDeityBit() { return EQEmu::deity::ConvertDeityTypeToDeityTypeBit((EQEmu::deity::DeityType)deity); }
inline uint16 GetRace() const { return race; } inline uint16 GetRace() const { return race; }
inline uint8 GetGender() const { return gender; } inline uint8 GetGender() const { return gender; }
inline uint8 GetTexture() const { return texture; } inline uint8 GetTexture() const { return texture; }