From f6c1c125ac4b30d6e24c6357c16cea793f329921 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 8 Jul 2012 21:47:19 +0000 Subject: [PATCH] Comment out printext256's GL mode fallback code. This would only hit when polymost_printext256 erred out (mem alloc failure, glGenTextures failure), i.e. "almost never". Also, tweak a bound check in polymost_printext256. git-svn-id: https://svn.eduke32.com/eduke32@2817 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/engine.c | 3 ++- polymer/eduke32/build/src/polymost.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index fccfedcd4..9e097c9ca 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -15725,7 +15725,7 @@ void printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const #ifdef USE_OPENGL if (!polymost_printext256(xpos,ypos,col,backcol,name,fontsize)) return; - +# if 0 if (rendmode >= 3 && qsetmode == 200) { int32_t xx, yy; @@ -15790,6 +15790,7 @@ void printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const return; } +# endif #endif begindrawing(); //{{{ diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c index 860a5b4f3..2cec31dfe 100644 --- a/polymer/eduke32/build/src/polymost.c +++ b/polymer/eduke32/build/src/polymost.c @@ -6089,7 +6089,7 @@ int32_t polymost_printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t ba GLfloat tx, ty, txc, tyc; int32_t c; palette_t p,b; - int32_t arbackcol = backcol >= 0 ? backcol : 0; + int32_t arbackcol = (unsigned)backcol < 256 ? backcol : 0; // FIXME? if (col < 0)