diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index 7431807cf..66c260273 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -416,23 +416,15 @@ SystemInfoColors = }; PrintfCommands = { - "52", "15", "55 55 0 255", "28", "uiChapterV", "624", - "428", "0 0 0 255", "18", "", "624", "378", - "0 0 0 255", "14", "", "644", "278", "0 0 0 255", - "18", "", "52", "17", "255 255 255 255", "28", - "uiChapterV", "622", "430", "255 255 255 255", "18", "", - "622", "380", "255 255 255 255", "14", "", "642", - "280", "255 255 255 255", "18", "" + "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 = { - "52", "15", "55 55 0 255", "28", "uiChapterV", "624", - "428", "0 0 0 255", "18", "", "624", "378", - "0 0 0 255", "14", "", "644", "278", "0 0 0 255", - "18", "", "52", "17", "255 255 255 255", "28", - "uiChapterV", "622", "430", "255 255 255 255", "18", "", - "622", "380", "255 255 255 255", "14", "", "642", - "280", "255 255 255 255", "18", "" + "0", "132", "30 144 255 255", "18", "uiS2", + "0", "105", "255 188 0 255", "14", "uiS2E0", + "0", "65", "255 255 255 255", "12", "NEWS" }; DisplayMissingAnimFile = 0; 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 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 vucstr; ucstring sep("\n"); splitUCString(ucstr,sep,vucstr);