aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-27 01:26:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged local changes

Browse source
This commit is contained in:
SIELA1915 2016-02-09 23:12:25 +01:00
commit af55112ebf
4 changed files with 18 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
code/ryzom/common/src/game_share/continent.cpp
View file

@ -29,33 +29,8 @@ using namespace NLMISC;
namespace CONTINENT
{
NL_BEGIN_STRING_CONVERSION_TABLE (TContinent)
NL_STRING_CONVERSION_TABLE_ENTRY(FYROS)
NL_STRING_CONVERSION_TABLE_ENTRY(ZORAI)
NL_STRING_CONVERSION_TABLE_ENTRY(TRYKER)
NL_STRING_CONVERSION_TABLE_ENTRY(MATIS)
NL_STRING_CONVERSION_TABLE_ENTRY(BAGNE)
NL_STRING_CONVERSION_TABLE_ENTRY(NEXUS)
NL_STRING_CONVERSION_TABLE_ENTRY(ROUTE_GOUFFRE)
NL_STRING_CONVERSION_TABLE_ENTRY(SOURCES)
NL_STRING_CONVERSION_TABLE_ENTRY(TERRE)
NL_STRING_CONVERSION_TABLE_ENTRY(FYROS_ISLAND)
NL_STRING_CONVERSION_TABLE_ENTRY(FYROS_NEWBIE)
NL_STRING_CONVERSION_TABLE_ENTRY(TRYKER_ISLAND)
NL_STRING_CONVERSION_TABLE_ENTRY(TRYKER_NEWBIE)
NL_STRING_CONVERSION_TABLE_ENTRY(ZORAI_NEWBIE)
NL_STRING_CONVERSION_TABLE_ENTRY(MATIS_NEWBIE)
NL_STRING_CONVERSION_TABLE_ENTRY(ZORAI_ISLAND)
NL_STRING_CONVERSION_TABLE_ENTRY(MATIS_ISLAND)
NL_STRING_CONVERSION_TABLE_ENTRY(TESTROOM)
NL_STRING_CONVERSION_TABLE_ENTRY(INDOORS)
NL_STRING_CONVERSION_TABLE_ENTRY(NEWBIELAND)
NL_STRING_CONVERSION_TABLE_ENTRY(R2_ROOTS)
NL_STRING_CONVERSION_TABLE_ENTRY(R2_DESERT)
NL_STRING_CONVERSION_TABLE_ENTRY(R2_LAKES)
NL_STRING_CONVERSION_TABLE_ENTRY(R2_FOREST)
NL_STRING_CONVERSION_TABLE_ENTRY(R2_JUNGLE)
NL_STRING_CONVERSION_TABLE_ENTRY(CORRUPTED_MOOR)
NL_STRING_CONVERSION_TABLE_ENTRY(KITINIERE)
NL_STRING_CONVERSION_TABLE_ENTRY(UNKNOWN)
NL_END_STRING_CONVERSION_TABLE(TContinent, ContinentConversion, UNKNOWN)

28
code/ryzom/common/src/game_share/continent.h
View file

@ -25,34 +25,8 @@ namespace CONTINENT
{
enum TContinent
{
FYROS = 0,
ZORAI,
TRYKER,
MATIS,
BAGNE,
NEXUS,
ROUTE_GOUFFRE,
SOURCES,
TERRE,
FYROS_ISLAND,
FYROS_NEWBIE,
TRYKER_ISLAND,
TRYKER_NEWBIE,
ZORAI_ISLAND,
MATIS_ISLAND,
ZORAI_NEWBIE,
MATIS_NEWBIE,
TESTROOM,
INDOORS,
INDOORS = 0,
NEWBIELAND,
R2_ROOTS,
R2_DESERT,
R2_LAKES,
R2_FOREST,
R2_JUNGLE,
CORRUPTED_MOOR,
KITINIERE,
UNKNOWN,
// NB_RESPAWN_POINT_TYPE = UNKNOWN,
NB_CONTINENTS = UNKNOWN

28
code/ryzom/server/src/shard_unifier_service/character_sync.cpp
View file

@ -328,20 +328,20 @@ namespace CHARSYNC
{
const CONTINENT::TContinentId &cont = first->first;
const uint32 &count = first->second;
if (cont == CONTINENT::FYROS)
access['D'] += count;
else if (cont == CONTINENT::ZORAI)
access['J'] += count;
if (cont == CONTINENT::BAGNE
|| cont == CONTINENT::NEXUS
|| cont == CONTINENT::ROUTE_GOUFFRE
|| cont == CONTINENT::SOURCES
|| cont == CONTINENT::TERRE)
access['P'] += count;
if (cont == CONTINENT::MATIS)
access['F'] += count;
if (cont == CONTINENT::TRYKER)
access['L'] += count;
// if (cont == CONTINENT::FYROS)
// access['D'] += count;
// else if (cont == CONTINENT::ZORAI)
// access['J'] += count;
// if (cont == CONTINENT::BAGNE
// || cont == CONTINENT::NEXUS
// || cont == CONTINENT::ROUTE_GOUFFRE
// || cont == CONTINENT::SOURCES
// || cont == CONTINENT::TERRE)
// access['P'] += count;
// if (cont == CONTINENT::MATIS)
// access['F'] += count;
// if (cont == CONTINENT::TRYKER)
// access['L'] += count;
}
// parse the RingAccessLimits variable and build up a limits map...

8
code/ryzom/server/used_continents.cfg
View file

@ -1,14 +1,12 @@
// This is the mapping for logical continent to physical one (server_share/used_continent.cpp)
ContinentNameTranslator =
{
"matis_newbie", "matis",
"zorai_newbie", "zorai",
"terre", "terre_oubliee",
"sources", "sources_interdites"
// "terre", "terre_oubliee",
// "sources", "sources_interdites"
};
// This is the list of continent to use with their unique instance number (server_share/used_continent.cpp)
UsedContinents =
{
"newbieland", "20",
"newbieland", "2",
};