From b5def1487ba5eabb6ac768c2a2ffb09d3aee28b6 Mon Sep 17 00:00:00 2001 From: driAn Date: Wed, 9 Nov 2005 20:19:20 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@86 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/rendergl.cpp | 2 +- source/src/rendermd3.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index 27e60f3f..96bcc46f 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -78,7 +78,7 @@ bool installtex(int tnum, char *texname, int &xs, int &ys, bool clamp, bool high glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clamp ? GL_CLAMP_TO_EDGE : GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clamp ? GL_CLAMP_TO_EDGE : GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); //NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, highqual ? GL_LINEAR : GL_LINEAR_MIPMAP_LINEAR); //NEAREST); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); xs = s->w; ys = s->h; diff --git a/source/src/rendermd3.cpp b/source/src/rendermd3.cpp index 279d7614..af26b53f 100644 --- a/source/src/rendermd3.cpp +++ b/source/src/rendermd3.cpp @@ -307,7 +307,8 @@ void md3skin(char *objname, char *skin) // called by the {lower|upper|head}.cfg { int xs, ys; sprintf_sd(path)("%s/%s", basedir, skin); // 'skin' is a relative url - installtex(FIRSTMD3 + numskins, path, xs, ys, true); + bool highqual = strstr(basedir, "weapons") != NULL; + installtex(FIRSTMD3 + numskins, path, xs, ys, true, highqual); mesh->tex = numskins; numskins++; };