From 1a6b19741182ec9cf4e9b5f7863499d30967401a Mon Sep 17 00:00:00 2001 From: Ulukyn Date: Fri, 20 Dec 2019 21:10:13 +0100 Subject: [PATCH] Merge branch 'generic-gameplay' --- .../player_manager/item_service_manager.cpp | 3 +++ ryzom/server/src/server_share/item_service_type.cpp | 3 +++ ryzom/server/src/server_share/item_service_type.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp b/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp index 2644c4f87..9ce9a6d4a 100644 --- a/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp +++ b/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp @@ -575,5 +575,8 @@ static CISPFeedAnimal * ISPFeedAnimal1 = new CISPFeedAnimal(ITEM_SERVICE_TYPE: static CISPFeedAnimal * ISPFeedAnimal2 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal2, 2); static CISPFeedAnimal * ISPFeedAnimal3 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal3, 3); static CISPFeedAnimal * ISPFeedAnimal4 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal4, 4); +static CISPFeedAnimal * ISPFeedAnimal5 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal5, 5); +static CISPFeedAnimal * ISPFeedAnimal6 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal6, 6); +static CISPFeedAnimal * ISPFeedAnimal7 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal7, 7); static CISPFeedAllAnimals * ISPFeedAllAnimals = new CISPFeedAllAnimals; static CISPSpeedUpDPLoss * ISPSpeedUpDPLoss = new CISPSpeedUpDPLoss; diff --git a/ryzom/server/src/server_share/item_service_type.cpp b/ryzom/server/src/server_share/item_service_type.cpp index 60101493e..30ad75c22 100644 --- a/ryzom/server/src/server_share/item_service_type.cpp +++ b/ryzom/server/src/server_share/item_service_type.cpp @@ -30,6 +30,9 @@ namespace ITEM_SERVICE_TYPE NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal2) NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal3) NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal4) + NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal5) + NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal6) + NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal7) NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAllAnimals) NL_STRING_CONVERSION_TABLE_ENTRY(SpeedUpDPLoss) NL_END_STRING_CONVERSION_TABLE(TItemServiceType, ItemServiceTypeConversion, Unknown) diff --git a/ryzom/server/src/server_share/item_service_type.h b/ryzom/server/src/server_share/item_service_type.h index c3b804098..0cd5aca37 100644 --- a/ryzom/server/src/server_share/item_service_type.h +++ b/ryzom/server/src/server_share/item_service_type.h @@ -28,6 +28,9 @@ namespace ITEM_SERVICE_TYPE StableFeedAnimal2, StableFeedAnimal3, StableFeedAnimal4, + StableFeedAnimal5, + StableFeedAnimal6, + StableFeedAnimal7, StableFeedAllAnimals, SpeedUpDPLoss,