From 070c38a85ef03dadee81aa3c33bd2e2750ebc9a1 Mon Sep 17 00:00:00 2001 From: terminx Date: Wed, 7 Mar 2007 20:18:48 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@515 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/src/mdsprite.c | 2 +- polymer/build/src/polymost.c | 6 ++---- polymer/eduke32/source/game.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/polymer/build/src/mdsprite.c b/polymer/build/src/mdsprite.c index 2224ab248..e77fd28f6 100644 --- a/polymer/build/src/mdsprite.c +++ b/polymer/build/src/mdsprite.c @@ -836,7 +836,7 @@ static long mdloadskin (md2model *m, int number, int pal, int surf) return(*texidx); } -char mdpause; +int mdpause; //Note: even though it says md2model, it works for both md2model&md3model static void updateanimation (md2model *m, spritetype *tspr) diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c index a29696826..0c94fef8d 100644 --- a/polymer/build/src/polymost.c +++ b/polymer/build/src/polymost.c @@ -412,6 +412,8 @@ pthtyp * gltexcache (long dapicnum, long dapalnum, long dameth) { memcpy(pth, pth2, sizeof(pthtyp)); pth->picnum = dapicnum; + pth->flags = ((dameth&4)>>2) + 2 + ((drawingskybox>0)<<2); + if (pth2->flags & 8) pth->flags |= 8; //hasalpha pth->hicr = si; pth->next = gltexcachead[j]; gltexcachead[j] = pth; @@ -1710,8 +1712,6 @@ void drawpoly (double *dpx, double *dpy, long n, long method) bglMatrixMode(GL_MODELVIEW); } - else - detailpth = NULL; // glow texture glowpth = NULL; @@ -1745,8 +1745,6 @@ void drawpoly (double *dpx, double *dpy, long n, long method) bglTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT); bglTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT); } - else - glowpth = NULL; if (pth && (pth->flags & 2)) { diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 87291d301..f327c6bf6 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -3458,7 +3458,7 @@ void displayrest(long smoothratio) #if defined(POLYMOST) && defined(USE_OPENGL) { - extern char mdpause; + extern int mdpause; mdpause = 0; if (ud.pause_on || (ps[myconnectindex].gm&MODE_MENU && numplayers < 2))