Add new Mektoub type used for new pets companions

--HG--
branch : patches-from-atys
hg/hotfix/patches-from-atys
Nuno Gonçalves 6 years ago
parent 971287ae78
commit ed798cb62a

@ -88,6 +88,7 @@ namespace ITEM_TYPE
{ "CAMPSFIRE", CAMPSFIRE }, { "CAMPSFIRE", CAMPSFIRE },
{ "MEKTOUB_PACKER_TICKET", MEKTOUB_PACKER_TICKET }, { "MEKTOUB_PACKER_TICKET", MEKTOUB_PACKER_TICKET },
{ "MEKTOUB_MOUNT_TICKET", MEKTOUB_MOUNT_TICKET }, { "MEKTOUB_MOUNT_TICKET", MEKTOUB_MOUNT_TICKET },
{ "ANIMAL_TICKET", ANIMAL_TICKET },
{ "FOOD", FOOD }, { "FOOD", FOOD },
{ "MAGICIAN_STAFF", MAGICIAN_STAFF }, { "MAGICIAN_STAFF", MAGICIAN_STAFF },
{ "HAIR_MALE", HAIR_MALE }, { "HAIR_MALE", HAIR_MALE },

@ -83,6 +83,7 @@ namespace ITEM_TYPE
CAMPSFIRE, CAMPSFIRE,
MEKTOUB_PACKER_TICKET, MEKTOUB_PACKER_TICKET,
MEKTOUB_MOUNT_TICKET, MEKTOUB_MOUNT_TICKET,
ANIMAL_TICKET,
FOOD, FOOD,
MAGICIAN_STAFF, MAGICIAN_STAFF,
HAIR_MALE, HAIR_MALE,

@ -85,11 +85,12 @@ inline uint8 getCivilisationId(CPeople::TPeople people)
return 0xFF; return 0xFF;
} }
/// Return the pet type, 1 for Mount, 2 for Packer (otherwise 0) /// Return the pet type, 1 for Mount, 2 for Packer, 3 for Creature (pets) (otherwise 0)
inline uint getPetType( CPeople::TPeople peopleType ) inline uint getPetType( CPeople::TPeople peopleType )
{ {
switch ( peopleType ) switch ( peopleType )
{ {
case CPeople::Creature: return 3;
case CPeople::MektoubPacker: return 2; case CPeople::MektoubPacker: return 2;
case CPeople::MektoubMount: return 1; case CPeople::MektoubMount: return 1;
default: return 0; default: return 0;

Loading…
Cancel
Save