Merge with develop

code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua

@@ -8,6 +8,7 @@ if (outgame==nil) then
 end
 
 
+
 ------------------------------------------------------------------------------------------------------------
 -- Name generator.
 
@@ -17,88 +18,88 @@ end
 -- zorai: given name one 318, given name two 644, surname 1287
 -- tryker: given name 4500, surname 4335
 
-function outgame:getFyrosName()  
+function outgame:getFyrosName()
     local nameResult = "";
     local fullnameResult = "";
-    
+
-    local nbFyrosGivenNames = 0;  
+    local nbFyrosGivenNames = 0;
     for _ in pairs(fyrosGivenNames) do nbFyrosGivenNames = nbFyrosGivenNames + 1 end
-    local givenName = fyrosGivenNames[math.random(nbFyrosGivenNames)];    
+    local givenName = fyrosGivenNames[math.random(nbFyrosGivenNames)];
-    
+
     local nbFyrosSurnames = 0;
     for _ in pairs(fyrosSurnames) do nbFyrosSurnames = nbFyrosSurnames + 1 end
-    local surname = fyrosSurnames[math.random(nbFyrosSurnames)];    
+    local surname = fyrosSurnames[math.random(nbFyrosSurnames)];
     fullnameResult = givenName .. " " .. surname;
     nameResult = surname;
     return fullnameResult, nameResult
 end
 
-function outgame:getMatisName(sex) 
+function outgame:getMatisName(sex)
     local nameResult = "";
     local fullnameResult = "";
     local dbNameSex = getDbProp("UI:TEMP:NAME_SEX");
-    
+
     if sex ~= nil then
         dbNameSex = sex
     end
-    
+
-    if tonumber( dbNameSex )== 1 then    
+    if tonumber( dbNameSex )== 1 then
         local nbMatisMaleNames = 0;
         for _ in pairs(matisMaleNames) do nbMatisMaleNames = nbMatisMaleNames + 1 end
         givenName = matisMaleNames[math.random(nbMatisMaleNames)];
     else
         local nbMatisFemaleNames = 0;
         for _ in pairs(matisFemaleNames) do nbMatisFemaleNames = nbMatisFemaleNames + 1 end
-        givenName = matisFemaleNames[math.random(nbMatisFemaleNames)];    
+        givenName = matisFemaleNames[math.random(nbMatisFemaleNames)];
     end
-    
+
     local nbMatisSurnames = 0;
     for _ in pairs(matisSurnames) do nbMatisSurnames = nbMatisSurnames + 1 end
-    local surname = matisSurnames[math.random(nbMatisSurnames)];    
+    local surname = matisSurnames[math.random(nbMatisSurnames)];
     fullnameResult = givenName .. " " .. surname;
     nameResult = givenName;
-    
+
     return fullnameResult, nameResult
 end
 
-function outgame:getTrykerName() 
+function outgame:getTrykerName()
     local nameResult = "";
     local fullnameResult = "";
-    
+
     local nbTrykerGivenNames = 0;
     for _ in pairs(trykerGivenNames) do nbTrykerGivenNames = nbTrykerGivenNames + 1 end
     local givenName = trykerGivenNames[math.random(nbTrykerGivenNames)];
-    
+
     local nbTrykerSurnames = 0;
     for _ in pairs(trykerSurnames) do nbTrykerSurnames = nbTrykerSurnames + 1 end
     local surname = trykerSurnames[math.random(nbTrykerSurnames)];
-    
+
     fullnameResult = surname .. " " .. givenName;
     nameResult = givenName;
-    
+
     return fullnameResult, nameResult
 end
 
 
-function outgame:getZoraiName() 
+function outgame:getZoraiName()
     local nameResult = "";
     local fullnameResult = "";
-    
+
     local nbGivenNameOne = 0;
     for _ in pairs(zoraiGivenNameOne) do nbGivenNameOne = nbGivenNameOne + 1 end
-    local givenNameOne = zoraiGivenNameOne[math.random(nbGivenNameOne)];      
+    local givenNameOne = zoraiGivenNameOne[math.random(nbGivenNameOne)];
-    
+
     local nbGivenNameTwo = 0;
     for _ in pairs(zoraiGivenNameTwo) do nbGivenNameTwo = nbGivenNameTwo + 1 end
-    local givenNameTwo = zoraiGivenNameTwo[math.random(nbGivenNameTwo)];   
+    local givenNameTwo = zoraiGivenNameTwo[math.random(nbGivenNameTwo)];
-    
+
     local nbSurnames = 0;
     for _ in pairs(zoraiSurnames) do nbSurnames = nbSurnames + 1 end
     local surname = zoraiSurnames[math.random(nbSurnames)];
-    
+
     fullnameResult = surname .. " " .. givenNameOne .. "-" .. givenNameTwo;
-    nameResult = givenNameOne .. givenNameTwo; 
+    nameResult = givenNameOne .. givenNameTwo;
-    
+
     return fullnameResult, nameResult
 end
 
@@ -108,10 +109,10 @@ function outgame:procGenerateName()
     local dbNameRace = getDbProp("UI:TEMP:NAME_RACE");
     local dbNameSubRace = getDbProp("UI:TEMP:NAME_SUB_RACE");
     local dbNameSubRace2 = getDbProp("UI:TEMP:NAME_SUB_RACE2");
-    
+
     local nameResult = "";
     local fullnameResult = "";
-    
+
     -- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
     -- fy ma try zo -->
     local givenName = "";
@@ -147,7 +148,7 @@ function outgame:procGenerateName()
         -- Zorai
             fullnameResult, tempResult_1 = self:getZoraiName()
         end
-        
+
         if tonumber(dbNameSubRace2) == 1 then
         -- Fyros
         fullnameResult, tempResult_2 = self:getFyrosName()
@@ -164,13 +165,13 @@ function outgame:procGenerateName()
         -- Zorai
             fullnameResult, tempResult_2 = self:getZoraiName()
         end
-        
+
         fullnameResult = tempResult_1 .. " " .. tempResult_2
         nameResult = tempResult_2
     end
-    
+
     uiNameFull.hardtext = fullnameResult;
-    
+
     nameResult = string.gsub(nameResult, "'", "");
     nameResult = string.gsub(nameResult, " ", "");
     nameResult = string.gsub(nameResult, "-", "");
@@ -183,28 +184,28 @@ function outgame:procUpdateNameSexLabel()
     local nameSexType = { "uiCP_Sex_Male", "uiCP_Sex_Female" }
 	local uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider:name_sex");
     local uiNameSex = getDbProp("UI:TEMP:NAME_SEX");
-    
+
     tempstr = tostring(i18n.get(nameSexType[tonumber(uiNameSex)]));
     tempstr = string.lower( tempstr );
     tempstr = (tempstr:gsub("^%l", string.upper));
-    
+
 	uiNameSexText.hardtext= tempstr;
 end
 -- Name race slider update.
 function outgame:procUpdateNameRaceLabel()
     local nameRaceType = { "Fyros", "Matis", "Tryker", "Zoraï", "uiCP_Maraudeur" }
-    
+
 	local uiNameRaceText = getUI("ui:outgame:appear_name:name_race_slider:name_race");
     local dbNameRace = getDbProp("UI:TEMP:NAME_RACE");
-    
+
 	local uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider");
-    
+
 	local uiNameSubRaceSlider = getUI("ui:outgame:appear_name:name_sub_race_slider");
 	local uiNameSubRace2Slider = getUI("ui:outgame:appear_name:name_sub_race2_slider");
-    
+
 	local uiNameGenerate = getUI("ui:outgame:appear_name:generate");
     -- Show/Hide sex slider
-    
+
     uiNameGenerate.y = "-50"
     if tonumber(dbNameRace) == 2 then
         uiNameSexSlider.active = true;
@@ -212,7 +213,7 @@ function outgame:procUpdateNameRaceLabel()
     else
         uiNameSexSlider.active = false;
     end
-    
+
     -- Show/Hide sub race slider
     if tonumber(dbNameRace) == 5 then
         uiNameSubRaceSlider.active = true;
@@ -222,21 +223,21 @@ function outgame:procUpdateNameRaceLabel()
         uiNameSubRaceSlider.active = false;
         uiNameSubRace2Slider.active = false;
     end
-    
+
-    
+
 	uiNameRaceText.hardtext= tostring(nameRaceType[tonumber(dbNameRace)]);
 end
 
 
 local matisF = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Female")) )):gsub("^%l", string.upper);
 local matisM = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Male")) )):gsub("^%l", string.upper);
-    
+
 function outgame:procUpdateNameSubRaceLabel()
     local nameSubRaceType = { "Fyros", matisF, matisM, "Tryker", "Zoraï" }
 	local uiNameSubRaceText = getUI("ui:outgame:appear_name:name_sub_race_slider:name_race");
     local dbNameSubRace = getDbProp("UI:TEMP:NAME_SUB_RACE");
 
-    
+
 	uiNameSubRaceText.hardtext= tostring(nameSubRaceType[tonumber(dbNameSubRace)]);
 end
 function outgame:procUpdateNameSubRace2Label()
@@ -244,7 +245,7 @@ function outgame:procUpdateNameSubRace2Label()
 	local uiNameSubRace2Text = getUI("ui:outgame:appear_name:name_sub_race2_slider:name_race");
     local dbNameSubRace2 = getDbProp("UI:TEMP:NAME_SUB_RACE2");
 
-    
+
 	uiNameSubRace2Text.hardtext= tostring(nameSubRace2Type[tonumber(dbNameSubRace2)]);
 end
 
@@ -290,15 +291,15 @@ function outgame:buildActionPack()
 	-- Build Default Combat
 	self:activePackElement(1, 'f1.tga');		-- Dagger
 	self:activePackElement(2, 'f2.tga');		-- Accurate Attack
-	
+
 	-- Build Default Magic
 	self:activePackElement(6, 'm2.tga');		-- Gloves
 	self:activePackElement(7, 'm1.tga');		-- Acid
-	
+
 	-- Build Default Forage
 	self:activePackElement(11, 'g1.tga');	-- Forage Tool
 	self:activePackElement(12, 'g2.tga');	-- Basic Extract
-	
+
 	-- Build Default Craft
 	self:activePackElement(16, 'c2.tga');	-- Craft Tool
 	self:activePackElement(17, 'c1.tga');	-- 50 raw mat
@@ -323,8 +324,8 @@ function outgame:buildActionPack()
 	self:setPackJobText('M', 1);
 	self:setPackJobText('G', 1);
 	self:setPackJobText('C', 1);
-	
+
-	-- Set correct text for specalized version		
+	-- Set correct text for specalized version
 	if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
 		self:setPackJobText('F', 2);
 	elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
@@ -334,7 +335,7 @@ function outgame:buildActionPack()
 	elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
 		self:setPackJobText('C', 2);
 	end
-	
+
 end
 
 
@@ -375,8 +376,8 @@ end
 --function outgame:setPatchProgress(progress)
 --	--debugInfo("*** 3 ***")
 --	local progressPercentText = string.format("%d%%", 100 * progress)
---	local progressPostfix = math.fmod(os.time(), 3)	
+--	local progressPostfix = math.fmod(os.time(), 3)
---	--debugInfo("Patch in progress : " .. tostring(progress))		
+--	--debugInfo("Patch in progress : " .. tostring(progress))
 --	local progressDate = nltime.getLocalTime() / 500
 --	local colValue = math.floor(230 + 24 * math.sin(progressDate))
 --	local color = string.format("%d %d 	%d %d", colValue, colValue, colValue, 255)
@@ -392,7 +393,7 @@ end
 --
 --function outgame:setPatchError()
 --	--debugInfo("*** 5 ***")
---	--debugInfo("Patch error")	
+--	--debugInfo("Patch error")
 --	self:setProgressText(i18n.get("uiBGD_PatchError"), "255 0 0 255", 0)
 --end
 --
@@ -408,9 +409,9 @@ end
 function outgame:launchGame()
 	if not isPlayerSlotNewbieLand(getPlayerSelectedSlot()) then
 		if not isFullyPatched() then
-			messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame")		
+			messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame")
 			return
 		end
-	end		
+	end
 	runAH(getUICaller(), "proc", "proc_charsel_play")
 end

code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml

@@ -1361,7 +1361,7 @@
                 id="but_next" posref="TR TR" x="0" y="-6"
                 onclick_l="proc" params_l="proc_appear_name_sub_race_add_one" />
                 
-            <view type="text" id="surname" case="%case_first_string_letter_up" posparent="name_sub_race_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_Surame" color="255 255 255 255" fontsize="11"/>
+            <view type="text" id="surname" case="%case_first_string_letter_up" posparent="name_sub_race_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_FirstName" color="255 255 255 255" fontsize="11"/>
             <view type="text" id="name_race" case="%case_first_string_letter_up" posparent="name_sub_race_slider" posref="TR TL" x="-100" y="0" hardtext="Fyros" color="255 255 255 255" fontsize="11"/>
             <ctrl type="scroll" id="name_race_scroll" posparent="name_sub_race_slider" posref="MM MM" x="0" y="0" w="160" h="32"
                                 vertical="false" align="L" min="1" max="5" value="UI:TEMP:NAME_SUB_RACE" tracksize="40" 
@@ -1385,7 +1385,7 @@
                 id="but_next" posref="TR TR" x="0" y="-6"
                 onclick_l="proc" params_l="proc_appear_name_sub_race2_add_one" />
                 
-            <view type="text" id="name" case="%case_first_string_letter_up" posparent="name_sub_race2_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_Name" color="255 255 255 255" fontsize="11"/>
+            <view type="text" id="name" case="%case_first_string_letter_up" posparent="name_sub_race2_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_LastName" color="255 255 255 255" fontsize="11"/>
             <view type="text" id="name_race" case="%case_first_string_letter_up" posparent="name_sub_race2_slider" posref="TR TL" x="-100" y="0" hardtext="Fyros" color="255 255 255 255" fontsize="11"/>
             <ctrl type="scroll" id="name_race_scroll" posparent="name_sub_race2_slider" posref="MM MM" x="0" y="0" w="160" h="32"
                                 vertical="false" align="L" min="1" max="5" value="UI:TEMP:NAME_SUB_RACE2" tracksize="40" 

code/ryzom/client/src/http_client_curl.cpp

@@ -70,7 +70,7 @@ static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm)
 
 	if (!file.open(CAFilename))
 	{
-		nlwarning("Unable to open %s", CAFilename.c_str());
+		nlwarning("Unable to open %s", CAFilename);
 		return CURLE_SSL_CACERT;
 	}