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 db1dacf2336ccf30e23d90b362576c8535a8029d Author: MAN-AT-ARMS <m4n4t4...@gmail.com> Date: Sun Sep 20 21:38:00 2015 -0400 All: Fix glyph width calculation in Text_Paint_Limit --- MP/code/cgame/cg_newdraw.c | 2 +- MP/code/ui/ui_main.c | 2 +- SP/code/cgame/cg_newdraw.c | 2 +- SP/code/ui/ui_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP/code/cgame/cg_newdraw.c b/MP/code/cgame/cg_newdraw.c index f30895e..21b0148 100644 --- a/MP/code/cgame/cg_newdraw.c +++ b/MP/code/cgame/cg_newdraw.c @@ -1883,7 +1883,7 @@ static void CG_Text_Paint_Limit( float *maxX, float x, float y, float scale, vec continue; } else { float yadj = useScale * glyph->top; - if ( CG_Text_Width( s, useScale, 1 ) + x > max ) { + if ( CG_Text_Width( s, scale, 1 ) + x > max ) { *maxX = 0; break; } diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c index e85163e..cb7b5d3 100644 --- a/MP/code/ui/ui_main.c +++ b/MP/code/ui/ui_main.c @@ -974,7 +974,7 @@ static void Text_Paint_Limit( float *maxX, float x, float y, float scale, vec4_t continue; } else { float yadj = useScale * glyph->top; - if ( Text_Width( s, useScale, 1 ) + x > max ) { + if ( Text_Width( s, scale, 1 ) + x > max ) { *maxX = 0; break; } diff --git a/SP/code/cgame/cg_newdraw.c b/SP/code/cgame/cg_newdraw.c index 5a57b92..73a5422 100644 --- a/SP/code/cgame/cg_newdraw.c +++ b/SP/code/cgame/cg_newdraw.c @@ -1822,7 +1822,7 @@ static void CG_Text_Paint_Limit( float *maxX, float x, float y, int font, float continue; } else { float yadj = useScale * glyph->top; - if ( CG_Text_Width( s, font, useScale, 1 ) + x > max ) { + if ( CG_Text_Width( s, font, scale, 1 ) + x > max ) { *maxX = 0; break; } diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c index 08bf92d..0083a2f 100644 --- a/SP/code/ui/ui_main.c +++ b/SP/code/ui/ui_main.c @@ -619,7 +619,7 @@ static void Text_Paint_Limit(float *maxX, float x, float y, int font, float scal continue; } else { float yadj = useScale * glyph->top; - if (Text_Width(s, font, useScale, 1) + x > max) { + if (Text_Width(s, font, scale, 1) + x > max) { *maxX = 0; break; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits