From 11ca1134017ed1905abf7908a501e5dda50e9e9a Mon Sep 17 00:00:00 2001
From: Erwan GEORGET <egeorget@opmbx.org>
Date: Tue, 9 Aug 2016 22:32:01 +0200
Subject: [PATCH] Quelques corrections de merge

---
 code/ryzom/client/client_default.cfg | 15 +++++++--------
 code/ryzom/client/src/commands.cpp   |  4 ++--
 code/ryzom/client/src/login.cpp      |  4 ++++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 922258e9c..7d12423f3 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -4,9 +4,8 @@
 //////////////////////////
 //////////////////////////
 
-//////////////////////////
 
-// If you set this variable to 1, your client.cfg will be overwritten when you quit the client. 
+// If you set this variable to 1, your client.cfg will be overwritten when you quit the client.
 // You will loose all the comments and identation in this file.
 SaveConfig = 1;
 
@@ -68,10 +67,10 @@ LanguageCode = "en";		// english
 XMLInputFile = "input_config_v3.xml";
 
 XMLLoginInterfaceFiles = { 
-        "login_config.xml", 
-        "login_widgets.xml", 
-        "login_main.xml",
-        "login_keys.xml",
+	"login_config.xml", 
+	"login_widgets.xml", 
+	"login_main.xml",
+	"login_keys.xml",
 };
 
 XMLOutGameInterfaceFiles = {
@@ -541,10 +540,10 @@ Loading_BG		= "new_loading_bg.tga";			// Default name for the loading background
 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.
+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";
-End_BG			= "end_bg.tga";				// Default name for the last background file.
+End_BG				= "end_bg.tga";				// Default name for the last background file.
 
 ScenarioSavePath = "./my_scenarios/";
 
diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp
index a22c420ef..f2c318c8b 100644
--- a/code/ryzom/client/src/commands.cpp
+++ b/code/ryzom/client/src/commands.cpp
@@ -2440,7 +2440,7 @@ NLMISC_COMMAND(mode, "Change the mode for an entity in a slot", "<Slot> <Mode> [
 	return true;
 }
 
-NLMISC_COMMAND(behaviour, "Change the behaviour for an entity in a slot", "<Slot> <Behaviour> [<Attack Intensity>] [<Impact Intensity>] [<delta HP>] [dt(tick)]")
+NLMISC_COMMAND(behaviour, "Change the behaviour for an entity in a slot", "<Slot> <Behaviour> [<Attack Intensity>] [<Impact Intensity>] [<delta ChaScore1>] [dt(tick)]")
 {
 	// Check parameters.
 	if(args.size() < 2 || args.size() > 6)
@@ -2505,7 +2505,7 @@ NLMISC_COMMAND(behaviour, "Change the behaviour for an entity in a slot", "<Slot
 				behaviour.Combat.ImpactIntensity = impactIntensity;
 			}
 			if(args.size() > 4)
-				fromString(args[4], behaviour.DeltaHP);
+				fromString(args[4], behaviour.DeltaChaScore1);
 		}
 		// get the dt
 		sint32	dt= 10;
diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index ce50e3cc4..37f9e53ad 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -2811,6 +2811,8 @@ string checkLogin(const string &login, const string &password, const string &cli
 	{
 		// R2 login sequence
 		std::string	cryptedPassword = CCrypt::crypt(password, Salt);
+		
+		std::string url = ClientCfg.ConfigFile.getVar("StartupHost").asString() + ClientCfg.ConfigFile.getVar("StartupPage").asString();
 
 		if(!HttpClient.sendGet(url + "?cmd=login&login=" + login + "&password=" + cryptedPassword + "&clientApplication=" + clientApp + "&cp=2" + "&lg=" + ClientCfg.LanguageCode))
 			return "Can't send (error code 2)";
@@ -2891,6 +2893,8 @@ string checkLogin(const string &login, const string &password, const string &cli
 	{
 		// standard ryzom login sequence
 		std::string	cryptedPassword = CCrypt::crypt(password, Salt);
+		
+		std::string url = ClientCfg.ConfigFile.getVar("StartupHost").asString() + ClientCfg.ConfigFile.getVar("StartupPage").asString();
 
 		if(!HttpClient.sendGet(url + "?login=" + login + "&password=" + cryptedPassword + "&clientApplication=" + clientApp + "&cp=2"))
 			return "Can't send (error code 2)";