From 96af259c50f4806b4eb8482695266a018acfb3d3 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sat, 2 Sep 2023 16:02:42 -0500 Subject: [PATCH] r_plane.c -> r_plane.cpp --- src/CMakeLists.txt | 2 +- src/{r_plane.c => r_plane.cpp} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename src/{r_plane.c => r_plane.cpp} (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 89d4476b0..b8063f7c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,7 +72,7 @@ add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 r_draw.c r_fps.c r_main.c - r_plane.c + r_plane.cpp r_segs.cpp r_skins.c r_sky.c diff --git a/src/r_plane.c b/src/r_plane.cpp similarity index 98% rename from src/r_plane.c rename to src/r_plane.cpp index a66f6bad2..2e35f6087 100644 --- a/src/r_plane.c +++ b/src/r_plane.cpp @@ -330,7 +330,7 @@ static visplane_t *new_visplane(unsigned hash) visplane_t *check = freetail; if (!check) { - check = calloc(1, sizeof (*check)); + check = static_cast(calloc(1, sizeof (*check))); if (check == NULL) I_Error("%s: Out of memory", "new_visplane"); // FIXME: ugly } else @@ -786,11 +786,11 @@ d->z = (v1.x * v2.y) - (v1.y * v2.x) void R_SetTiltedSpan(INT32 span) { if (ds_su == NULL) - ds_su = Z_Malloc(sizeof(*ds_su) * vid.height, PU_STATIC, NULL); + ds_su = static_cast(Z_Malloc(sizeof(*ds_su) * vid.height, PU_STATIC, NULL)); if (ds_sv == NULL) - ds_sv = Z_Malloc(sizeof(*ds_sv) * vid.height, PU_STATIC, NULL); + ds_sv = static_cast(Z_Malloc(sizeof(*ds_sv) * vid.height, PU_STATIC, NULL)); if (ds_sz == NULL) - ds_sz = Z_Malloc(sizeof(*ds_sz) * vid.height, PU_STATIC, NULL); + ds_sz = static_cast(Z_Malloc(sizeof(*ds_sz) * vid.height, PU_STATIC, NULL)); ds_sup = &ds_su[span]; ds_svp = &ds_sv[span]; @@ -840,7 +840,7 @@ void R_DrawSinglePlane(visplane_t *pl) INT32 x, stop; ffloor_t *rover; INT32 type, spanfunctype = BASEDRAWFUNC; - debugrender_highlight_t debug = 0; + debugrender_highlight_t debug = debugrender_highlight_t::SW_HI_PLANES; void (*mapfunc)(INT32, INT32, INT32) = R_MapPlane; if (!(pl->minx <= pl->maxx))