Changed: replace PrintfCommands by loadingTexts in cff to prevent overwrite of default values in user client.cfg

code/ryzom/client/client_default.cfg

@@ -415,13 +415,7 @@ SystemInfoColors =
 "R2_INVITE","0 255 0 255 around",	// Ring invitation
 };
 
-PrintfCommands       = {
+loadingTexts       = {
-	"0", "132", "30 144 255 255", "18", "uiS2",
-	"0", "105", "255 188 0 255", "14", "uiS2E0",
-	"0", "65", "255 255 255 255", "12", "NEWS"
-};
-
-PrintfCommandsFreeTrial = {
 	"0", "132", "30 144 255 255", "18", "uiS2",
 	"0", "105", "255 188 0 255", "14", "uiS2E0",
 	"0", "65", "255 255 255 255", "12", "NEWS"

code/ryzom/client/src/client_cfg.cpp

@@ -1413,36 +1413,28 @@ void CClientConfig::setValues()
 
 #ifndef RZ_NO_CLIENT
 	// printf commands in loading screens
-	ClientCfg.PrintfCommands.clear();
+	ClientCfg.loadingTexts.clear();
-	ClientCfg.PrintfCommandsFreeTrial.clear();
+	CConfigFile::CVar *pc = ClientCfg.ConfigFile.getVarPtr("loadingTexts");
-	std::vector< std::string > printfCommands(2);
+	if (pc)
-	printfCommands[0] = "PrintfCommands";
-	printfCommands[1] = "PrintfCommandsFreeTrial";
-	for(uint p=0; p<2; p++)
 	{
-		CConfigFile::CVar *pc = ClientCfg.ConfigFile.getVarPtr(printfCommands[p].c_str());
+		if( pc->size()%5 == 0 && pc->size() >= 5)
-		if (pc)
 		{
-			if( pc->size()%5 == 0 && pc->size() >= 5)
+			for (uint i = 0; i < pc->size(); i+=5)
 			{
-				for (uint i = 0; i < pc->size(); i+=5)
+				SPrintfCommand pcom;
-				{
+				pcom.X = pc->asInt(i);
-					SPrintfCommand pcom;
+				pcom.Y = pc->asInt(i+1);
-					pcom.X = pc->asInt(i);
+				pcom.Color = CRGBA::stringToRGBA( pc->asString(i+2).c_str() );
-					pcom.Y = pc->asInt(i+1);
+				pcom.FontSize = pc->asInt(i+3);
-					pcom.Color = CRGBA::stringToRGBA( pc->asString(i+2).c_str() );
+				pcom.Text = pc->asString(i+4);
-					pcom.FontSize = pc->asInt(i+3);
+
-					pcom.Text = pc->asString(i+4);
+				ClientCfg.loadingTexts.push_back( pcom );
-
-					if(p==0) ClientCfg.PrintfCommands.push_back( pcom );
-					else ClientCfg.PrintfCommandsFreeTrial.push_back( pcom );
-				}
-			}
-			else
-			{
-				cfgWarning(("Missing or too many parameters in " + printfCommands[p]).c_str());
 			}
 		}
+		else
+		{
+			cfgWarning("Missing or too many parameters in loadingTexts");
+		}
 	}
 #endif
 

code/ryzom/client/src/client_cfg.h

@@ -699,9 +699,7 @@ struct CClientConfig
 		uint FontSize;
 		std::string Text;
 	};
-	std::vector<SPrintfCommand> PrintfCommands;
+	std::vector<SPrintfCommand> loadingTexts;
-
-	std::vector<SPrintfCommand> PrintfCommandsFreeTrial;
 
 	// funny loading messages count
 	uint16 LoadingStringCount;

code/ryzom/client/src/progress.cpp

@@ -367,15 +367,14 @@ void CProgress::internalProgress (float value)
 				// apply text commands
 				if( ApplyTextCommands )
 				{
-					std::vector<CClientConfig::SPrintfCommand> printfCommands = ClientCfg.PrintfCommands;
+					std::vector<CClientConfig::SPrintfCommand> loadingTexts = ClientCfg.loadingTexts;
-					if(FreeTrial) printfCommands = ClientCfg.PrintfCommandsFreeTrial;
 
-					if( !printfCommands.empty() )
+					if( !loadingTexts.empty() )
 					{
 						TextContext->setHotSpot(UTextContext::MiddleBottom);
 
 						vector<CClientConfig::SPrintfCommand>::iterator itpc;
-						for( itpc = printfCommands.begin(); itpc != printfCommands.end(); ++itpc )
+						for( itpc = loadingTexts.begin(); itpc != loadingTexts.end(); ++itpc )
 						{
 							float x = 0.5f;//((*itpc).X / 1024.f);
 							float y = ((*itpc).Y / 768.f);