diff --git a/src/command.c b/src/command.c index b7e1e01de..fa84626fb 100644 --- a/src/command.c +++ b/src/command.c @@ -628,7 +628,7 @@ static void COM_ExecuteString(char *ptext) // check cvars // Hurdler: added at Ebola's request ;) - // (don't flood the console in software mode with bad gr_xxx command) + // (don't flood the console in software mode with bad gl_xxx command) if (!CV_Command() && con_destlines) CONS_Printf(M_GetText("Unknown command '%s'\n"), COM_Argv(0)); } diff --git a/src/r_patch.c b/src/r_patch.c index eea97cfbb..c9ff704a7 100644 --- a/src/r_patch.c +++ b/src/r_patch.c @@ -775,11 +775,11 @@ static UINT16 GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip) #ifdef HWRENDER static patch_t *R_CreateHardwarePatch(patch_t *patch) { - GLPatch_t *grPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, NULL); - grPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, NULL); - grPatch->rawpatch = patch; - HWR_MakePatch(patch, grPatch, grPatch->mipmap, false); - return (patch_t *)grPatch; + GLPatch_t *glPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, NULL); + glPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, NULL); + glPatch->rawpatch = patch; + HWR_MakePatch(patch, glPatch, glPatch->mipmap, false); + return (patch_t *)glPatch; } #endif diff --git a/src/w_wad.c b/src/w_wad.c index aec7cb05a..ad506240d 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1699,7 +1699,7 @@ void *W_CacheLumpName(const char *name, INT32 tag) #ifdef HWRENDER FUNCINLINE static ATTRINLINE void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag) { - GLPatch_t *grPatch; + GLPatch_t *glPatch; if (rendermode == render_soft || rendermode == render_none) return W_CacheLumpNumPwad(wad, lump, tag); @@ -1707,29 +1707,29 @@ FUNCINLINE static ATTRINLINE void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, if (!TestValidLump(wad, lump)) return NULL; - grPatch = HWR_GetCachedGLPatchPwad(wad, lump); + glPatch = HWR_GetCachedGLPatchPwad(wad, lump); - if (grPatch->mipmap->data) + if (glPatch->mipmap->data) { if (tag == PU_CACHE) tag = PU_HWRCACHE; - Z_ChangeTag(grPatch->mipmap->data, tag); + Z_ChangeTag(glPatch->mipmap->data, tag); } else { patch_t *ptr = NULL; - // Only load the patch if we haven't initialised the grPatch yet - if (grPatch->mipmap->width == 0) - ptr = W_CacheLumpNumPwad(grPatch->wadnum, grPatch->lumpnum, PU_STATIC); + // Only load the patch if we haven't initialised the glPatch yet + if (glPatch->mipmap->width == 0) + ptr = W_CacheLumpNumPwad(glPatch->wadnum, glPatch->lumpnum, PU_STATIC); // Run HWR_MakePatch in all cases, to recalculate some things - HWR_MakePatch(ptr, grPatch, grPatch->mipmap, false); + HWR_MakePatch(ptr, glPatch, glPatch->mipmap, false); Z_Free(ptr); } // return GLPatch_t, which can be casted to (patch_t) with valid patch header info - return (void *)grPatch; + return (void *)glPatch; } void *W_CachePatchNum(lumpnum_t lumpnum, INT32 tag)