diff --git a/source/build/include/compat.h b/source/build/include/compat.h index dc7772b0d..ce267e673 100644 --- a/source/build/include/compat.h +++ b/source/build/include/compat.h @@ -743,7 +743,7 @@ template using make_signed_t = typename std::make_signed::type; template using make_unsigned_t = typename std::make_unsigned::type; -template +template using remove_pointer_t = typename std::remove_pointer::type; # endif diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index fdc038cac..0baa5c280 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -11727,7 +11727,7 @@ static int16_t mirbakdasector; void renderPrepareMirrorOld(int32_t dax, int32_t day, int32_t daz, fix16_t daang, fix16_t dahoriz, int16_t dawall, int16_t dasector, int32_t *tposx, int32_t *tposy, fix16_t *tang) { - mirrorrender = 1; + //mirrorrender = 1; const int32_t x = wall[dawall].x, dx = wall[wall[dawall].point2].x-x; const int32_t y = wall[dawall].y, dy = wall[wall[dawall].point2].y-y; @@ -11826,7 +11826,7 @@ void renderCompleteMirror(void) void renderCompleteMirrorOld(void) { - mirrorrender = 0; + //mirrorrender = 0; #ifdef USE_OPENGL if (videoGetRenderMode() != REND_CLASSIC) return; diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index 23d62241c..db2c80316 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -3166,9 +3166,6 @@ skip: ; { if (yax_drawcf != -1) yax_holecf[yax_drawcf][yax_holencf[yax_drawcf]++] = { dx0, dx1, vsp[i].cy[0], vsp[i].cy[1], n0.y, vsp[i].cy[1] }; - - if (editstatus && doeditorcheck) - polymost_polyeditorfunc(dpxy, n); } else #endif @@ -7587,7 +7584,6 @@ void polymost_initosdfuncs(void) { "r_nofog", "enable/disable GL fog", (void *)&nofog, CVAR_BOOL, 0, 1}, { "r_hightile","enable/disable hightile texture rendering",(void *) &usehightile, CVAR_BOOL, 0, 1 }, - { "r_preview_mouseaim", "toggles mouse aiming preview, use this to calibrate yxaspect in Polymost Mapster32", (void *) &preview_mouseaim, CVAR_BOOL, 0, 1 }, }; for (i=0; i