From c7b1e544eeb3e5a2e6f0a8934e06c3435c83e502 Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 14 Aug 2015 21:04:00 +0000 Subject: [PATCH] fix autoid. fix skewed grey captures. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4964 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/m_mp3.c | 5 ++++- engine/client/view.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c index a4d46e388..8cd845539 100644 --- a/engine/client/m_mp3.c +++ b/engine/client/m_mp3.c @@ -3553,7 +3553,10 @@ static void Media_RecordFilm (char *recordingname, qboolean demo) pbo_format = TF_INVALID; if (qrenderer == QR_OPENGL && !gl_config.gles && gl_config.glversion >= 2.1) { //both tgas and vfw favour bgr24, so lets get the gl drivers to suffer instead of us. - pbo_format = TF_BGR24; + if (vid.fbpwidth & 3) + pbo_format = TF_BGRA32; //don't bother changing pack alignment, just use something that is guarenteed to not need anything. + else + pbo_format = TF_BGR24; } #endif diff --git a/engine/client/view.c b/engine/client/view.c index 5c21991eb..224201afd 100644 --- a/engine/client/view.c +++ b/engine/client/view.c @@ -1630,7 +1630,7 @@ static void SCR_DrawAutoID(vec3_t org, player_info_t *pl, qboolean isteam) //display health bar if (scr_autoid_health.ival) { - float frac = health / 100; + float frac = health / 100.0; if (frac < 0) frac = 0; r = frac;