Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge branch 'generic-gameplay'

Browse Source
feature/prepare-cross-merge
Ulukyn 5 years ago committed by kaetemi
parent d3b2e1f4b5
commit 1a6b197411
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File

3
ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp
Unescape Escape View File

@ -575,5 +575,8 @@ static CISPFeedAnimal * ISPFeedAnimal1 = new CISPFeedAnimal(ITEM_SERVICE_TYPE:
static CISPFeedAnimal * ISPFeedAnimal2 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal2, 2); static CISPFeedAnimal * ISPFeedAnimal2 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal2, 2);
static CISPFeedAnimal * ISPFeedAnimal3 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal3, 3); static CISPFeedAnimal * ISPFeedAnimal3 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal3, 3);
static CISPFeedAnimal * ISPFeedAnimal4 = new CISPFeedAnimal(ITEM_SERVICE_TYPE::StableFeedAnimal4, 4); 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 CISPFeedAllAnimals * ISPFeedAllAnimals = new CISPFeedAllAnimals;
static CISPSpeedUpDPLoss * ISPSpeedUpDPLoss = new CISPSpeedUpDPLoss; static CISPSpeedUpDPLoss * ISPSpeedUpDPLoss = new CISPSpeedUpDPLoss;

3
ryzom/server/src/server_share/item_service_type.cpp
Unescape Escape View File

@ -30,6 +30,9 @@ namespace ITEM_SERVICE_TYPE
NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal2) NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal2)
NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal3) NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal3)
NL_STRING_CONVERSION_TABLE_ENTRY(StableFeedAnimal4) 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(StableFeedAllAnimals)
NL_STRING_CONVERSION_TABLE_ENTRY(SpeedUpDPLoss) NL_STRING_CONVERSION_TABLE_ENTRY(SpeedUpDPLoss)
NL_END_STRING_CONVERSION_TABLE(TItemServiceType, ItemServiceTypeConversion, Unknown) NL_END_STRING_CONVERSION_TABLE(TItemServiceType, ItemServiceTypeConversion, Unknown)

3
ryzom/server/src/server_share/item_service_type.h
Unescape Escape View File

@ -28,6 +28,9 @@ namespace ITEM_SERVICE_TYPE
StableFeedAnimal2, StableFeedAnimal2,
StableFeedAnimal3, StableFeedAnimal3,
StableFeedAnimal4, StableFeedAnimal4,
StableFeedAnimal5,
StableFeedAnimal6,
StableFeedAnimal7,
StableFeedAllAnimals, StableFeedAllAnimals,
SpeedUpDPLoss, SpeedUpDPLoss,

Write Preview
Loading…
Cancel
Save