merged local changes

code/ryzom/common/src/game_share/continent.cpp

@@ -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)
 

code/ryzom/common/src/game_share/continent.h

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

code/ryzom/server/src/shard_unifier_service/character_sync.cpp

@@ -328,20 +328,20 @@ namespace CHARSYNC
 			{
 				const CONTINENT::TContinentId &cont = first->first;
 				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...

code/ryzom/server/used_continents.cfg

@@ -1,14 +1,12 @@
 // This is the mapping for logical continent to physical one (server_share/used_continent.cpp)
 ContinentNameTranslator =
 {
-	"matis_newbie", "matis",
+//	"terre",        "terre_oubliee",
-	"zorai_newbie", "zorai",
+//	"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",
 };