Revert hightile factoring for now.

git-svn-id: https://svn.eduke32.com/eduke32@2825 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
Plagman 2012-07-11 04:39:01 +00:00
parent 0482d67894
commit 7e16357c68
2 changed files with 4 additions and 4 deletions

View file

@ -821,8 +821,8 @@ int32_t mdloadskin(md2model_t *m, int32_t number, int32_t pal, int32_t surf)
if (*texidx) if (*texidx)
return *texidx; return *texidx;
// possibly fetch an already loaded texture // possibly fetch an already loaded multitexture :_)
if (sk) if (pal >= (MAXPALOOKUPS - RESERVEDPALS))
for (i=0; i<nextmodelid; i++) for (i=0; i<nextmodelid; i++)
for (skzero = ((md2model_t *)models[i])->skinmap; skzero; skzero = skzero->next) for (skzero = ((md2model_t *)models[i])->skinmap; skzero; skzero = skzero->next)
if (!Bstrcasecmp(skzero->fn, sk->fn) && skzero->texid[hicfxmask(pal)]) if (!Bstrcasecmp(skzero->fn, sk->fn) && skzero->texid[hicfxmask(pal)])

View file

@ -363,8 +363,8 @@ pthtyp *gltexcache(int32_t dapicnum, int32_t dapalnum, int32_t dameth)
pth = (pthtyp *)Bcalloc(1,sizeof(pthtyp)); pth = (pthtyp *)Bcalloc(1,sizeof(pthtyp));
if (!pth) return NULL; if (!pth) return NULL;
// possibly fetch an already loaded texture // possibly fetch an already loaded multitexture :_)
if (si->filename) // false if skybox; we can probably ignore that for now if (dapalnum >= (MAXPALOOKUPS - RESERVEDPALS))
for (i = (GLTEXCACHEADSIZ - 1); i >= 0; i--) for (i = (GLTEXCACHEADSIZ - 1); i >= 0; i--)
for (pth2=gltexcachead[i]; pth2; pth2=pth2->next) for (pth2=gltexcachead[i]; pth2; pth2=pth2->next)
{ {