diff --git a/code/ryzom/common/src/game_share/action_sint64.cpp b/code/ryzom/common/src/game_share/action_sint64.cpp index 6cc00deda..cbdeb1e06 100644 --- a/code/ryzom/common/src/game_share/action_sint64.cpp +++ b/code/ryzom/common/src/game_share/action_sint64.cpp @@ -73,7 +73,7 @@ void CActionSint64::registerNumericPropertiesRyzom() CActionSint64::registerNumericProperty( PROPERTY_GUILD_NAME_ID, 32 ); CActionSint64::registerNumericProperty( PROPERTY_EVENT_FACTION_ID, 32 ); CActionSint64::registerNumericProperty( PROPERTY_PVP_MODE, PVP_MODE::NbBits ); - CActionSint64::registerNumericProperty( PROPERTY_PVP_CLAN, PVP_CLAN::NbBits ); + CActionSint64::registerNumericProperty( PROPERTY_PVP_CLAN, 32 ); CActionSint64::registerNumericProperty( PROPERTY_OWNER_PEOPLE, 3 ); // 4 races and unknow CActionSint64::registerNumericProperty( PROPERTY_OUTPOST_INFOS, 16 ); // 15+1 } diff --git a/code/ryzom/common/src/game_share/dyn_chat.h b/code/ryzom/common/src/game_share/dyn_chat.h index 8cc5b8bdc..37b53588c 100644 --- a/code/ryzom/common/src/game_share/dyn_chat.h +++ b/code/ryzom/common/src/game_share/dyn_chat.h @@ -33,6 +33,7 @@ typedef NLMISC::CEntityId TChanID; // tag for invalid channel const TChanID DYN_CHAT_INVALID_CHAN = NLMISC::CEntityId::Unknown; +const std::string DYN_CHAT_INVALID_NAME; /// Message payload for player input forward to channel service owner diff --git a/code/ryzom/common/src/game_share/item_family.cpp b/code/ryzom/common/src/game_share/item_family.cpp index f0cfbf9e6..47f3782b5 100644 --- a/code/ryzom/common/src/game_share/item_family.cpp +++ b/code/ryzom/common/src/game_share/item_family.cpp @@ -107,6 +107,7 @@ namespace ITEMFAMILY fam == SHIELD || fam == JEWELRY || fam == CRYSTALLIZED_SPELL || + fam == CONSUMABLE || fam == ITEM_SAP_RECHARGE; } diff --git a/code/ryzom/common/src/game_share/item_type.cpp b/code/ryzom/common/src/game_share/item_type.cpp index 028240ebc..5b8c8e3e2 100644 --- a/code/ryzom/common/src/game_share/item_type.cpp +++ b/code/ryzom/common/src/game_share/item_type.cpp @@ -97,6 +97,7 @@ namespace ITEM_TYPE { "HAIRCOLOR_FEMALE", HAIRCOLOR_FEMALE }, { "TATOO_FEMALE", TATOO_FEMALE }, { "SERVICE_STABLE", SERVICE_STABLE }, + { "JOB_ELEMENT", JOB_ELEMENT }, { "GENERIC", GENERIC }, }; diff --git a/code/ryzom/common/src/game_share/item_type.h b/code/ryzom/common/src/game_share/item_type.h index 9b6c3947d..c9a94d661 100644 --- a/code/ryzom/common/src/game_share/item_type.h +++ b/code/ryzom/common/src/game_share/item_type.h @@ -92,6 +92,7 @@ namespace ITEM_TYPE HAIRCOLOR_FEMALE, TATOO_FEMALE, SERVICE_STABLE, + JOB_ELEMENT, GENERIC, UNDEFINED, diff --git a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h index 20c3fe238..0aab0b870 100644 --- a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h +++ b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h @@ -139,7 +139,7 @@ void initRyzomVisualPropertyIndices( CMirroredDataSet& dataset ); #define TYPE_EVENT_FACTION_ID uint32 #define TYPE_PVP_MODE uint8 -#define TYPE_PVP_CLAN uint8 +#define TYPE_PVP_CLAN uint32 #define TYPE_FUEL bool