From 3a55b9cd67e2ab285f777073371c37df54c6350a Mon Sep 17 00:00:00 2001 From: Bien Pham Date: Sat, 29 Jan 2022 04:03:00 +0700 Subject: [PATCH] engine: make pfnDrawString & pfnDrawStringReverse return width --- engine/client/cl_game.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c index 1a898a91..27d5c462 100644 --- a/engine/client/cl_game.c +++ b/engine/client/cl_game.c @@ -2929,15 +2929,16 @@ pfnDrawString */ static int GAME_EXPORT pfnDrawString( int x, int y, const char *str, int r, int g, int b ) { + int iWidth = 0; Con_UtfProcessChar(0); // draw the string until we hit the null character or a newline character for ( ; *str != 0 && *str != '\n'; str++ ) { - x += pfnVGUI2DrawCharacterAdditive( x, y, (unsigned char)*str, r, g, b, 0 ); + iWidth += pfnVGUI2DrawCharacterAdditive( x + iWidth, y, (unsigned char)*str, r, g, b, 0 ); } - return x; + return iWidth; } /* @@ -2952,8 +2953,7 @@ static int GAME_EXPORT pfnDrawStringReverse( int x, int y, const char *str, int char *szIt; for( szIt = (char*)str; *szIt != 0; szIt++ ) x -= clgame.scrInfo.charWidths[ (unsigned char) *szIt ]; - pfnDrawString( x, y, str, r, g, b ); - return x; + return pfnDrawString( x, y, str, r, g, b ); } /*