From 38a7b763d0638edfad1664f82409902fb17f1a4d Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 19 Nov 2019 16:19:57 +0800
Subject: [PATCH] Classic backgrounds

---
 code/ryzom/client/client_default.cfg          | 14 +++++-----
 .../data/gamedev/interfaces_v3/login_main.xml | 26 ++++++++++++-------
 .../gamedev/interfaces_v3/login_widgets.xml   |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 7f62473e0..293f0875d 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -561,13 +561,13 @@ HardwareCursors =
 	"r2ed_tool_rotating.tga"
 };
 
-Loading_BG			= "new_loading_bg.tga";			// Default name for the loading background file.
-Launch_BG			= "new_launcher_bg.tga";			// Default name for the launch background file.
-TeleportKami_BG		= "new_teleport_kami_bg.tga";
-TeleportKaravan_BG	= "new_teleport_caravan_bg.tga";
-Elevator_BG			= "new_elevator_bg.tga";		// Default name for the loading background file.
-ResurectKami_BG		= "new_resurect_kami_bg.tga";
-ResurectKaravan_BG	= "new_resurect_caravane_bg.tga";
+Loading_BG			= "loading_bg.tga";			// Default name for the loading background file.
+Launch_BG			= "launcher_bg.tga";			// Default name for the launch background file.
+TeleportKami_BG		= "teleport_kami_bg.tga";
+TeleportKaravan_BG	= "teleport_caravan_bg.tga";
+Elevator_BG			= "elevator_bg.tga";		// Default name for the loading background file.
+ResurectKami_BG		= "resurect_kami_bg.tga";
+ResurectKaravan_BG	= "resurect_caravane_bg.tga";
 End_BG				= "end_bg.tga";				// Default name for the last background file.
 
 ScenarioSavePath = "./my_scenarios/";
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
index 8607dc3dd..b5099cc9c 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
@@ -30,7 +30,7 @@
   <group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
 
     <!-- BACKGROUND -->
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-1" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-1" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="1024" h="768" color="0 0 0 0"/>
 
     <!--
@@ -60,20 +60,26 @@
     <instance template="server_box" id="web_win" posparent="eb_login" posref="BL TL" w="568" h="202" y="-24" /> -->
 
     <!-- Create Account -->
+    <!--
     <ctrl style="log_std_but" id="but_create_account" posparent="but_log" posref="BM TM" y="-28"
     onclick_l="on_create_account" hardtext="uiCreateAccount" />
+    -->
 
 	<!-- Edit Account -->
+    <!--
     <ctrl style="log_std_but" id="but_edit_account" posparent="but_create_account" posref="BM TM" y="-8"
     onclick_l="open_url" params_l="cfg_EditAccountURL" hardtext="uiEditAccount" />
+    -->
 
 	<!-- Upgrade Account -->
 <!--    <ctrl style="log_std_but" id="but_upgrade_account" posparent="but_create_account" posref="BM TM" y="-8"
     onclick_l="open_url" params_l="cfg_EditAccountURL" hardtext="uiUpgradeAccount" /> -->
 
 	<!-- Forget Password -->
+    <!--
     <ctrl style="log_std_but" id="but_forget_pwd" posparent="but_edit_account" posref="BM TM" y="-8"
     onclick_l="open_url" params_l="cfg_ForgetPwdURL" hardtext="uiForgetPwd" />
+    -->
 
     <!-- Free Trial
     <ctrl style="log_spe_but" id="but_free_trial" posparent="but_forget_pwd" posref="BL TL" y="-8"
@@ -81,8 +87,10 @@
 	-->
 
     <!-- Login Support -->
+    <!--
     <ctrl style="log_std_but" id="but_login_support" posparent="but_forget_pwd" posref="BM TM" y="-8"
     onclick_l="open_url" params_l="cfg_LoginSupportURL" hardtext="uiLoginSupport" />
+    -->
 
     <!-- Scan Data -->
 <!--
@@ -182,7 +190,7 @@
   <group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
 
     <!-- BACKGROUND -->
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
     <view type="bitmap" id="kami" posparent="window" posref="TR TR" x="-50" y="-24" texture="log_kami.tga" global_color="false" render_layer="-1" />
 
@@ -287,7 +295,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
   <group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
 
     <!-- BACKGROUND -->
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
     <!-- EXIT BUTTON -->
@@ -342,7 +350,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
   <group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
 
     <!-- BACKGROUND -->
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
     <!-- EXIT BUTTON -->
@@ -399,7 +407,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
   <group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
 
     <!-- BACKGROUND -->
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
     <!-- EXIT BUTTON -->
@@ -507,7 +515,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 <group id="eula" w="1024" h="768" posref="MM MM" active="false" >
 
   <!-- BACKGROUND -->
-  <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+  <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
   <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
   <!-- EXIT BUTTON -->
@@ -552,7 +560,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
   <group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
 
     <!-- BACKGROUND -->
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
     <!-- EXIT BUTTON -->
@@ -632,7 +640,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
   <group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
 
     <!-- BACKGROUND -->
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
     <!-- Window -->
@@ -768,7 +776,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 -->
     <!-- BACKGROUND -->
 <!--
-    <view type="bitmap" posref="TL TL" id="bl" texture="new_launcher_bg.tga" global_color="false" render_layer="-2" />
+    <view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-2" />
     <instance template="log_box" id="window" y="-8" posref="MM MM" w="800" h="440" />
 
 	<instance template="html_text_button" id="back_to_login" text="BACK TO LOGIN" posparent="parent" posref="TL TL" y="-15"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
index eecc764ae..e2dd4b881 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
@@ -852,7 +852,7 @@
 <group type="modal" id="valid_message_box" exit_click_out="false" posref="MM MM" w="1024" h="768"
  on_enter="proc" on_enter_params="proc_valid_message_box_ok" options="no_bordure" mouse_pos="false"
 >
-	<view type="bitmap" posref="MM MM" id="log" texture="new_launcher_bg.tga" global_color="false" render_layer="-1" />
+	<view type="bitmap" posref="MM MM" id="log" texture="launcher_bg.tga" global_color="false" render_layer="-1" />
 	
 	<view type="text" id="text" posref="MM MM" line_maxw="412" w="412" x="0" y="0" color="135 243 28 255" fontsize="18" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>