Deleting tries to delete unused continents - doesn't suffice, weather_everywhere.cpp ask for a different number of continents

q
This commit is contained in:
Yann 2016-02-09 23:36:10 +01:00
parent 5d9508ccf6
commit c76fdbf7db
5 changed files with 73 additions and 19 deletions

View file

@ -29,8 +29,33 @@ using namespace NLMISC;
namespace CONTINENT namespace CONTINENT
{ {
NL_BEGIN_STRING_CONVERSION_TABLE (TContinent) 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(INDOORS)
NL_STRING_CONVERSION_TABLE_ENTRY(NEWBIELAND) 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_STRING_CONVERSION_TABLE_ENTRY(UNKNOWN)
NL_END_STRING_CONVERSION_TABLE(TContinent, ContinentConversion, UNKNOWN) NL_END_STRING_CONVERSION_TABLE(TContinent, ContinentConversion, UNKNOWN)

View file

@ -25,8 +25,34 @@ namespace CONTINENT
{ {
enum TContinent enum TContinent
{ {
INDOORS = 0, 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,
NEWBIELAND, NEWBIELAND,
R2_ROOTS,
R2_DESERT,
R2_LAKES,
R2_FOREST,
R2_JUNGLE,
CORRUPTED_MOOR,
KITINIERE,
UNKNOWN, UNKNOWN,
// NB_RESPAWN_POINT_TYPE = UNKNOWN, // NB_RESPAWN_POINT_TYPE = UNKNOWN,
NB_CONTINENTS = UNKNOWN NB_CONTINENTS = UNKNOWN

View file

@ -137,6 +137,7 @@ UsedPrimitives =
DatasetSizefe_temp = 600000; DatasetSizefe_temp = 600000;
DatasetSizefame = 26000; DatasetSizefame = 26000;
// ---- service custom variables (used by CVariable class) // ---- service custom variables (used by CVariable class)
RingRPEnabled=0; RingRPEnabled=0;

View file

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

View file

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