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

Fix module bitsets and default session values

Browse Source
ryzomclassic-develop
kaetemi 5 years ago committed by Jan Boon
parent 55c3939789
commit ea021e1d96
7 changed files with 590 additions and 522 deletions
Show Stats Download Patch File Download Diff File

76
code/ryzom/common/src/game_share/generate_module_interface.xslt
Unescape Escape View File

@ -20,6 +20,22 @@
<!-- ######################################################### -->
<xsl:template match="generator">
<xsl:if test="$output != 'php'">
// Ryzom - MMORPG Framework &lt;http://dev.ryzom.com/projects/ryzom/&gt;
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
/////////////////////////////////////////////////////////////////
// WARNING : this is a generated file, don't change it !
/////////////////////////////////////////////////////////////////
@ -632,7 +648,7 @@ namespace <xsl:value-of select="@name"/>
<xsl:call-template name="enumGen">
<xsl:with-param name="enumName" select="concat(@name, 'Enum')"/>
</xsl:call-template>
typedef NLMISC::CEnumBitset &lt; <xsl:value-of select="@name"/>Enum, uint32, <xsl:value-of select="@name"/>Enum::invalid_val, ',', NLMISC::TContainedEnum &lt; <xsl:value-of select="@name"/>Enum, uint32 &gt;, <xsl:value-of select="@name"/>Enum::TValues &gt; <xsl:value-of select="@name"/>;
typedef NLMISC::CEnumBitset &lt; <xsl:value-of select="@name"/>Enum, uint32, <xsl:value-of select="@name"/>Enum::max_val, ',', NLMISC::TContainedEnum &lt; <xsl:value-of select="@name"/>Enum, uint32 &gt;, <xsl:value-of select="@name"/>Enum::TValues &gt; <xsl:value-of select="@name"/>;
</xsl:if>
<xsl:if test="not(@bitset='true')">
<xsl:call-template name="enumGen">
@ -668,7 +684,13 @@ namespace <xsl:value-of select="@name"/>
end_of_enum,
</xsl:if>
<!-- generate an invalid and undefined value-->
<xsl:if test="@bitset='true'">
empty_val = 0,
max_val = ((uint32)<xsl:value-of select="item[last()]/@name"/> &lt;&lt; 1) - 1,
</xsl:if>
<xsl:if test="not(@bitset='true')">
invalid_val,
</xsl:if>
<!-- generate a count of node -->
/// Number of enumerated values
nb_enum_items = <xsl:value-of select="count(item)"/>
@ -697,12 +719,16 @@ namespace <xsl:value-of select="@name"/>
{
NL_BEGIN_STRING_CONVERSION_TABLE(TValues)
<xsl:for-each select="item"> NL_STRING_CONVERSION_TABLE_ENTRY(<xsl:value-of select="@name"/>)
</xsl:for-each> NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val)
};
</xsl:for-each>
<xsl:if test="not(@bitset='true')"> NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val)
</xsl:if> };
static NLMISC::CStringConversion&lt;TValues&gt;
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
<xsl:if test="@bitset='true'"> empty_val);
</xsl:if>
<xsl:if test="not(@bitset='true')"> invalid_val);
</xsl:if>
return conversionTable;
}
@ -710,8 +736,10 @@ namespace <xsl:value-of select="@name"/>
public:
<xsl:value-of select="$enumName"/>()
: _Value(invalid_val)
{
<xsl:if test="@bitset='true'"> : _Value(empty_val)
</xsl:if>
<xsl:if test="not(@bitset='true')"> : _Value(invalid_val)
</xsl:if> {
}
<xsl:value-of select="$enumName"/>(TValues value)
: _Value(value)
@ -772,9 +800,9 @@ namespace <xsl:value-of select="@name"/>
// return true if the actual value of the enum is valid, otherwise false
bool isValid()
{
if (_Value == invalid_val)
<xsl:if test="not(@bitset='true')"> if (_Value == invalid_val)
return false;
</xsl:if>
// not invalid, check other enum value
return getConversionTable().isValid(_Value);
}
@ -1682,7 +1710,7 @@ namespace <xsl:value-of select="@name"/>
while (!childs.empty())
{
get<xsl:value-of select="@name"/>ByIndex(childs.size()-1)->remove(connection);
get<xsl:value-of select="@name"/>ByIndex((uint32)childs.size()-1)->remove(connection);
}
}
@ -1886,7 +1914,7 @@ namespace <xsl:value-of select="@name"/>
}
else if (cmd == NOPE::cc_instance_count)
{
return _ObjectCache.size();
return (uint32)_ObjectCache.size();
}
// default return value
@ -1904,7 +1932,7 @@ namespace <xsl:value-of select="@name"/>
TReleasedObject::iterator first(_ReleasedObject.begin()), last(_ReleasedObject.end());
for (; first != last; ++first)
{
nbReleased += first->second.size();
nbReleased += (uint32)first->second.size();
}
nlinfo(" There are %u object instances in cache not referenced (waiting deletion or re-use))", nbReleased);
@ -2117,7 +2145,7 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
return false;
}
std::auto_ptr&lt;MSW::CStoreResult&gt; result = connection.storeResult();
CUniquePtr&lt;MSW::CStoreResult&gt; result = connection.storeResult();
for (uint i=0; i&lt;result->getNumRows(); ++i)
{
@ -2195,7 +2223,7 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
return false;
}
std::auto_ptr&lt;MSW::CStoreResult&gt; result = connection.storeResult();
CUniquePtr&lt;MSW::CStoreResult&gt; result = connection.storeResult();
// check that the data description is consistent with database content
nlassert(result->getNumRows() &lt;= 1);
@ -2300,9 +2328,9 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
}
// no object with this id, return a null pointer
static <xsl:value-of select="@type"/>Ptr nil;
static <xsl:value-of select="@type"/>Ptr nilPtr;
return nil;
return nilPtr;
}
</xsl:when>
@ -2321,8 +2349,8 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
if (it == _<xsl:value-of select="@name"/>->end())
{
// no object with this id, return a null pointer
static <xsl:value-of select="@type"/>Ptr nil;
return nil;
static <xsl:value-of select="@type"/>Ptr nilPtr;
return nilPtr;
}
return const_cast&lt; <xsl:value-of select="@type"/>Ptr &amp; &gt;(it->second);
@ -2383,7 +2411,7 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
protected:
<xsl:if test="not(@extend)">
/// the callback server adaptor
std::auto_ptr&lt;ICallbackServerAdaptor&gt; _CallbackServer;
CUniquePtr&lt;ICallbackServerAdaptor&gt; _CallbackServer;
</xsl:if>
void getCallbakArray(NLNET::TCallbackItem *&amp;arrayPtr, uint32 &amp;arraySize)
{
@ -2430,12 +2458,12 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
if (replacementAdaptor == NULL)
{
// use default callback server
_CallbackServer = std::auto_ptr&lt;ICallbackServerAdaptor&gt;(new CNelCallbackServerAdaptor(this));
_CallbackServer = CUniquePtr&lt;ICallbackServerAdaptor&gt;(new CNelCallbackServerAdaptor(this));
}
else
{
// use the replacement one
_CallbackServer = std::auto_ptr&lt;ICallbackServerAdaptor&gt;(replacementAdaptor);
_CallbackServer = CUniquePtr&lt;ICallbackServerAdaptor&gt;(replacementAdaptor);
}
}
</xsl:if>
@ -2591,7 +2619,7 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
protected:
<xsl:if test="not(@extend)">
/// the callback client adaptor
std::auto_ptr &lt; ICallbackClientAdaptor &gt; _CallbackClient;
CUniquePtr&lt;ICallbackClientAdaptor&gt; _CallbackClient;
</xsl:if>
void getCallbakArray(NLNET::TCallbackItem *&amp;arrayPtr, uint32 &amp;arraySize)
@ -2660,12 +2688,12 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
if (adaptorReplacement == NULL)
{
// use the default Nel adaptor
_CallbackClient = std::auto_ptr &lt; ICallbackClientAdaptor &gt;(new CNelCallbackClientAdaptor(this));
_CallbackClient = CUniquePtr&lt;ICallbackClientAdaptor&gt;(new CNelCallbackClientAdaptor(this));
}
else
{
// use the replacement one
_CallbackClient = std::auto_ptr &lt; ICallbackClientAdaptor &gt;(adaptorReplacement);
_CallbackClient = CUniquePtr&lt;ICallbackClientAdaptor&gt;(adaptorReplacement);
}
}
</xsl:if>

1
code/ryzom/common/src/game_share/ring_session_manager_itf.cpp
Unescape Escape View File

@ -1,3 +1,4 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//

133
code/ryzom/common/src/game_share/ring_session_manager_itf.h
Unescape Escape View File

@ -1,3 +1,4 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
@ -116,7 +117,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -255,7 +257,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -400,7 +403,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -539,7 +543,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -672,7 +677,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -805,7 +811,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -938,7 +945,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -1038,7 +1046,8 @@ namespace RSMGR
lf_e = 16,
lf_f = 32,
invalid_val,
empty_val = 0,
max_val = ((uint32)lf_f << 1) - 1,
/// Number of enumerated values
nb_enum_items = 6
@ -1054,11 +1063,11 @@ namespace RSMGR
NL_STRING_CONVERSION_TABLE_ENTRY(lf_d)
NL_STRING_CONVERSION_TABLE_ENTRY(lf_e)
NL_STRING_CONVERSION_TABLE_ENTRY(lf_f)
NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val)
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
empty_val);
return conversionTable;
}
@ -1067,7 +1076,7 @@ namespace RSMGR
public:
TLevelFilterEnum()
: _Value(invalid_val)
: _Value(empty_val)
{
}
TLevelFilterEnum(TValues value)
@ -1129,8 +1138,6 @@ namespace RSMGR
// return true if the actual value of the enum is valid, otherwise false
bool isValid()
{
if (_Value == invalid_val)
return false;
// not invalid, check other enum value
return getConversionTable().isValid(_Value);
@ -1139,7 +1146,7 @@ namespace RSMGR
};
typedef NLMISC::CEnumBitset < TLevelFilterEnum, uint32, TLevelFilterEnum::invalid_val, ',', NLMISC::TContainedEnum < TLevelFilterEnum, uint32 >, TLevelFilterEnum::TValues > TLevelFilter;
typedef NLMISC::CEnumBitset < TLevelFilterEnum, uint32, TLevelFilterEnum::max_val, ',', NLMISC::TContainedEnum < TLevelFilterEnum, uint32 >, TLevelFilterEnum::TValues > TLevelFilter;
struct TEstimatedDuration
@ -1189,7 +1196,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -1287,7 +1295,8 @@ namespace RSMGR
rf_tryker = 4,
rf_zorai = 8,
invalid_val,
empty_val = 0,
max_val = ((uint32)rf_zorai << 1) - 1,
/// Number of enumerated values
nb_enum_items = 4
@ -1301,11 +1310,11 @@ namespace RSMGR
NL_STRING_CONVERSION_TABLE_ENTRY(rf_matis)
NL_STRING_CONVERSION_TABLE_ENTRY(rf_tryker)
NL_STRING_CONVERSION_TABLE_ENTRY(rf_zorai)
NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val)
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
empty_val);
return conversionTable;
}
@ -1314,7 +1323,7 @@ namespace RSMGR
public:
TRaceFilterEnum()
: _Value(invalid_val)
: _Value(empty_val)
{
}
TRaceFilterEnum(TValues value)
@ -1376,8 +1385,6 @@ namespace RSMGR
// return true if the actual value of the enum is valid, otherwise false
bool isValid()
{
if (_Value == invalid_val)
return false;
// not invalid, check other enum value
return getConversionTable().isValid(_Value);
@ -1386,7 +1393,7 @@ namespace RSMGR
};
typedef NLMISC::CEnumBitset < TRaceFilterEnum, uint32, TRaceFilterEnum::invalid_val, ',', NLMISC::TContainedEnum < TRaceFilterEnum, uint32 >, TRaceFilterEnum::TValues > TRaceFilter;
typedef NLMISC::CEnumBitset < TRaceFilterEnum, uint32, TRaceFilterEnum::max_val, ',', NLMISC::TContainedEnum < TRaceFilterEnum, uint32 >, TRaceFilterEnum::TValues > TRaceFilter;
struct TReligionFilterEnum
@ -1397,7 +1404,8 @@ namespace RSMGR
rf_karavan = 2,
rf_neutral = 4,
invalid_val,
empty_val = 0,
max_val = ((uint32)rf_neutral << 1) - 1,
/// Number of enumerated values
nb_enum_items = 3
@ -1410,11 +1418,11 @@ namespace RSMGR
NL_STRING_CONVERSION_TABLE_ENTRY(rf_kami)
NL_STRING_CONVERSION_TABLE_ENTRY(rf_karavan)
NL_STRING_CONVERSION_TABLE_ENTRY(rf_neutral)
NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val)
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
empty_val);
return conversionTable;
}
@ -1423,7 +1431,7 @@ namespace RSMGR
public:
TReligionFilterEnum()
: _Value(invalid_val)
: _Value(empty_val)
{
}
TReligionFilterEnum(TValues value)
@ -1485,8 +1493,6 @@ namespace RSMGR
// return true if the actual value of the enum is valid, otherwise false
bool isValid()
{
if (_Value == invalid_val)
return false;
// not invalid, check other enum value
return getConversionTable().isValid(_Value);
@ -1495,7 +1501,7 @@ namespace RSMGR
};
typedef NLMISC::CEnumBitset < TReligionFilterEnum, uint32, TReligionFilterEnum::invalid_val, ',', NLMISC::TContainedEnum < TReligionFilterEnum, uint32 >, TReligionFilterEnum::TValues > TReligionFilter;
typedef NLMISC::CEnumBitset < TReligionFilterEnum, uint32, TReligionFilterEnum::max_val, ',', NLMISC::TContainedEnum < TReligionFilterEnum, uint32 >, TReligionFilterEnum::TValues > TReligionFilter;
struct TGuildFilter
@ -1542,7 +1548,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -1666,11 +1673,13 @@ namespace RSMGR
sf_shard28 = 1<<28,
sf_shard29 = 1<<29,
sf_shard30 = 1<<30,
sf_shard31 = 1<<31,
invalid_val,
empty_val = 0,
max_val = ((uint32)sf_shard31 << 1) - 1,
/// Number of enumerated values
nb_enum_items = 31
nb_enum_items = 32
};
@ -1708,11 +1717,12 @@ namespace RSMGR
NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard28)
NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard29)
NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard30)
NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val)
NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard31)
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
empty_val);
return conversionTable;
}
@ -1721,7 +1731,7 @@ namespace RSMGR
public:
TShardFilterEnum()
: _Value(invalid_val)
: _Value(empty_val)
{
}
TShardFilterEnum(TValues value)
@ -1783,8 +1793,6 @@ namespace RSMGR
// return true if the actual value of the enum is valid, otherwise false
bool isValid()
{
if (_Value == invalid_val)
return false;
// not invalid, check other enum value
return getConversionTable().isValid(_Value);
@ -1793,7 +1801,7 @@ namespace RSMGR
};
typedef NLMISC::CEnumBitset < TShardFilterEnum, uint32, TShardFilterEnum::invalid_val, ',', NLMISC::TContainedEnum < TShardFilterEnum, uint32 >, TShardFilterEnum::TValues > TShardFilter;
typedef NLMISC::CEnumBitset < TShardFilterEnum, uint32, TShardFilterEnum::max_val, ',', NLMISC::TContainedEnum < TShardFilterEnum, uint32 >, TShardFilterEnum::TValues > TShardFilter;
// Info about a running session in a DSS
/////////////////////////////////////////////////////////////////
// WARNING : this is a generated file, don't change it !
@ -1942,7 +1950,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -2055,9 +2064,9 @@ namespace RSMGR
// unused interceptors
std::string fwdBuildModuleManifest() const { return std::string(); }
void fwdOnModuleUp(NLNET::IModuleProxy * /* moduleProxy */) {}
void fwdOnModuleDown(NLNET::IModuleProxy * /* moduleProxy */) {}
void fwdOnModuleSecurityChange(NLNET::IModuleProxy * /* moduleProxy */) {}
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
// process module message interceptor
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@ -2221,9 +2230,9 @@ namespace RSMGR
// unused interceptors
std::string fwdBuildModuleManifest() const { return std::string(); }
void fwdOnModuleUp(NLNET::IModuleProxy * /* moduleProxy */) {}
void fwdOnModuleDown(NLNET::IModuleProxy * /* moduleProxy */) {}
void fwdOnModuleSecurityChange(NLNET::IModuleProxy * /* moduleProxy */) {}
void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}
void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
// process module message interceptor
bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@ -3858,7 +3867,7 @@ namespace RSMGR
protected:
/// the callback client adaptor
CUniquePtr < ICallbackClientAdaptor > _CallbackClient;
CUniquePtr<ICallbackClientAdaptor> _CallbackClient;
void getCallbakArray(NLNET::TCallbackItem *&arrayPtr, uint32 &arraySize)
@ -3922,12 +3931,12 @@ namespace RSMGR
if (adaptorReplacement == NULL)
{
// use the default Nel adaptor
_CallbackClient = CUniquePtr < ICallbackClientAdaptor >(new CNelCallbackClientAdaptor(this));
_CallbackClient = CUniquePtr<ICallbackClientAdaptor>(new CNelCallbackClientAdaptor(this));
}
else
{
// use the replacement one
_CallbackClient = CUniquePtr < ICallbackClientAdaptor >(adaptorReplacement);
_CallbackClient = CUniquePtr<ICallbackClientAdaptor>(adaptorReplacement);
}
}
@ -5931,13 +5940,13 @@ namespace RSMGR
// The invited char id is deducted from the name by using.
// the full name rules for shard resolution.
// Return invoke_result with the following error codes :
// 0 : no error
// 100 : unknown onwer char
// 101 : player already invited
// 102 : no current session
// 103 : internal error
// 104 : invited char not found
// plus all the error code from inviteCharacter in the ring session manager interface
// 0 : no error
// 100 : unknown onwer char
// 101 : player already invited
// 102 : no current session
// 103 : internal error
// 104 : invited char not found
// plus all the error code from inviteCharacter in the ring session manager interface
virtual void on_inviteCharacterByName(NLNET::TSockId from, uint32 charId, std::string invitedCharName) =0;
// Ask for character existing rating for the current session scenario
@ -6132,13 +6141,13 @@ namespace RSMGR
// The invited char id is deducted from the name by using.
// the full name rules for shard resolution.
// Return invoke_result with the following error codes :
// 0 : no error
// 100 : unknown onwer char
// 101 : player already invited
// 102 : no current session
// 103 : internal error
// 104 : invited char not found
// plus all the error code from inviteCharacter in the ring session manager interface
// 0 : no error
// 100 : unknown onwer char
// 101 : player already invited
// 102 : no current session
// 103 : internal error
// 104 : invited char not found
// plus all the error code from inviteCharacter in the ring session manager interface
void inviteCharacterByName(uint32 charId, std::string invitedCharName)
{

6
code/ryzom/common/src/game_share/ring_session_manager_itf.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<generator header_tag="RING_SESSION_MANAGER_ITF">
<include file="nel/misc/entity_id.h"/>
<include file="r2_share/r2_basic_types.h"/>
<include file="r2_share/r2_share_itf.h"/>
<include file="game_share/r2_basic_types.h"/>
<include file="game_share/r2_share_itf.h"/>
<include file="nel/net/login_cookie.h"/>
<include file="../../nelns/welcome_service/welcome_service_itf.h"/>
<include file="game_share/welcome_service_itf.h"/>
<include file="game_share/character_sync_itf.h"/>
<include file="game_share/security_check.h"/>
<cpp-include file="stdpch.h"/>

39
code/ryzom/server/src/shard_unifier_service/database_mapping.cpp
Unescape Escape View File

@ -1,3 +1,4 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
@ -578,7 +579,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -638,7 +639,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -1230,7 +1231,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -1288,7 +1289,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -1992,7 +1993,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -2082,7 +2083,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -3940,7 +3941,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -4092,7 +4093,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -5435,7 +5436,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -6105,7 +6106,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -6155,7 +6156,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -6748,7 +6749,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -6808,7 +6809,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -7378,7 +7379,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -7965,7 +7966,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -8637,7 +8638,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -8687,7 +8688,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -9909,7 +9910,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
for (uint i=0; i<result->getNumRows(); ++i)
{
@ -10453,7 +10454,7 @@ namespace RSMGR
return false;
}
CUniquePtr<MSW::CStoreResult> result(connection.storeResult());
CUniquePtr<MSW::CStoreResult> result = connection.storeResult();
// check that the data description is consistent with database content
nlassert(result->getNumRows() <= 1);

67
code/ryzom/server/src/shard_unifier_service/database_mapping.h
Unescape Escape View File

@ -1,3 +1,4 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
@ -111,9 +112,9 @@ namespace RSMGR
CKnownUserPtr()
: _FileName(NULL),
_LineNum(0),
_Ptr(NULL),
_NextPtr(NULL),
_PrevPtr(NULL),
_Ptr(NULL)
_PrevPtr(NULL)
{
}
@ -1091,9 +1092,9 @@ namespace RSMGR
CGuildInvitePtr()
: _FileName(NULL),
_LineNum(0),
_Ptr(NULL),
_NextPtr(NULL),
_PrevPtr(NULL),
_Ptr(NULL)
_PrevPtr(NULL)
{
}
@ -1231,9 +1232,9 @@ namespace RSMGR
CPlayerRatingPtr()
: _FileName(NULL),
_LineNum(0),
_Ptr(NULL),
_NextPtr(NULL),
_PrevPtr(NULL),
_Ptr(NULL)
_PrevPtr(NULL)
{
}
@ -1371,9 +1372,9 @@ namespace RSMGR
CJournalEntryPtr()
: _FileName(NULL),
_LineNum(0),
_Ptr(NULL),
_NextPtr(NULL),
_PrevPtr(NULL),
_Ptr(NULL)
_PrevPtr(NULL)
{
}
@ -2233,7 +2234,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -2369,7 +2371,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -3732,7 +3735,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -3868,7 +3872,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -4001,7 +4006,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -4134,7 +4140,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -4273,7 +4280,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -4989,7 +4997,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -5122,7 +5131,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -5903,7 +5913,24 @@ namespace RSMGR
_SessionId(NOPE::INVALID_OBJECT_ID)
{
// Default initialisation
_SessionType = TSessionType::st_edit;
_OwnerId = 0;
_PlanDate = 0;
_StartDate = 0;
_Orientation = TSessionOrientation::so_other;
_Level = R2::TSessionLevel::sl_a;
_RuleType = TRuleType::rt_strict;
_AccessType = TAccessType::at_private;
_State = TSessionState::ss_planned;
_HostShardId = 0;
_SubscriptionSlots = 0;
_ReservedSlots = 0;
_EstimatedDuration = TEstimatedDuration::et_short;
_FinalDuration = 0;
_FolderId = 0;
_AnimMode = TAnimMode::am_dm;
_GuildFilter = TGuildFilter::gf_only_my_guild;
_SubscriptionClosed = 0;
_Newcomer = 1;
_SessionParticipants = NULL;
_GuildInvites = NULL;
@ -6131,7 +6158,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}
@ -7374,7 +7402,8 @@ namespace RSMGR
};
static NLMISC::CStringConversion<TValues>
conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table)
/ sizeof(TValues_nl_string_conversion_table[0]), invalid_val);
/ sizeof(TValues_nl_string_conversion_table[0]),
invalid_val);
return conversionTable;
}

44
code/ryzom/server/src/shard_unifier_service/database_mapping.xml
Unescape Escape View File

@ -173,33 +173,33 @@
<parent class="CFolder" child_name="Sessions" relation="one-to-many" db_col="folder_id" cont="vector"/>
<property type="TSessionId" name="SessionId" db_col="session_id" unique_id="true" autogen="true"/>
<property type="TSessionType" name="SessionType" db_col="session_type" enum="true"/>
<property type="TSessionType" name="SessionType" db_col="session_type" enum="true" default="TSessionType::st_edit"/>
<property type="std::string" name="Title" db_col="title" byref="true"/>
<property type="uint32" name="OwnerId" db_col="owner" />
<property type="uint32" name="PlanDate" db_col="plan_date" date="true"/>
<property type="uint32" name="StartDate" db_col="start_date" date="true"/>
<property type="uint32" name="OwnerId" db_col="owner" default="0"/>
<property type="uint32" name="PlanDate" db_col="plan_date" date="true" default="0"/>
<property type="uint32" name="StartDate" db_col="start_date" date="true" default="0"/>
<property type="std::string" name="Description" db_col="description" byref="true"/>
<property type="TSessionOrientation" name="Orientation" db_col="orientation" enum="true"/>
<property type="R2::TSessionLevel" name="Level" db_col="level" enum="true"/>
<property type="TRuleType" name="RuleType" db_col="rule_type" enum="true"/>
<property type="TSessionOrientation" name="Orientation" db_col="orientation" enum="true" default="TSessionOrientation::so_other"/>
<property type="R2::TSessionLevel" name="Level" db_col="level" enum="true" default="R2::TSessionLevel::sl_a"/>
<property type="TRuleType" name="RuleType" db_col="rule_type" enum="true" default="TRuleType::rt_strict"/>
<property type="TAccessType" name="AccessType" db_col="access_type" enum="true" default="TAccessType::at_private"/>
<property type="TSessionState" name="State" db_col="state" enum="true"/>
<property type="uint32" name="HostShardId" db_col="host_shard_id"/>
<property type="uint32" name="SubscriptionSlots" db_col="subscription_slots" />
<property type="uint32" name="ReservedSlots" db_col="reserved_slots" />
<property type="TEstimatedDuration" name="EstimatedDuration" db_col="estimated_duration" enum="true"/>
<property type="uint32" name="FinalDuration" db_col="final_duration" />
<property type="uint32" name="FolderId" db_col="folder_id" />
<property type="TSessionState" name="State" db_col="state" enum="true" default="TSessionState::ss_planned"/>
<property type="uint32" name="HostShardId" db_col="host_shard_id" default="0"/>
<property type="uint32" name="SubscriptionSlots" db_col="subscription_slots" default="0"/>
<property type="uint32" name="ReservedSlots" db_col="reserved_slots" default="0"/>
<property type="TEstimatedDuration" name="EstimatedDuration" db_col="estimated_duration" enum="true" default="TEstimatedDuration::et_short"/>
<property type="uint32" name="FinalDuration" db_col="final_duration" default="0"/>
<property type="uint32" name="FolderId" db_col="folder_id" default="0"/>
<property type="std::string" name="Lang" db_col="lang" byref="true"/>
<property type="std::string" name="Icone" db_col="icone" byref="true"/>
<property type="TAnimMode" name="AnimMode" db_col="anim_mode" enum="smart"/>
<property type="TRaceFilter" name="RaceFilter" db_col="race_filter" enum="smart"/>
<property type="TReligionFilter" name="ReligionFilter" db_col="religion_filter" enum="smart"/>
<property type="TGuildFilter" name="GuildFilter" db_col="guild_filter" enum="smart"/>
<property type="TShardFilter" name="ShardFilter" db_col="shard_filter" enum="smart"/>
<property type="TLevelFilter" name="LevelFilter" db_col="level_filter" enum="smart"/>
<property type="bool" name="SubscriptionClosed" db_col="subscription_closed" />
<property type="bool" name="Newcomer" db_col="newcomer" default="1"/>
<property type="TAnimMode" name="AnimMode" db_col="anim_mode" enum="smart" default="TAnimMode::am_dm"/>
<property type="TRaceFilter" name="RaceFilter" db_col="race_filter" enum="smart"/> <!-- FIXME -->
<property type="TReligionFilter" name="ReligionFilter" db_col="religion_filter" enum="smart"/> <!-- FIXME -->
<property type="TGuildFilter" name="GuildFilter" db_col="guild_filter" enum="smart" default="TGuildFilter::gf_only_my_guild"/>
<property type="TShardFilter" name="ShardFilter" db_col="shard_filter" enum="smart"/> <!-- FIXME -->
<property type="TLevelFilter" name="LevelFilter" db_col="level_filter" enum="smart"/> <!-- FIXME -->
<property type="bool" name="SubscriptionClosed" db_col="subscription_closed" default="0"/>
<property type="bool" name="Newcomer" db_col="newcomer" default="1"/>
<!-- <child_class type="CScenarioDesc" name="ScenarioDesc" relation="one-to-one" on-delete="cascade"/>-->
<child_class type="CSessionParticipant" name="SessionParticipants" relation="one-to-many" cont="vector" on-delete="cascade"/>

Write Preview
Loading…
Cancel
Save