Fixed a minor error in the Linux vid modes
This commit is contained in:
@@ -599,7 +599,7 @@ db 'VideoMode = %U',13,10
|
|||||||
db '',13,10
|
db '',13,10
|
||||||
%elifdef __LINUX__
|
%elifdef __LINUX__
|
||||||
%ifdef __OPENGL__
|
%ifdef __OPENGL__
|
||||||
db '; Video Mode, 0 - 7',13,10
|
db '; Video Mode, 0 - 6',13,10
|
||||||
%else
|
%else
|
||||||
db '; Video Mode, 0 - 3',13,10
|
db '; Video Mode, 0 - 3',13,10
|
||||||
%endif
|
%endif
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ int UseOpenGL = 0;
|
|||||||
int glfilters = GL_NEAREST;
|
int glfilters = GL_NEAREST;
|
||||||
extern Uint8 BilinearFilter;
|
extern Uint8 BilinearFilter;
|
||||||
extern Uint8 FilteredGUI;
|
extern Uint8 FilteredGUI;
|
||||||
|
extern Uint8 GUIOn2;
|
||||||
#endif
|
#endif
|
||||||
extern unsigned char cvidmode;
|
extern unsigned char cvidmode;
|
||||||
DWORD vidbuff_w, vidbuff_h;
|
DWORD vidbuff_w, vidbuff_h;
|
||||||
@@ -1113,8 +1114,14 @@ void drawscreenwin(void)
|
|||||||
for (j = 0; j<224; j++) {
|
for (j = 0; j<224; j++) {
|
||||||
memcpy(glvidbuffer + 256*j, (short *) (vidbuffer) + 16 + 288 + (256+32)*j, 256*2);
|
memcpy(glvidbuffer + 256*j, (short *) (vidbuffer) + 16 + 288 + (256+32)*j, 256*2);
|
||||||
}
|
}
|
||||||
if (BilinearFilter && FilteredGUI) glfilters = GL_LINEAR; else glfilters = GL_NEAREST;
|
if (BilinearFilter) {
|
||||||
if (FullScreen && cvidmode != 7) ratiox = 0.875; else ratiox = 1.0;
|
glfilters = GL_LINEAR;
|
||||||
|
if (GUIOn2 && !FilteredGUI) glfilters = GL_NEAREST;
|
||||||
|
} else {
|
||||||
|
glfilters = GL_NEAREST;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (FullScreen) ratiox = 0.875; else ratiox = 1.0;
|
||||||
|
|
||||||
glClear(GL_COLOR_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT);
|
||||||
glLoadIdentity();
|
glLoadIdentity();
|
||||||
|
|||||||
Reference in New Issue
Block a user