diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 55e56b012..58ecf36a5 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -16,8 +16,8 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware
FullScreen = 1;
-Width = 1024;
-Height = 768;
+Width = 0;
+Height = 0;
PositionX = 0;
PositionY = 0;
Frequency = 60;
@@ -39,20 +39,15 @@ Gamma_max = 1.0;
// NETWORK //
/////////////
-Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
+Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
-PatchServer = "";
-PatchWanted = 0;
-SignUpURL = "";
-StartupHost = "shard.ryzomcore.org:40916";
+PatchServer = "http://dl.ryzom.com/patch_live";
+SignUpURL = "http://www.ryzom.com/subscribe";
+StartupHost = "shard.ryzom.com:40916";
StartupPage = "/login/r2_login.php";
-InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php";
-CreateAccountURL = "http://shard.ryzomcore.org/ams/?page=register";
-EditAccountURL = "http://shard.ryzomcore.org/ams/?page=settings";
-ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html";
-ForgetPwdURL = "http://shard.ryzomcore.org/ams/?page=forgot_password";
-LoginSupportURL = "https://plus.google.com/u/0/communities/103798956862568269036";
-InstallWebPage = "";
+InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
+CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
+InstallWebPage = "http://dl.ryzom.com/installer/";
////////////////
@@ -84,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml",
};
-TexturesInterface = "texture_interfaces_v3";
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
-
-
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@@ -130,24 +121,24 @@ AutoEquipTool = 1;
// *** LANDSCAPE
-LandscapeTileNear = 50.000000;
-LandscapeTileNear_min = 20.000000;
-LandscapeTileNear_max = 100.000000;
-LandscapeTileNear_step = 10.0;
-LandscapeTileNear_ps0 = 20.0;
-LandscapeTileNear_ps1 = 40.0;
-LandscapeTileNear_ps2 = 50.0;
-LandscapeTileNear_ps3 = 80.0;
+LandscapeTileNear = 150.000000;
+LandscapeTileNear_min = 20.000000;
+LandscapeTileNear_max = 250.000000;
+LandscapeTileNear_step = 10.0;
+LandscapeTileNear_ps0 = 20.0;
+LandscapeTileNear_ps1 = 100.0;
+LandscapeTileNear_ps2 = 150.0;
+LandscapeTileNear_ps3 = 200.0;
// NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible
-LandscapeThreshold = 1000.0;
-LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold
-LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold
-LandscapeThreshold_step = 100.0;
-LandscapeThreshold_ps0 = 100.0;
-LandscapeThreshold_ps1 = 500.0;
-LandscapeThreshold_ps2 = 1000.0;
-LandscapeThreshold_ps3 = 2000.0;
+LandscapeThreshold = 2000.0;
+LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold
+LandscapeThreshold_max = 4000.0; // High quality => 0.0005 threshold
+LandscapeThreshold_step = 100.0;
+LandscapeThreshold_ps0 = 100.0;
+LandscapeThreshold_ps1 = 1000.0;
+LandscapeThreshold_ps2 = 2000.0;
+LandscapeThreshold_ps3 = 3000.0;
Vision = 500.000000;
Vision_min = 200.000000;
@@ -220,7 +211,7 @@ FXAA_ps1 = 1;
FXAA_ps2 = 1;
FXAA_ps3 = 1;
-Bloom = 0;
+Bloom = 1;
Bloom_ps0 = 0;
Bloom_ps1 = 1;
Bloom_ps2 = 1;
@@ -280,7 +271,7 @@ DivideTextureSizeBy2= 0; // Divide texture size
DisableVtxProgram = 0; // Disable Hardware Vertex Program.
DisableVtxAGP = 0; // Disable Hardware Vertex AGP.
DisableTextureShdr = 0; // Disable Hardware Texture Shader.
-HDEntityTexture = 0;
+HDEntityTexture = 1;
HDTextureInstalled = 1;
WaitVBL = 0; // 0 or 1 to wait Vertical Sync.
@@ -339,7 +330,8 @@ SoundGameMusicVolume_max = 1.0;
SoundGameMusicVolume_step = 0.001;
// MISC
-PreDataPath = { "user", "patch", "data", "examples" };
+PreDataPath = { "user", "patch", "examples", "data/fonts", "data/gamedev.bnp" };
+DataPath = { "data" };
NeedComputeVS = 0;
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
@@ -353,7 +345,7 @@ ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both s
// Read : "ID", "R G B A MODE [FX]"
SystemInfoColors =
-{
+{
// OLD STUFF Here for compatibility
"RG", "0 0 0 255 normal", // Black to see when there is an error
"BC", "0 0 0 255 normal", // Black to see when there is an error
@@ -419,7 +411,7 @@ PrintfCommandsFreeTrial = {
DisplayMissingAnimFile = 0;
-LoadingStringCount = 0;
+LoadingStringCount = 54;
// Some R2 parameters ...
diff --git a/code/ryzom/client/client_default.cfg.in b/code/ryzom/client/client_default.cfg.in
index ec699fe14..4e4a8563b 100644
--- a/code/ryzom/client/client_default.cfg.in
+++ b/code/ryzom/client/client_default.cfg.in
@@ -15,7 +15,7 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware
-FullScreen = 1;
+FullScreen = 0;
Width = 1024;
Height = 768;
PositionX = 0;
@@ -39,16 +39,15 @@ Gamma_max = 1.0;
// NETWORK //
/////////////
-Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
+Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
-PatchServer = "";
-PatchWanted = 0;
-SignUpURL = "";
-StartupHost = "open.ryzom.com:40916";
+PatchServer = "http://dl.ryzom.com/patch_live";
+SignUpURL = "http://www.ryzom.com/subscribe";
+StartupHost = "shard.ryzom.com:40916";
StartupPage = "/login/r2_login.php";
-InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php";
-CreateAccountURL = "";
-InstallWebPage = "";
+InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
+CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
+InstallWebPage = "http://dl.ryzom.com/installer/";
////////////////
@@ -80,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml",
};
-TexturesInterface = "texture_interfaces_v3";
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
-
-
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@@ -483,7 +478,7 @@ XMLR2EDInterfaceFiles =
{
"r2ed.xml",
"r2_triggers.xml",
- "r2_logic_entities.xml",
+ "r2_logic_entities.xml",
"r2ed_acts.xml",
"r2ed_scenario.xml",
"r2ed_connect.xml"
@@ -567,14 +562,11 @@ HelpPages =
"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
};
-WebIgMainDomain = "atys.ryzom.com";
-
-WebIgTrustedDomains =
-{
- "atys.ryzom.com"
+WebIgMainDomain = "app.ryzom.com";
+WebIgTrustedDomains = {
+ "api.ryzom.com", "app.ryzom.com"
};
-
-PatchletUrl = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
+PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload";
SelectedSlot = 0;
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml
index edfb8c19e..39cfb1af4 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml
@@ -863,10 +863,8 @@
-
+ value="http://app.ryzom.com/ticket_system/index.php?mode=load" />
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/code/ryzom/client/macosx/installscript_osx.vdf b/code/ryzom/client/macosx/installscript_osx.vdf
new file mode 100644
index 000000000..4eeace98b
--- /dev/null
+++ b/code/ryzom/client/macosx/installscript_osx.vdf
@@ -0,0 +1,21 @@
+"Installscript"
+{
+ "version" "2"
+ "symlink"
+ {
+ "0"
+ {
+ "link" "Ryzom.app/Contents/Resources/data"
+ "target" "../../../data"
+ }
+ }
+ "chmod"
+ {
+ "0"
+ {
+ "file" "Ryzom.app/Contents/MacOS/Ryzom"
+ "mode" "755"
+ }
+ }
+}
+
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index 610e434ef..9c9724383 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -47,12 +47,24 @@ SOURCE_GROUP("r2" FILES ${SRC_R2})
# on Mac, create a .App Bundle
if(APPLE)
- SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
+ SET(RYZOM_VERSION_SHORT "2.1.0")
+ SET(RYZOM_VERSION_LONG "2.1.0")
+
+ # define directories used by GetRevision
+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
+ SET(ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
+ INCLUDE(GetRevision)
+
+ IF(REVISION)
+ SET(RYZOM_VERSION_LONG "${RYZOM_VERSION_LONG}.${REVISION}")
+ ENDIF()
+
+ SET(MACOSX_BUNDLE_INFO_STRING "Ryzom")
SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
- SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")
- SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${NL_VERSION})
- SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom Core Client")
- SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.8")
+ SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
+ SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION_LONG})
+ SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom")
+ SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION_SHORT})
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
SET(RYZOM_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
@@ -70,6 +82,7 @@ IF(APPLE)
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/ryzom.icns ${RYZOM_RESOURCES_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR})
+ ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/installscript_osx.vdf ${RYZOM_OUTPUT_DIR})
IF(RYZOM_DATA_DIR)
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR})
@@ -114,7 +127,7 @@ ENDIF(APPLE)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
-NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
+NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client")
NL_ADD_RUNTIME_FLAGS(ryzom_client)
NL_ADD_LIB_SUFFIX(ryzom_client)
diff --git a/code/ryzom/client/src/browse_faq.cpp b/code/ryzom/client/src/browse_faq.cpp
index 8311087eb..9f8fcd9b0 100644
--- a/code/ryzom/client/src/browse_faq.cpp
+++ b/code/ryzom/client/src/browse_faq.cpp
@@ -49,11 +49,19 @@ void browseFAQ(NLMISC::CConfigFile &cf)
}
if (url.empty())
{
- // not found
- nlwarning("No FAQ url");
- }
- else
- {
- openURL(url.c_str());
+ // not found ? rely on hardcoded stuff
+ if (nlstricmp(languageCode, "fr") == 0)
+ {
+ url = "http://forums.ryzom.com/forum/showthread.php?t=29130";
+ }
+ else if (nlstricmp(languageCode, "de") == 0)
+ {
+ url = "http://forums.ryzom.com/forum/showthread.php?t=29131";
+ }
+ else
+ {
+ url = "http://forums.ryzom.com/forum/showthread.php?t=29129";
+ }
}
+ openURL(url.c_str());
}
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 7c964904b..bfce130f3 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -325,13 +325,13 @@ CClientConfig::CClientConfig()
TexturesLoginInterface.push_back("texture_interfaces_v3_login");
DisplayAccountButtons = true;
- CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
- ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html";
- EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
- BetaAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
- ForgetPwdURL = "http://shard.ryzomcore.org/ams/index.php?page=forgot_password";
- FreeTrialURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
- LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php";
+ CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
+ ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php";
+ EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php";
+ BetaAccountURL = "http://www.ryzom.com/profile";
+ ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
+ FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1";
+ LoginSupportURL = "http://www.ryzom.com/en/support.html";
Position = CVector(0.f, 0.f, 0.f); // Default Position.
Heading = CVector(0.f, 1.f, 0.f); // Default Heading.
EyesHeight = 1.5f; // Default User Eyes Height.
@@ -426,7 +426,7 @@ CClientConfig::CClientConfig()
PatchVersion.clear();
PatchServer.clear();
- WebIgMainDomain = "shard.ryzomcore.org";
+ WebIgMainDomain = "atys.ryzom.com";
WebIgTrustedDomains.push_back(WebIgMainDomain);
RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php";
@@ -880,14 +880,6 @@ void CClientConfig::setValues()
READ_STRING_DEV(FreeTrialURL)
READ_STRING_DEV(LoginSupportURL)
- READ_STRING_FV(CreateAccountURL)
- READ_STRING_FV(EditAccountURL)
- READ_STRING_FV(ConditionsTermsURL)
- READ_STRING_FV(BetaAccountURL)
- READ_STRING_FV(ForgetPwdURL)
- READ_STRING_FV(FreeTrialURL)
- READ_STRING_FV(LoginSupportURL)
-
#ifndef RZ_NO_CLIENT
// if cookie is not empty, it means that the client was launch
// by the nel_launcher, so it can't be local
@@ -1053,18 +1045,11 @@ void CClientConfig::setValues()
/////////////////////////
// NEW PATCHING SYSTEM //
READ_BOOL_FV(PatchWanted)
- READ_STRING_FV(PatchServer)
- READ_STRING_FV(PatchUrl)
- READ_STRING_FV(PatchVersion)
- READ_STRING_FV(RingReleaseNotePath)
- READ_STRING_FV(ReleaseNotePath)
- READ_BOOL_DEV(PatchWanted)
- READ_STRING_DEV(PatchServer)
READ_STRING_DEV(PatchUrl)
READ_STRING_DEV(PatchVersion)
READ_STRING_DEV(RingReleaseNotePath)
READ_STRING_DEV(ReleaseNotePath)
-
+ READ_STRING_FV(PatchServer)
/////////////////////////
// NEW PATCHLET SYSTEM //
diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp
index 48b970d11..b28d89f36 100644
--- a/code/ryzom/client/src/init_main_loop.cpp
+++ b/code/ryzom/client/src/init_main_loop.cpp
@@ -183,8 +183,8 @@ struct CStatThread : public NLMISC::IRunnable
if(!curl) return;
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
// curl_easy_setopt(curl, CURLOPT_USERAGENT, "unknown");
- curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)"); // FIXME
- curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzomcore.org/" + referer).c_str());
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)");
+ curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzom.com/" + referer).c_str());
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
CURLcode res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
@@ -239,7 +239,7 @@ struct CStatThread : public NLMISC::IRunnable
addParam(params, "page", "");
addParam(params, "pagetitle", referer);
addParam(params, "screen", toString("%dx%d", ClientCfg.ConfigFile.getVar("Width").asInt(), ClientCfg.ConfigFile.getVar("Height").asInt()));
- addParam(params, "referer", "http%3A%2F%2Fwww.ryzomcore.org%2F" + referer);
+ addParam(params, "referer", "http%3A%2F%2Fwww.ryzom.com%2F" + referer);
time_t rawtime;
struct tm * timeinfo;
char buffer [80];
@@ -262,7 +262,7 @@ struct CStatThread : public NLMISC::IRunnable
default: shard= "unknown"; break;
}
addParam(params, "cv_Shard", shard);
- /* get("http://ryzom.com.woopra-ns.com/visit/" + params); */// FIXME
+ get("http://ryzom.com.woopra-ns.com/visit/"+params);
return true;
}
@@ -272,7 +272,7 @@ struct CStatThread : public NLMISC::IRunnable
std::string params;
addParam(params, "cookie", cookie());
addParam(params, "ra", randomString());
- /* get("http://ryzom.com.woopra-ns.com/ping/" + params); */// FIXME
+ get("http://ryzom.com.woopra-ns.com/ping/"+params);
}
void run()
diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index 2dda3bf6a..ee8224d08 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -1085,7 +1085,7 @@ void initShardDisplay()
for (uint fff = 0; fff < 20; ++fff)
{
CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",fff),
- 32*fff%46546, "32.32.32.32", "http://www.ryzomcore.org" );
+ 32*fff%46546, "32.32.32.32", "http://www.ryzom.com" );
Shards.push_back(s);
}*/
@@ -1212,7 +1212,7 @@ void onlogin(bool vanishScreen = true)
// for (uint fff = 0; fff < 20; ++fff)
// {
// CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",fff),
-// 32*fff%46546, "32.32.32.32", "http://www.ryzomcore.org" );
+// 32*fff%46546, "32.32.32.32", "http://www.ryzom.com" );
// Shards.push_back(s);
// }*/
//
diff --git a/code/ryzom/client/src/release.cpp b/code/ryzom/client/src/release.cpp
index f88849197..7d8b6c5a6 100644
--- a/code/ryzom/client/src/release.cpp
+++ b/code/ryzom/client/src/release.cpp
@@ -667,7 +667,7 @@ void release()
#if FINAL_VERSION
- // openURL ("http://www.ryzomcore.org/exit/");
+ // openURL ("http://ryzom.com/exit/");
#endif
}// release //
diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h
index 9c9cdb504..d83389cf4 100644
--- a/code/ryzom/common/src/game_share/ryzom_version.h
+++ b/code/ryzom/common/src/game_share/ryzom_version.h
@@ -17,10 +17,7 @@
#ifndef RYZOM_VERSION_H
#define RYZOM_VERSION_H
-#define RYZOM_VERSION "ryzomcore" \
- "/" \
- "v0.12.0" \
- "-dev"
+#define RYZOM_VERSION "2.1.0"
#endif // RYZOM_VERSION_H
diff --git a/code/ryzom/common/src/game_share/scenario_entry_points.cpp b/code/ryzom/common/src/game_share/scenario_entry_points.cpp
index 7c01af145..e32778089 100644
--- a/code/ryzom/common/src/game_share/scenario_entry_points.cpp
+++ b/code/ryzom/common/src/game_share/scenario_entry_points.cpp
@@ -57,7 +57,7 @@ CScenarioEntryPoints::CScenarioEntryPoints()
void CScenarioEntryPoints::init()
{
_CompleteIslandsFilename = "r2_islands.xml";
- _EntryPointsFilename = "r2_entry_points.txt";
+ _EntryPointsFilename = "ring_map_entry_ponts.txt";
}
//-----------------------------------------------------------------------------