Fix compilation with NOHW and NOOPENMPT

This commit is contained in:
indev committed 2023-11-06 12:00:47 +03:00
1 parent 153ae53f8c
commit 27734387c0
3 files changed
+1037 -1038

No files matched your search

+2 -6
View File
@@ -315,9 +315,7 @@ menu_t OP_VideoOptionsDef, OP_VideoModeDef;
menu_t OP_OpenGLOptionsDef, OP_OpenGLColorDef;
#endif
menu_t OP_SoundOptionsDef;
#ifdef HAVE_OPENMPT
menu_t OP_SoundAdvancedDef;
#endif
//static void M_RestartAudio(void);
//Misc
@@ -1437,9 +1435,9 @@ static menuitem_t OP_SoundAdvancedMenu[] =
{IT_STRING | IT_CVAR, NULL, "Amiga Type", &cv_amigatype, 62},
#endif
{IT_STRING | IT_CVAR, NULL, "Stereo Seperation", &cv_stereosep, 82},
#endif
#endif
{IT_HEADER, NULL, "Misc", NULL, 105},
{IT_STRING | IT_CVAR, NULL, "Grow Music", &cv_growmusic, 117},
{IT_STRING | IT_CVAR, NULL, "Invulnerability Music", &cv_supermusic, 137},
};
@@ -2365,9 +2363,7 @@ menu_t OP_HUDOptionsDef =
menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 30);
#ifdef HAVE_OPENMPT
menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
#endif
menu_t OP_GameOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_GameOptionsMenu, &OP_MainDef, 30, 30);
menu_t OP_ServerOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 24, 30);
+1020 -1018
View File
File diff suppressed because it is too large. Load diff
+15 -14
View File
@@ -1981,7 +1981,6 @@ void I_StartupGraphics(void)
#ifdef HWRENDER
else if (M_CheckParm("-opengl"))
rendermode = render_opengl;
#endif
msaa = 0; boolean msaa_set = false;
a2c = false; boolean a2c_set = false;
@@ -2011,7 +2010,6 @@ void I_StartupGraphics(void)
FILE * file = OpenRendererFile("r");
if (file != NULL)
{
#ifdef HWRENDER
while (fgets(line, sizeof line, file) != NULL)
{
word = strtok(line, " \n");
@@ -2063,18 +2061,19 @@ void I_StartupGraphics(void)
fclose(file);
}
#endif
if (rendermode == render_none)
{
#ifdef HWRENDER
rendermode = render_opengl;
CONS_Printf("Defaulting to OpenGL renderer.\n");
#else
rendermode = render_soft;
CONS_Printf("Using default software renderer.\n");
#endif
}
}
#endif
if (rendermode == render_none)
{
#ifdef HWRENDER
rendermode = render_opengl;
CONS_Printf("Defaulting to OpenGL renderer.\n");
#else
rendermode = render_soft;
CONS_Printf("Using default software renderer.\n");
#endif
}
{
FILE * file = OpenRendererFile("w");
@@ -2089,10 +2088,12 @@ void I_StartupGraphics(void)
fputs("opengl\n", file);
}
#ifdef HWRENDER
fprintf(file, "msaa %u\n", msaa);
if (a2c)
fputs("a2c\n", file);
#endif
fclose(file);
}
@@ -2150,7 +2151,7 @@ void I_StartupGraphics(void)
HWD.pfnStartBatching = hwSym("StartBatching",NULL);
HWD.pfnRenderBatches = hwSym("RenderBatches",NULL);
HWD.pfnAddLightTable = hwSym("AddLightTable",NULL);
HWD.pfnClearLightTableCache = hwSym("ClearLightTableCache",NULL);