diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h index f253eccb8..45d072c28 100644 --- a/src/hardware/hw_data.h +++ b/src/hardware/hw_data.h @@ -75,7 +75,6 @@ struct GLPatch_s { GLMipmap_t *mipmap; float max_s,max_t; - boolean notfound; // if the texture file was not found, mark it here (used in model texture loading) }; typedef struct GLPatch_s GLPatch_t; diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 418e7340a..0de904716 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -397,7 +397,7 @@ static void md2_loadTexture(md2_t *model) glPatch->mipmap->format = PCX_Load(filename, &w, &h, glPatch); if (glPatch->mipmap->format == 0) { - glPatch->notfound = true;// mark it so its not searched for again repeatedly + model->notexturefile = true; // mark it so its not searched for again repeatedly return; } @@ -468,7 +468,7 @@ static void md2_loadBlendTexture(md2_t *model) glPatch->mipmap->format = PCX_Load(filename, &w, &h, glPatch); if (glPatch->mipmap->format == 0) { - glPatch->notfound = true;// mark it so its not searched for again repeatedly + model->noblendfile = true; // mark it so its not searched for again repeatedly Z_Free(filename); return; } @@ -505,6 +505,8 @@ void HWR_InitMD2(void) md2_playermodels[s].model = NULL; md2_playermodels[s].glpatch = NULL; md2_playermodels[s].skin = -1; + md2_playermodels[s].notexturefile = false; + md2_playermodels[s].noblendfile = false; md2_playermodels[s].notfound = true; md2_playermodels[s].error = false; } @@ -514,6 +516,8 @@ void HWR_InitMD2(void) md2_localplayermodels[s].model = NULL; md2_localplayermodels[s].glpatch = NULL; md2_localplayermodels[s].skin = -1; + md2_localplayermodels[s].notexturefile = false; + md2_localplayermodels[s].noblendfile = false; md2_localplayermodels[s].notfound = true; md2_localplayermodels[s].error = false; } @@ -523,6 +527,8 @@ void HWR_InitMD2(void) md2_models[i].model = NULL; md2_models[i].glpatch = NULL; md2_models[i].skin = -1; + md2_models[s].notexturefile = false; + md2_models[s].noblendfile = false; md2_models[i].notfound = true; md2_models[i].error = false; } @@ -543,21 +549,10 @@ void HWR_InitMD2(void) } while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4) { - /*if (stricmp(name, "PLAY") == 0) - { - CONS_Printf("MD2 for sprite PLAY detected in mdls.dat, use a player skin instead!\n"); - continue; - }*/ - // 8/1/19: Allow PLAY to load for default MD2. - for (i = 0; i < NUMSPRITES; i++) { if (stricmp(name, sprnames[i]) == 0) { - //if (stricmp(name, "PLAY") == 0) - //continue; - - //CONS_Debug(DBG_RENDER, " Found: %s %s %f %f\n", name, filename, scale, offset); md2_models[i].scale = scale; md2_models[i].offset = offset; md2_models[i].notfound = false; @@ -570,7 +565,6 @@ void HWR_InitMD2(void) { if (stricmp(name, skins[s].name) == 0) { - //CONS_Printf(" Found: %s %s %f %f\n", name, filename, scale, offset); md2_playermodels[s].skin = s; md2_playermodels[s].scale = scale; md2_playermodels[s].offset = offset; @@ -1296,7 +1290,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) hwrPatch = ((GLPatch_t *)gpatch->hardware); if (!gpatch || !hwrPatch - || ((!hwrPatch->mipmap->format || !hwrPatch->mipmap->downloaded) && !hwrPatch->notfound)) + || ((!hwrPatch->mipmap->format || !hwrPatch->mipmap->downloaded) && !md2->notexturefile)) md2_loadTexture(md2); // Load it again, because it isn't being loaded into gpatch after md2_loadtexture... @@ -1311,7 +1305,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) if ((gpatch && hwrPatch && hwrPatch->mipmap->format) // don't load the blend texture if the base texture isn't available && (!blendgpatch || !hwrBlendPatch - || ((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !hwrPatch->notfound))) + || ((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !md2->noblendfile))) md2_loadBlendTexture(md2); // Load it again, because it isn't being loaded into blendgpatch after md2_loadblendtexture... diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h index e9eafd387..2e3e005b7 100644 --- a/src/hardware/hw_md2.h +++ b/src/hardware/hw_md2.h @@ -29,7 +29,9 @@ typedef struct float offset; model_t *model; void *glpatch; + boolean notexturefile; // true if texture file was not found void *blendglpatch; + boolean noblendfile; // true if blend texture file was not found boolean notfound; INT32 skin; boolean error;