[iortcw] 129/497: All: Remove trailing text after last GL extension in UI

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 2536fd2ee74b046ad0b8892cece546aaf8168ed0
Author: ZTurtleMan at gmail.com <ZTurtleMan at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Fri May 30 23:09:09 2014 +0000

    All: Remove trailing text after last GL extension in UI
    
    It would continue drawing part of next GL extension.
    Also fix number of extensions in SP to be 63 (divisible by 3) not 62.
---
 MP/code/ui/ui_main.c | 7 +++++--
 SP/code/ui/ui_main.c | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index 1fe0273..8419797 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -2510,12 +2510,15 @@ static void UI_DrawGLInfo( rectDef_t *rect, float scale, vec4_t color, int textS
 	eptr = buff;
 	y = rect->y + 45;
 	numLines = 0;
-	// TTimo - don't overflow the line buffer, don't go above 46, as it goes out of the screen anyway
-	while ( y < rect->y + rect->h && *eptr && numLines < 46 )
+	while ( y < rect->y + rect->h && *eptr )
 	{
 		while ( *eptr && *eptr == ' ' )
 			*eptr++ = '\0';
 
+		// TTimo - don't overflow the line buffer, don't go above 46, as it goes out of the screen anyway
+		if ( numLines == 46 )
+			break;
+
 		// track start of valid string
 		if ( *eptr && *eptr != ' ' ) {
 			lines[numLines++] = eptr;
diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c
index c14eea4..d658841 100644
--- a/SP/code/ui/ui_main.c
+++ b/SP/code/ui/ui_main.c
@@ -2455,12 +2455,15 @@ static void UI_DrawGLInfo( rectDef_t *rect, int font, float scale, vec4_t color,
 	eptr = buff;
 	y = rect->y + 45;
 	numLines = 0;
-	// don't overflow the line buffer, don't go above 62, as it goes out of the screen anyway
-	while ( y < rect->y + rect->h && *eptr && numLines < 62 )
+	while ( y < rect->y + rect->h && *eptr )
 	{
 		while ( *eptr && *eptr == ' ' )
 			*eptr++ = '\0';
 
+		// don't overflow the line buffer, don't go above 63, as it goes out of the screen anyway
+		if ( numLines == 63 )
+			break;
+
 		// track start of valid string
 		if ( *eptr && *eptr != ' ' ) {
 			lines[numLines++] = eptr;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git