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

Regenerate sources

Browse Source
feature/core4-atys
kaetemi 3 years ago
parent ecf990f8ae
commit 0b449bb95a
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC
10 changed files with 301 additions and 335 deletions
Show Stats Download Patch File Download Diff File

1
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
//

111
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
//
@ -34,13 +35,13 @@
#include "nel/misc/entity_id.h"
#include "game_share/r2_basic_types.h"
#include "r2_share/r2_basic_types.h"
#include "game_share/r2_share_itf.h"
#include "r2_share/r2_share_itf.h"
#include "nel/net/login_cookie.h"
#include "game_share/welcome_service_itf.h"
#include "../../nelns/welcome_service/welcome_service_itf.h"
#include "game_share/character_sync_itf.h"
@ -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);
}
}

11
ryzom/server/src/entities_game_service/database_guild.cpp
Unescape Escape View File

@ -16,18 +16,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
/////////////////////////////////////////////////////////////////
//
//
//
//
//
// WARNING : this is a generated file, don't change it !
//
//
//
//
//
//
/////////////////////////////////////////////////////////////////
#include "stdpch.h"

18
ryzom/server/src/entities_game_service/database_guild.h
Unescape Escape View File

@ -1,7 +1,5 @@
#ifndef INCLUDED_database_GUILD_H
#define INCLUDED_database_GUILD_H
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
@ -19,20 +17,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
/////////////////////////////////////////////////////////////////
//
//
//
//
//
// WARNING : this is a generated file, don't change it !
//
//
//
//
//
//
/////////////////////////////////////////////////////////////////
#ifndef INCLUDED_DATABASE__GUILD_H
#define INCLUDED_DATABASE__GUILD_H
#include "nel/misc/string_common.h"
#include "cdb_group.h"
#include "player_manager/cdb.h"
@ -1857,4 +1847,4 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
#endif // INCLUDED_database_GUILD_H
#endif // INCLUDED_DATABASE__GUILD_H

2
ryzom/server/src/entities_game_service/database_outpost.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
//
@ -17,6 +18,7 @@
/////////////////////////////////////////////////////////////////
// WARNING : this is a generated file, don't change it !
/////////////////////////////////////////////////////////////////
#include "stdpch.h"
#include "database_outpost.h"

10
ryzom/server/src/entities_game_service/database_outpost.h
Unescape Escape View File

@ -1,3 +1,5 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
@ -14,13 +16,13 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef INCLUDED_database_OUTPOST_H
#define INCLUDED_database_OUTPOST_H
/////////////////////////////////////////////////////////////////
// WARNING : this is a generated file, don't change it !
/////////////////////////////////////////////////////////////////
#ifndef INCLUDED_DATABASE__OUTPOST_H
#define INCLUDED_DATABASE__OUTPOST_H
#include "nel/misc/string_common.h"
#include "cdb_group.h"
#include "player_manager/cdb.h"
@ -665,4 +667,4 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
#endif // INCLUDED_database_OUTPOST_H
#endif // INCLUDED_DATABASE__OUTPOST_H

11
ryzom/server/src/entities_game_service/database_plr.cpp
Unescape Escape View File

@ -16,18 +16,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
/////////////////////////////////////////////////////////////////
//
//
//
//
//
// WARNING : this is a generated file, don't change it !
//
//
//
//
//
//
/////////////////////////////////////////////////////////////////
#include "stdpch.h"

20
ryzom/server/src/entities_game_service/database_plr.h
Unescape Escape View File

@ -1,7 +1,5 @@
#ifndef INCLUDED_database_PLR_H
#define INCLUDED_database_PLR_H
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
@ -19,20 +17,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
/////////////////////////////////////////////////////////////////
//
//
//
//
//
// WARNING : this is a generated file, don't change it !
//
//
//
//
//
//
/////////////////////////////////////////////////////////////////
#ifndef INCLUDED_DATABASE__PLR_H
#define INCLUDED_DATABASE__PLR_H
#include "nel/misc/string_common.h"
#include "cdb_group.h"
#include "player_manager/cdb.h"
@ -9157,7 +9147,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
{
// Check that the value is not out of database precision
STOP_IF(value > (1<<5)-1, "setSTATUS : Value out of bound : trying to store "<<value<<" in a unsigned field limited to 4 bits");
STOP_IF(value > (1<<5)-1, "setSTATUS : Value out of bound : trying to store "<<value<<" in a unsigned field limited to 5 bits");
_setProp(dbGroup, _STATUS, value, forceSending);
@ -10726,4 +10716,4 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
#endif // INCLUDED_database_PLR_H
#endif // INCLUDED_DATABASE__PLR_H

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

@ -2,9 +2,6 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This source file has been modified by the following contributors:
// Copyright (C) 2019 Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
//
// 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

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

@ -2,9 +2,6 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This source file has been modified by the following contributors:
// Copyright (C) 2019 Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
//
// 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

Write Preview
Loading…
Cancel
Save