aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-23 17:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #1135 Merge changes from Ryzom patch 1.10

Browse source
This commit is contained in:
kervala 2010-10-18 19:42:16 +02:00
parent 725daff253
commit e3a648f1ec
6 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/common/src/game_share/action_sint64.cpp
View file

@ -73,7 +73,7 @@ void CActionSint64::registerNumericPropertiesRyzom()
CActionSint64::registerNumericProperty( PROPERTY_GUILD_NAME_ID, 32 ); CActionSint64::registerNumericProperty( PROPERTY_GUILD_NAME_ID, 32 );
CActionSint64::registerNumericProperty( PROPERTY_EVENT_FACTION_ID, 32 ); CActionSint64::registerNumericProperty( PROPERTY_EVENT_FACTION_ID, 32 );
CActionSint64::registerNumericProperty( PROPERTY_PVP_MODE, PVP_MODE::NbBits ); 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_OWNER_PEOPLE, 3 ); // 4 races and unknow
CActionSint64::registerNumericProperty( PROPERTY_OUTPOST_INFOS, 16 ); // 15+1 CActionSint64::registerNumericProperty( PROPERTY_OUTPOST_INFOS, 16 ); // 15+1
} }

1
code/ryzom/common/src/game_share/dyn_chat.h
View file

@ -33,6 +33,7 @@ typedef NLMISC::CEntityId TChanID;
// tag for invalid channel // tag for invalid channel
const TChanID DYN_CHAT_INVALID_CHAN = NLMISC::CEntityId::Unknown; 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 /// Message payload for player input forward to channel service owner

1
code/ryzom/common/src/game_share/item_family.cpp
View file

@ -107,6 +107,7 @@ namespace ITEMFAMILY
fam == SHIELD || fam == SHIELD ||
fam == JEWELRY || fam == JEWELRY ||
fam == CRYSTALLIZED_SPELL || fam == CRYSTALLIZED_SPELL ||
fam == CONSUMABLE ||
fam == ITEM_SAP_RECHARGE; fam == ITEM_SAP_RECHARGE;
} }

1
code/ryzom/common/src/game_share/item_type.cpp
View file

@ -97,6 +97,7 @@ namespace ITEM_TYPE
{ "HAIRCOLOR_FEMALE", HAIRCOLOR_FEMALE }, { "HAIRCOLOR_FEMALE", HAIRCOLOR_FEMALE },
{ "TATOO_FEMALE", TATOO_FEMALE }, { "TATOO_FEMALE", TATOO_FEMALE },
{ "SERVICE_STABLE", SERVICE_STABLE }, { "SERVICE_STABLE", SERVICE_STABLE },
{ "JOB_ELEMENT", JOB_ELEMENT },
{ "GENERIC", GENERIC }, { "GENERIC", GENERIC },
}; };

1
code/ryzom/common/src/game_share/item_type.h
View file

@ -92,6 +92,7 @@ namespace ITEM_TYPE
HAIRCOLOR_FEMALE, HAIRCOLOR_FEMALE,
TATOO_FEMALE, TATOO_FEMALE,
SERVICE_STABLE, SERVICE_STABLE,
JOB_ELEMENT,
GENERIC, GENERIC,
UNDEFINED, UNDEFINED,

2
code/ryzom/common/src/game_share/ryzom_mirror_properties.h
View file

@ -139,7 +139,7 @@ void initRyzomVisualPropertyIndices( CMirroredDataSet& dataset );
#define TYPE_EVENT_FACTION_ID uint32 #define TYPE_EVENT_FACTION_ID uint32
#define TYPE_PVP_MODE uint8 #define TYPE_PVP_MODE uint8
#define TYPE_PVP_CLAN uint8 #define TYPE_PVP_CLAN uint32
#define TYPE_FUEL bool #define TYPE_FUEL bool