From 15696994a0caebebeb37a066aabe950ef9a303e2 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 2 May 2013 18:23:02 +0000 Subject: [PATCH] - Bugfix: LoadScreenHints o Loadscreen hints were not shown in a Release Build o Centered Loadscreen hints text in all resolutions o TODO: If loadscreen hints are ON (in the ini), the loadscreen should not close automatically, but should stay on screen until the user presses a key(e.g: Space). So the user has time to read the hint -> @Flugente: Do you have any other idea? git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6052 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Utils/Animated ProgressBar.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Utils/Animated ProgressBar.cpp b/Utils/Animated ProgressBar.cpp index 025bbc21..aa371f23 100644 --- a/Utils/Animated ProgressBar.cpp +++ b/Utils/Animated ProgressBar.cpp @@ -14,6 +14,7 @@ #include "sysutil.h" #include "random.h" #include "math.h" + #include "WordWrap.h" #endif double rStart, rEnd; @@ -329,15 +330,14 @@ void SetRelativeStartAndEndPercentage( UINT8 ubID, UINT16 uiRelStartPerc, UINT16 SetFontShadow( pCurr->ubMsgFontShadowColor ); SetFontBackground( 0 ); mprintf( pCurr->usBarLeft, pCurr->usBarBottom + 3, str ); - - // Flugente: loadscreen hints - if ( usCurrentLoadScreenHint ) - { - gprintfinvalidate( pCurr->usBarLeft, pCurr->usBarBottom + 3 - 200, L"%s", zLoadScreenHint[usCurrentLoadScreenHint].szName ); - mprintf( pCurr->usBarLeft, pCurr->usBarBottom + 3 - 200, L"%s", zLoadScreenHint[usCurrentLoadScreenHint].szName ); - } } } + + // Flugente: loadscreen hints + if (gGameExternalOptions.gfUseLoadScreenHints && usCurrentLoadScreenHint ) + { + DrawTextToScreen( zLoadScreenHint[usCurrentLoadScreenHint].szName, 1, pCurr->usBarBottom + 3 - 200, SCREEN_WIDTH - 1, FONT12ARIAL, FONT_MCOLOR_WHITE, 0, FALSE, INVALIDATE_TEXT | CENTER_JUSTIFIED ); + } } //This part renders the progress bar at the percentage level that you specify. If you have set relative