zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make it compile again.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-19 11:43:11 +02:00
parent 8f6f979fa5
commit e1e8b835db
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5296,7 +5296,7 @@ void polymost_drawrooms()
videoEndDrawing(); videoEndDrawing();
} }
void (int32_t damaskwallcnt) void polymost_drawmaskwall(int32_t damaskwallcnt)
{ {
int const z = maskwall[damaskwallcnt]; int const z = maskwall[damaskwallcnt];
uwalltype const * const wal = (uwalltype *)&wall[thewall[z]], *wal2 = (uwalltype *)&wall[wal->point2]; uwalltype const * const wal = (uwalltype *)&wall[thewall[z]], *wal2 = (uwalltype *)&wall[wal->point2];

13
source/rr/src/menus.cpp
View file

@ -547,13 +547,6 @@ static MenuEntry_t ME_DISPLAYSETUP_ASPECTRATIO = MAKE_MENUENTRY( "Widescreen:",
#ifdef USE_OPENGL #ifdef USE_OPENGL
static int32_t MEOSV_PaletteEmulation[] = { 0, r_usetileshades };
static MenuOptionSet_t MEOS_PaletteEmulation = MAKE_MENUOPTIONSET( MEOSN_OffOn, MEOSV_PaletteEmulation, 0x3 );
# if 1//def POLYMER
# ifdef EDUKE32_SIMPLE_MENU
static MenuOption_t MEO_DISPLAYSETUP_PALETTEEMULATION = MAKE_MENUOPTION(&MF_Redfont, &MEOS_PaletteEmulation, &r_usetileshades);
static MenuEntry_t ME_DISPLAYSETUP_PALETTEEMULATION = MAKE_MENUENTRY("Palette emulation:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_PALETTEEMULATION, Option);
# endif
//POGOTODO: allow filtering again in standalone once indexed colour textures support filtering //POGOTODO: allow filtering again in standalone once indexed colour textures support filtering
static char const *MEOSN_DISPLAYSETUP_TEXFILTER[] = { "Classic", "Filtered" }; static char const *MEOSN_DISPLAYSETUP_TEXFILTER[] = { "Classic", "Filtered" };
@ -577,7 +570,6 @@ static MenuRangeFloat_t MEO_DISPLAYSETUP_TOUCHALPHA = MAKE_MENURANGE(&droidinput
static MenuEntry_t ME_DISPLAYSETUP_TOUCHALPHA = MAKE_MENUENTRY("UI opacity:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_TOUCHALPHA, RangeFloat); static MenuEntry_t ME_DISPLAYSETUP_TOUCHALPHA = MAKE_MENUENTRY("UI opacity:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_TOUCHALPHA, RangeFloat);
# endif # endif
#endif
static char const s_Scale[] = "Scale:"; static char const s_Scale[] = "Scale:";
@ -1014,8 +1006,6 @@ static MenuEntry_t ME_RENDERERSETUP_GLOWTEX = MAKE_MENUENTRY("Glow textures:", &
# endif # endif
static MenuOption_t MEO_RENDERERSETUP_MODELS = MAKE_MENUOPTION( &MF_Bluefont, &MEOS_NoYes, &usemodels ); static MenuOption_t MEO_RENDERERSETUP_MODELS = MAKE_MENUOPTION( &MF_Bluefont, &MEOS_NoYes, &usemodels );
static MenuEntry_t ME_RENDERERSETUP_MODELS = MAKE_MENUENTRY( "3D models:", &MF_Bluefont, &MEF_SmallOptions, &MEO_RENDERERSETUP_MODELS, Option ); static MenuEntry_t ME_RENDERERSETUP_MODELS = MAKE_MENUENTRY( "3D models:", &MF_Bluefont, &MEF_SmallOptions, &MEO_RENDERERSETUP_MODELS, Option );
static MenuOption_t MEO_RENDERERSETUP_PALETTEEMULATION = MAKE_MENUOPTION(&MF_Bluefont, &MEOS_PaletteEmulation, &r_usetileshades);
static MenuEntry_t ME_RENDERERSETUP_PALETTEEMULATION = MAKE_MENUENTRY("Palette emulation:", &MF_Bluefont, &MEF_SmallOptions, &MEO_RENDERERSETUP_PALETTEEMULATION, Option);
#endif #endif
@ -1030,7 +1020,6 @@ static MenuEntry_t *MEL_RENDERERSETUP_POLYMOST[] = {
# endif # endif
&ME_Space4_Bluefont, &ME_Space4_Bluefont,
&ME_RENDERERSETUP_MODELS, &ME_RENDERERSETUP_MODELS,
&ME_RENDERERSETUP_PALETTEEMULATION,
}; };
#endif #endif
@ -2025,8 +2014,6 @@ static void Menu_Pre(MenuID_t cm)
MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_DETAILTEX, !usehightile); MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_DETAILTEX, !usehightile);
MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_GLOWTEX, !usehightile); MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_GLOWTEX, !usehightile);
# endif # endif
// don't allow changing palette emulation while in POLYMOST and r_useindexedcolortextures is enabled
MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_PALETTEEMULATION, videoGetRenderMode() == REND_POLYMOST && r_useindexedcolortextures);
break; break;
#endif #endif

3
source/rr/src/screens.cpp
View file

@ -694,8 +694,7 @@ static void G_PrintCoords(int32_t snum)
else else
printcoordsline("r_pr_artmapping = %d", pr_artmapping); printcoordsline("r_pr_artmapping = %d", pr_artmapping);
#endif #endif
printcoordsline("r_usetileshades = %d", r_usetileshades); }
}
} }
#endif #endif
} }