From ed798cb62af96913d80976c1ba0b5d6050f797f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nuno=20Gon=C3=A7alves?= <ulukyn@gmail.com>
Date: Wed, 27 Jun 2018 16:39:22 +0200
Subject: [PATCH] Add new Mektoub type used for new pets companions

--HG--
branch : patches-from-atys
---
 code/ryzom/common/src/game_share/item_type.cpp | 1 +
 code/ryzom/common/src/game_share/item_type.h   | 1 +
 code/ryzom/common/src/game_share/people.h      | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/ryzom/common/src/game_share/item_type.cpp b/code/ryzom/common/src/game_share/item_type.cpp
index ac29cb1e3..ef21b3850 100644
--- a/code/ryzom/common/src/game_share/item_type.cpp
+++ b/code/ryzom/common/src/game_share/item_type.cpp
@@ -88,6 +88,7 @@ namespace ITEM_TYPE
 		{ "CAMPSFIRE", CAMPSFIRE },
 		{ "MEKTOUB_PACKER_TICKET", MEKTOUB_PACKER_TICKET },
 		{ "MEKTOUB_MOUNT_TICKET", MEKTOUB_MOUNT_TICKET },
+		{ "ANIMAL_TICKET", ANIMAL_TICKET },
 		{ "FOOD", FOOD },
 		{ "MAGICIAN_STAFF", MAGICIAN_STAFF },
 		{ "HAIR_MALE", HAIR_MALE },
diff --git a/code/ryzom/common/src/game_share/item_type.h b/code/ryzom/common/src/game_share/item_type.h
index a0efb811d..e32e86905 100644
--- a/code/ryzom/common/src/game_share/item_type.h
+++ b/code/ryzom/common/src/game_share/item_type.h
@@ -83,6 +83,7 @@ namespace ITEM_TYPE
 		CAMPSFIRE,
 		MEKTOUB_PACKER_TICKET,
 		MEKTOUB_MOUNT_TICKET,
+		ANIMAL_TICKET,
 		FOOD,
 		MAGICIAN_STAFF,
 		HAIR_MALE,
diff --git a/code/ryzom/common/src/game_share/people.h b/code/ryzom/common/src/game_share/people.h
index 69c515a13..65cc92d64 100644
--- a/code/ryzom/common/src/game_share/people.h
+++ b/code/ryzom/common/src/game_share/people.h
@@ -85,11 +85,12 @@ inline uint8 getCivilisationId(CPeople::TPeople people)
 	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 )
 {
  	switch ( peopleType )
  	{
+	case CPeople::Creature: return 3;
  	case CPeople::MektoubPacker: return 2;
  	case CPeople::MektoubMount: return 1;
  	default: return 0;