thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-03 06:33:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert r_patch.c to cpp

Browse source
This commit is contained in:
Eidolon 2023-01-19 14:19:16 -06:00
parent 892a19c85f
commit 6361d2e087
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -73,7 +73,7 @@ add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32
r_things.c r_things.c
r_bbox.c r_bbox.c
r_textures.c r_textures.c
r_patch.c r_patch.cpp
r_patchrotation.c r_patchrotation.c
r_picformats.c r_picformats.c
r_portal.c r_portal.c

12
src/r_patch.c → src/r_patch.cpp
View file

@ -26,7 +26,7 @@
patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest) 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<patch_t*>(Z_Calloc(sizeof(patch_t), PU_PATCH, NULL)) : (patch_t *)(dest);
if (source) if (source)
{ {
@ -38,7 +38,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
patch->height = SHORT(source->height); patch->height = SHORT(source->height);
patch->leftoffset = SHORT(source->leftoffset); patch->leftoffset = SHORT(source->leftoffset);
patch->topoffset = SHORT(source->topoffset); patch->topoffset = SHORT(source->topoffset);
patch->columnofs = Z_Calloc(size, PU_PATCH_DATA, NULL); patch->columnofs = static_cast<INT32*>(Z_Calloc(size, PU_PATCH_DATA, NULL));
for (col = 0; col < source->width; col++) 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) if (colsize <= 0)
I_Error("Patch_Create: no column data!"); I_Error("Patch_Create: no column data!");
patch->columns = Z_Calloc(colsize, PU_PATCH_DATA, NULL); patch->columns = static_cast<UINT8*>(Z_Calloc(colsize, PU_PATCH_DATA, NULL));
M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize); 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++) for (i = 0; i < rotsprite->angles; i++)
{ {
if (rotsprite->patches[i]) if (rotsprite->patches[i])
Patch_Free(rotsprite->patches[i]); Patch_Free(static_cast<patch_t*>(rotsprite->patches[i]));
} }
Z_Free(rotsprite->patches); Z_Free(rotsprite->patches);
@ -139,8 +139,8 @@ void *Patch_AllocateHardwarePatch(patch_t *patch)
{ {
if (!patch->hardware) if (!patch->hardware)
{ {
GLPatch_t *grPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware); GLPatch_t *grPatch = static_cast<GLPatch_t*>(Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware));
grPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &grPatch->mipmap); grPatch->mipmap = static_cast<GLMipmap_t*>(Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &grPatch->mipmap));
} }
return (void *)(patch->hardware); return (void *)(patch->hardware);
} }