Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove leftover glide renderer references

Browse Source
This commit is contained in:
Louis Gombert 2024-07-28 19:28:56 +02:00
parent 529e5de6d3
commit ae58bb674f
5 changed files with 2 additions and 5001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Descent3/config.cpp
View File

@ -352,7 +352,7 @@ tGameToggles Game_toggles = { // toggles specified in general settings.
// video defines
#define VID_D3D 0
#define VID_GLIDE 1
#define VID_GLIDE 1 // Unused
#define VID_OPENGL 2
// small view settings

8
Descent3/game.cpp
View File

@ -948,14 +948,6 @@ void SetScreenMode(int sm, bool force_res_change) {
rend_initted = 0;
}
}
// #ifdef RELEASE
// else if (sm == SM_CINEMATIC && (Renderer_type == RENDERER_GLIDE) ) {
// if (rend_initted) {
// rend_Close();
// rend_initted = 0;
// }
// }
// #endif
else {
int scr_width, scr_height, scr_bitdepth;

47
Descent3/sdlmain.cpp
View File

@ -66,18 +66,9 @@ static volatile char already_tried_signal_cleanup = 0;
void ddio_InternalClose(); // needed for emergency cleanup.
#ifdef __PERMIT_LINUX_GLIDE
void glide_Close(void);
#endif
void just_exit(void) {
ddio_InternalClose(); // try to reset serial port.
#ifdef __PERMIT_LINUX_GLIDE
if (Renderer_type == RENDERER_GLIDE)
glide_Close();
#endif
SDL_Quit();
#if defined(POSIX)
sync(); // just in case.
@ -440,37 +431,6 @@ int main(int argc, char *argv[]) {
return 0;
}
#ifdef __PERMIT_LINUX_GLIDE
int opengl_rend = (FindArgChar("+rend_opengl", 'G')) ? 1 : 0;
int glide_rend = (FindArgChar("+rend_glide", 'L')) ? 1 : 0;
if (!glide_rend && !opengl_rend) {
// fprintf(stderr,"Error: --dedicated or renderer flag required\n");
// return 0;
// ryan sez: Glide by default, beeyatch.
glide_rend = 1;
}
// check for multiple renderers defined
if (glide_rend + opengl_rend > 1) {
fprintf(stderr, "Error: Too many renderer's defined, use only one\n");
return 0;
}
/*
//print out renderer
if(glide_rend)
{
fprintf(stderr,"Renderer: GLiDE\n");
}
if(opengl_rend)
{
fprintf(stderr,"Renderer: OpenGL\n");
}
*/
#endif
if (FindArgChar("-nomousegrab", 'm')) {
flags |= APPFLAG_NOMOUSECAPTURE;
}
@ -480,14 +440,7 @@ int main(int argc, char *argv[]) {
if (!FindArg("-sharedmemory")) {
flags |= APPFLAG_NOSHAREDMEMORY;
}
#ifdef __PERMIT_LINUX_GLIDE
if (FindArgChar("+rend_opengl", 'G')) {
flags |= APPFLAG_WINDOWEDMODE;
}
#else
flags |= APPFLAG_WINDOWEDMODE;
#endif
if (!FindArg("-nodgamouse")) {
flags |= APPFLAG_DGAMOUSE;

4944
lib/linux/dyna_glide.h
View File

File diff suppressed because it is too large Load Diff

2
lib/renderer.h
View File

@ -319,7 +319,7 @@ extern int Triangles_drawn;
enum renderer_type {
RENDERER_OPENGL = 2,
RENDERER_DIRECT3D = 3,
RENDERER_GLIDE = 4,
RENDERER_GLIDE = 4, // Unused
RENDERER_NONE = 5,
};