Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Quelques corrections de merge

Browse source
This commit is contained in:
Erwan GEORGET 2016-08-09 22:32:01 +02:00
parent edf0b19c75
commit 11ca113401
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/ryzom/client/client_default.cfg
View file

@ -4,7 +4,6 @@
////////////////////////// //////////////////////////
////////////////////////// //////////////////////////
//////////////////////////
// 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. // You will loose all the comments and identation in this file.
@ -68,10 +67,10 @@ LanguageCode = "en"; // english
XMLInputFile = "input_config_v3.xml"; XMLInputFile = "input_config_v3.xml";
XMLLoginInterfaceFiles = { XMLLoginInterfaceFiles = {
"login_config.xml", "login_config.xml",
"login_widgets.xml", "login_widgets.xml",
"login_main.xml", "login_main.xml",
"login_keys.xml", "login_keys.xml",
}; };
XMLOutGameInterfaceFiles = { 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. Launch_BG = "new_launcher_bg.tga"; // Default name for the launch background file.
TeleportKami_BG = "new_teleport_kami_bg.tga"; TeleportKami_BG = "new_teleport_kami_bg.tga";
TeleportKaravan_BG = "new_teleport_caravan_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"; ResurectKami_BG = "new_resurect_kami_bg.tga";
ResurectKaravan_BG = "new_resurect_caravane_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/"; ScenarioSavePath = "./my_scenarios/";

4
code/ryzom/client/src/commands.cpp
View file

@ -2440,7 +2440,7 @@ NLMISC_COMMAND(mode, "Change the mode for an entity in a slot", "<Slot> <Mode> [
return true; 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. // Check parameters.
if(args.size() < 2 || args.size() > 6) 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; behaviour.Combat.ImpactIntensity = impactIntensity;
} }
if(args.size() > 4) if(args.size() > 4)
fromString(args[4], behaviour.DeltaHP); fromString(args[4], behaviour.DeltaChaScore1);
} }
// get the dt // get the dt
sint32 dt= 10; sint32 dt= 10;

4
code/ryzom/client/src/login.cpp
View file

@ -2812,6 +2812,8 @@ string checkLogin(const string &login, const string &password, const string &cli
// R2 login sequence // R2 login sequence
std::string cryptedPassword = CCrypt::crypt(password, Salt); 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)) if(!HttpClient.sendGet(url + "?cmd=login&login=" + login + "&password=" + cryptedPassword + "&clientApplication=" + clientApp + "&cp=2" + "&lg=" + ClientCfg.LanguageCode))
return "Can't send (error code 2)"; return "Can't send (error code 2)";
@ -2892,6 +2894,8 @@ string checkLogin(const string &login, const string &password, const string &cli
// standard ryzom login sequence // standard ryzom login sequence
std::string cryptedPassword = CCrypt::crypt(password, Salt); 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")) if(!HttpClient.sendGet(url + "?login=" + login + "&password=" + cryptedPassword + "&clientApplication=" + clientApp + "&cp=2"))
return "Can't send (error code 2)"; return "Can't send (error code 2)";
/* /*