From 6361d2e0878e5d71736afe7c2e806d4821869ec9 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Thu, 19 Jan 2023 14:19:16 -0600 Subject: [PATCH] Convert r_patch.c to cpp --- src/CMakeLists.txt | 2 +- src/{r_patch.c => r_patch.cpp} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename src/{r_patch.c => r_patch.cpp} (85%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 87676244f..d3fa2d0c0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,7 +73,7 @@ add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 r_things.c r_bbox.c r_textures.c - r_patch.c + r_patch.cpp r_patchrotation.c r_picformats.c r_portal.c diff --git a/src/r_patch.c b/src/r_patch.cpp similarity index 85% rename from src/r_patch.c rename to src/r_patch.cpp index 8cf89fa3d..a27e8035c 100644 --- a/src/r_patch.c +++ b/src/r_patch.cpp @@ -26,7 +26,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest) { - patch_t *patch = (dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : (patch_t *)(dest); + patch_t *patch = (dest == NULL) ? static_cast(Z_Calloc(sizeof(patch_t), PU_PATCH, NULL)) : (patch_t *)(dest); if (source) { @@ -38,7 +38,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_PATCH_DATA, NULL); + patch->columnofs = static_cast(Z_Calloc(size, PU_PATCH_DATA, NULL)); for (col = 0; col < source->width; col++) { @@ -54,7 +54,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_PATCH_DATA, NULL); + patch->columns = static_cast(Z_Calloc(colsize, PU_PATCH_DATA, NULL)); M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize); } @@ -87,7 +87,7 @@ static void Patch_FreeData(patch_t *patch) for (i = 0; i < rotsprite->angles; i++) { if (rotsprite->patches[i]) - Patch_Free(rotsprite->patches[i]); + Patch_Free(static_cast(rotsprite->patches[i])); } Z_Free(rotsprite->patches); @@ -139,8 +139,8 @@ void *Patch_AllocateHardwarePatch(patch_t *patch) { if (!patch->hardware) { - GLPatch_t *grPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware); - grPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &grPatch->mipmap); + GLPatch_t *grPatch = static_cast(Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware)); + grPatch->mipmap = static_cast(Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &grPatch->mipmap)); } return (void *)(patch->hardware); }