From 954151ca7328fd9d19550a327f4f5433ee4dbd4b Mon Sep 17 00:00:00 2001
From: Ulukyn <ulukyn@gmail.com>
Date: Tue, 21 Jan 2020 15:04:43 +0100
Subject: [PATCH] Added: new way to manage news at loading screen

---
 code/ryzom/client/src/global.cpp                     |  1 +
 code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp | 11 +++++++++++
 code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h   |  1 +
 code/ryzom/client/src/progress.cpp                   | 10 ++++++++--
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/client/src/global.cpp b/code/ryzom/client/src/global.cpp
index 4b8e1aad7..d5113e0a9 100644
--- a/code/ryzom/client/src/global.cpp
+++ b/code/ryzom/client/src/global.cpp
@@ -78,6 +78,7 @@ std::vector<std::pair<
 
 /// Ring main page
 string						RingMainURL;
+string 						NewsAtProgress;
 
 void resetTextContext (const char *font, bool resetInterfaceManager)
 {
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index cd1df8d2f..18f3cfb20 100644
--- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -435,6 +435,7 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls)
 	ls.registerFunc("getDesktopIndex", getDesktopIndex);
 	ls.registerFunc("setLuaBreakPoint", setLuaBreakPoint);
 	ls.registerFunc("getMainPageURL", getMainPageURL);
+	ls.registerFunc("setNewsAtProgress", setNewsAtProgress);
 	ls.registerFunc("getCharSlot", getCharSlot);
 	ls.registerFunc("getServerSeason", getServerSeason);
 	ls.registerFunc("computeCurrSeason", computeCurrSeason);
@@ -1139,6 +1140,16 @@ int CLuaIHMRyzom::getMainPageURL(CLuaState &ls)
 	return 1;
 }
 
+// ***************************************************************************
+int CLuaIHMRyzom::setNewsAtProgress(CLuaState &ls)
+{
+	//H_AUTO(Lua_CLuaIHM_getMainPageURL)
+	const char *funcName = "NewsAtProgress";
+	CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+	NewsAtProgress = ls.toString(1);
+	return 0;
+}
+
 // ***************************************************************************
 int	CLuaIHMRyzom::getCharSlot(CLuaState &ls)
 {
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
index c2d47b7ec..5a3c9bf39 100644
--- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
+++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h
@@ -58,6 +58,7 @@ private:
 	static int  getDesktopIndex(CLuaState &ls);
 	static int  setLuaBreakPoint(CLuaState &ls); // set a breakpoint in lua external debugger (file, line)
 	static int	getMainPageURL(CLuaState &ls);
+	static int	setNewsAtProgress(CLuaState &ls);
 	static int	getCharSlot(CLuaState &ls);
 	static int	displaySystemInfo(CLuaState &ls);
 	static int	displayChatMessage(CLuaState &ls);
diff --git a/code/ryzom/client/src/progress.cpp b/code/ryzom/client/src/progress.cpp
index 2766c60d2..fd46c8183 100644
--- a/code/ryzom/client/src/progress.cpp
+++ b/code/ryzom/client/src/progress.cpp
@@ -47,6 +47,7 @@ extern NL3D::UMaterial LoadingMaterialFull;
 extern std::vector<UTextureFile*> LogoBitmaps;
 extern uint TipsOfTheDayIndex;
 extern ucstring			TipsOfTheDay;
+extern string			NewsAtProgress;
 extern bool					UseEscapeDuringLoading;
 
 CProgress::CProgress ()
@@ -379,10 +380,15 @@ void CProgress::internalProgress (float value)
 							float x = 0.5f;//((*itpc).X / 1024.f);
 							float y = ((*itpc).Y / 768.f);
 							TextContext->setColor( (*itpc).Color );
-							TextContext->setFontSize( (uint)(16.f * fontFactor));
+							TextContext->setFontSize( (uint)((*itpc).FontSize * fontFactor));
 
 							// build the ucstr(s)
-							ucstring ucstr = CI18N::get((*itpc).Text);
+							string text = (*itpc).Text;
+							ucstring ucstr;
+							if (text == "NEWS")
+								ucstr.fromUtf8(NewsAtProgress);
+							else
+								ucstr = CI18N::get(text);
 							vector<ucstring> vucstr;
 							ucstring sep("\n");
 							splitUCString(ucstr,sep,vucstr);