zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-20 14:32:28 +02:00
parent 2e75437262
commit 8de0fd35a1
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/build/include/compat.h
View file

@ -743,7 +743,7 @@ template <typename T>
using make_signed_t = typename std::make_signed<T>::type; using make_signed_t = typename std::make_signed<T>::type;
template <typename T> template <typename T>
using make_unsigned_t = typename std::make_unsigned<T>::type; using make_unsigned_t = typename std::make_unsigned<T>::type;
template <class T> template <class T>
using remove_pointer_t = typename std::remove_pointer<T>::type; using remove_pointer_t = typename std::remove_pointer<T>::type;
# endif # endif

4
source/build/src/engine.cpp
View file

@ -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, 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) 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 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; const int32_t y = wall[dawall].y, dy = wall[wall[dawall].point2].y-y;
@ -11826,7 +11826,7 @@ void renderCompleteMirror(void)
void renderCompleteMirrorOld(void) void renderCompleteMirrorOld(void)
{ {
mirrorrender = 0; //mirrorrender = 0;
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (videoGetRenderMode() != REND_CLASSIC) if (videoGetRenderMode() != REND_CLASSIC)
return; return;

4
source/build/src/polymost.cpp
View file

@ -3166,9 +3166,6 @@ skip: ;
{ {
if (yax_drawcf != -1) 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] }; 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 else
#endif #endif
@ -7587,7 +7584,6 @@ void polymost_initosdfuncs(void)
{ "r_nofog", "enable/disable GL fog", (void *)&nofog, CVAR_BOOL, 0, 1}, { "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_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<ARRAY_SIZE(cvars_polymost); i++) for (i=0; i<ARRAY_SIZE(cvars_polymost); i++)