From b0ba261e149a94e33fa3f29586f163d828dc008e Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 15 Apr 2025 14:32:42 +0200 Subject: [PATCH] change those tags also add PU_PATCH_DATA --- src/r_patch.c | 6 +++--- src/z_zone.h | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/r_patch.c b/src/r_patch.c index 20444d9b4..c10a8cd95 100644 --- a/src/r_patch.c +++ b/src/r_patch.c @@ -336,7 +336,7 @@ static unsigned char imgbuf[1<<26]; patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest) { - patch_t *patch = (dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_CACHE, NULL) : (patch_t *)(dest); + patch_t *patch = (dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : (patch_t *)(dest); if (source) { @@ -348,7 +348,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest) patch->height = SHORT(source->height); patch->leftoffset = SHORT(source->leftoffset); patch->topoffset = SHORT(source->topoffset); - patch->columnofs = Z_Calloc(size, PU_CACHE, NULL); + patch->columnofs = Z_Calloc(size, PU_PATCH_DATA, NULL); for (col = 0; col < source->width; col++) { @@ -364,7 +364,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest) if (colsize <= 0) I_Error("Patch_Create: no column data!"); - patch->columns = Z_Calloc(colsize, PU_CACHE, NULL); + patch->columns = Z_Calloc(colsize, PU_PATCH_DATA, NULL); M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize); } diff --git a/src/z_zone.h b/src/z_zone.h index 1c5bdffd5..bb4597ac5 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -45,11 +45,12 @@ enum PU_SOUND = 11, // static while playing PU_MUSIC = 12, // static while playing - PU_PATCH = 13, // static entire execution time - PU_PATCH_LOWPRIORITY = 14, // lower priority patch, static until level exited - PU_PATCH_ROTATED = 15, // rotated patch, static until level exited or WAD added - PU_SPRITE = 16, // sprite patch, static until WAD added - PU_HUDGFX = 17, // HUD patch, static until WAD added + PU_PATCH = 14, // static entire execution time + PU_PATCH_LOWPRIORITY = 15, // lower priority patch, static until level exited + PU_PATCH_ROTATED = 16, // rotated patch, static until level exited or WAD added + PU_PATCH_DATA = 17, // patch data, lifetime depends on the patch that owns it + PU_SPRITE = 18, // sprite patch, static until WAD added + PU_HUDGFX = 19, // HUD patch, static until WAD added PU_HWRPATCHINFO = 21, // Hardware GLPatch_t struct for OpenGL texture cache PU_HWRPATCHCOLMIPMAP = 22, // Hardware GLMipmap_t struct colormap variation of patch