a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed SDL video labels. Organized video output in config. Enabled HQ2X on Variable OGL and fixed it's ratio.

Browse Source
This commit is contained in:
n-a-c-h
2005-01-12 13:19:16 +00:00
parent d76fd1ee38
commit 095c34d11d
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
zsnes/src/cfgload.c
View File

@@ -425,23 +425,23 @@ void DOScreatenewcfg()
#ifdef __WIN32__ #ifdef __WIN32__
WRITE_LINE("; Video Mode, 0 - 32\r\n"); WRITE_LINE("; Video Mode, 0 - 32\r\n");
WRITE_LINE("; 0 = 256x224 R WIN 1 = 256x224 R FULL\r\n"); WRITE_LINE("; 0 = 256x224 R WIN 1 = 256x224 R FULL\r\n");
WRITE_LINE("; 2 = 512x448 R WIN 3 = 512x448 DR WIN\r\n"); WRITE_LINE("; 2 = 512x448 R WIN 3 = 512x448 DR WIN\r\n");
WRITE_LINE("; 4 = 640x480 S WIN 5 = 640x480 DS WIN\r\n"); WRITE_LINE("; 4 = 640x480 S WIN 5 = 640x480 DS WIN\r\n");
WRITE_LINE("; 6 = 640x480 DR FULL 7 = 640x480 DS FULL\r\n"); WRITE_LINE("; 6 = 640x480 DR FULL 7 = 640x480 DS FULL\r\n");
WRITE_LINE("; 8 = 640x480 S FULL 9 = 768x672 R WIN\r\n"); WRITE_LINE("; 8 = 640x480 S FULL 9 = 768x672 R WIN\r\n");
WRITE_LINE("; 10 = 768x672 DR WIN 11 = 800x600 S WIN\r\n"); WRITE_LINE("; 10 = 768x672 DR WIN 11 = 800x600 S WIN\r\n");
WRITE_LINE("; 12 = 800x600 DS WIN 13 = 800x600 S FULL\r\n"); WRITE_LINE("; 12 = 800x600 DS WIN 13 = 800x600 S FULL\r\n");
WRITE_LINE("; 14 = 800x600 DR FULL 15 = 800x600 DS FULL\r\n"); WRITE_LINE("; 14 = 800x600 DR FULL 15 = 800x600 DS FULL\r\n");
WRITE_LINE("; 16 = 1024x768 S WIN 17 = 1024x768 DS WIN\r\n"); WRITE_LINE("; 16 = 1024x768 S WIN 17 = 1024x768 DS WIN\r\n");
WRITE_LINE("; 18 = 1024x768 S FULL 19 = 1024x768 DR FULL\r\n"); WRITE_LINE("; 18 = 1024x768 S FULL 19 = 1024x768 DR FULL\r\n");
WRITE_LINE("; 20 = 1024x768 DS FULL 21 = 1024x896 R WIN\r\n"); WRITE_LINE("; 20 = 1024x768 DS FULL 21 = 1024x896 R WIN\r\n");
WRITE_LINE("; 22 = 1024x896 DR WIN 23 = 1280x960 S WIN\r\n"); WRITE_LINE("; 22 = 1024x896 DR WIN 23 = 1280x960 S WIN\r\n");
WRITE_LINE("; 24 = 1280x960 DS WIN 25 = 1280x960 S FULL\r\n"); WRITE_LINE("; 24 = 1280x960 DS WIN 25 = 1280x960 S FULL\r\n");
WRITE_LINE("; 26 = 1280x960 DR FULL 27 = 1280x960 DS FULL\r\n"); WRITE_LINE("; 26 = 1280x960 DR FULL 27 = 1280x960 DS FULL\r\n");
WRITE_LINE("; 28 = 1280x1024 S WIN 29 = 1280x1024 DS WIN\r\n"); WRITE_LINE("; 28 = 1280x1024 S WIN 29 = 1280x1024 DS WIN\r\n");
WRITE_LINE("; 30 = 1280x1024 S FULL 31 = 1280x1024 DR FULL\r\n"); WRITE_LINE("; 30 = 1280x1024 S FULL 31 = 1280x1024 DR FULL\r\n");
WRITE_LINE("; 32 = 1280x1024 DS FULL\r\n\r\n"); WRITE_LINE("; 32 = 1280x1024 DS FULL\r\n\r\n");
sprintf(buffer, "VideoModeWin = %d\r\n\r\n", cfgcvidmode); sprintf(buffer, "VideoModeWin = %d\r\n\r\n", cfgcvidmode);
SAVE_LINE(buffer); SAVE_LINE(buffer);
#endif #endif
@@ -451,16 +451,16 @@ void DOScreatenewcfg()
#else #else
WRITE_LINE("; Video Mode, 0 - 3\r\n"); WRITE_LINE("; Video Mode, 0 - 3\r\n");
#endif #endif
WRITE_LINE("; 0 = 256x224 WIN 1 = 256x224 FULL\r\n"); WRITE_LINE("; 0 = 256x224 R WIN 1 = 256x224 R FULL\r\n");
WRITE_LINE("; 2 = 512x448 WIN 3 = 640x480 FULL\r\n"); WRITE_LINE("; 2 = 512x448 DR WIN 3 = 640x480 DS FULL\r\n");
#ifdef __OPENGL__ #ifdef __OPENGL__
WRITE_LINE("; 4 = 256x224 OR WIN 5 = 512x448 ODR WIN\r\n"); WRITE_LINE("; 4 = 256x224 OR WIN 5 = 512x448 ODR WIN\r\n");
WRITE_LINE("; 6 = 640x480 ODS FULL 7 = 640x480 ODS WIN\r\n"); WRITE_LINE("; 6 = 640x480 ODS FULL 7 = 640x480 ODS WIN\r\n");
WRITE_LINE("; 8 = 640x576 ODR WIN 9 = 768x672 ODR WIN\r\n"); WRITE_LINE("; 8 = 640x576 ODR WIN 9 = 768x672 ODR WIN\r\n");
WRITE_LINE("; 10 = 800x600 ODS FULL 11 = 800x600 ODS WIN\r\n"); WRITE_LINE("; 10 = 800x600 ODS FULL 11 = 800x600 ODS WIN\r\n");
WRITE_LINE("; 12 = 896x784 ODR FULL 13 = 1024x768 ODS WIN\r\n"); WRITE_LINE("; 12 = 896x784 ODR WIN 13 = 1024x768 ODS FULL\r\n");
WRITE_LINE("; 14 = 1024x768 ODS WIN 15 = 1024x896 ODR WIN\r\n"); WRITE_LINE("; 14 = 1024x768 ODS WIN 15 = 1024x896 ODR WIN\r\n");
WRITE_LINE("; 16 = 1280x1024 OGL WIN 17 = VARIABLE ODS WIN\r\n"); WRITE_LINE("; 16 = 1280x1024 ODS FULL 17 = VARIABLE ODR WIN\r\n");
#endif #endif
sprintf(buffer, "\r\nVideoModeLin = %d\r\n\r\n", cfgcvidmode); sprintf(buffer, "\r\nVideoModeLin = %d\r\n\r\n", cfgcvidmode);
SAVE_LINE(buffer); SAVE_LINE(buffer);

6
zsnes/src/linux/sdlintrf.asm
View File

@@ -906,7 +906,7 @@ NEWSYM GUIVideoModeNames
db '256X224 R WIN ',0 ;0 db '256X224 R WIN ',0 ;0
db '256x224 R FULL',0 ;1 db '256x224 R FULL',0 ;1
db '512X448 DR WIN ',0 ;2 db '512X448 DR WIN ',0 ;2
db '640x480 DR FULL',0 ;3 db '640x480 DS FULL',0 ;3
%ifdef __OPENGL__ %ifdef __OPENGL__
db '256x224 OR WIN ',0 ;4 db '256x224 OR WIN ',0 ;4
db '512x448 ODR WIN ',0 ;5 db '512x448 ODR WIN ',0 ;5
@@ -921,7 +921,7 @@ db '1024x768 ODS FULL',0 ;13
db '1024x768 ODS WIN ',0 ;14 db '1024x768 ODS WIN ',0 ;14
db '1024x896 ODR WIN ',0 ;15 db '1024x896 ODR WIN ',0 ;15
db '1280x1024ODS FULL',0 ;16 db '1280x1024ODS FULL',0 ;16
db 'VARIABLE ODS WIN ',0 ;17 db 'VARIABLE ODR WIN ',0 ;17
%endif %endif
@@ -948,7 +948,7 @@ NEWSYM GUIRATIO, db 0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0
NEWSYM GUIBIFIL, db 0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1 ; binlinear = 1, nearest = 0 NEWSYM GUIBIFIL, db 0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1 ; binlinear = 1, nearest = 0
NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Triple Buffering (Win) NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Triple Buffering (Win)
NEWSYM GUIMBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 NEWSYM GUIMBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
NEWSYM GUIHQ2X, db 0,0,1,1,0,1,1,1,1,1,1,1,1,1,1,0,1,0 ; hq2x filter NEWSYM GUIHQ2X, db 0,0,1,1,0,1,1,1,1,1,1,1,1,1,1,0,1,1 ; hq2x filter
NEWSYM GUIHQ3X, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; hq3x filter NEWSYM GUIHQ3X, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; hq3x filter
NEWSYM GUIHQ4X, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; hq4x filter NEWSYM GUIHQ4X, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; hq4x filter

4
zsnes/src/linux/sdllink.c
View File

@@ -390,7 +390,7 @@ int Main_Proc(void)
break; break;
#ifdef __OPENGL__ #ifdef __OPENGL__
case SDL_VIDEORESIZE: case SDL_VIDEORESIZE:
if(cvidmode != 16) { if(cvidmode != 17) {
surface = SDL_SetVideoMode(WindowWidth, WindowHeight, surface = SDL_SetVideoMode(WindowWidth, WindowHeight,
BitDepth, surface->flags & ~SDL_RESIZABLE); BitDepth, surface->flags & ~SDL_RESIZABLE);
adjustMouseXScale(); adjustMouseXScale();
@@ -832,13 +832,13 @@ void initwinvideo(void)
break; break;
case 2: case 2:
case 5: case 5:
case 17: // Variable
WindowWidth = 512; WindowWidth = 512;
WindowHeight = 448; WindowHeight = 448;
break; break;
case 3: case 3:
case 6: case 6:
case 7: case 7:
case 17: // Variable
WindowWidth = 640; WindowWidth = 640;
WindowHeight = 480; WindowHeight = 480;
break; break;