diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c index a019d1bb..31bdc654 100644 --- a/zsnes/src/linux/sdllink.c +++ b/zsnes/src/linux/sdllink.c @@ -491,14 +491,11 @@ int startgame(void) surface = SDL_SetVideoMode(WindowWidth, WindowHeight, BitDepth, flags); if (surface == NULL) { - if (BitDepth) - fprintf (stderr, "Could not set %ld%ld%ld video mode.\n", - WindowWidth,WindowHeight,BitDepth); - else - fprintf (stderr, "Could not set %ldx%ld video mode.\n",WindowWidth, - WindowHeight); - return FALSE; + fprintf (stderr, "Could not set %ldx%ld video mode.\n",WindowWidth, + WindowHeight); + return FALSE; } + SurfaceLocking = SDL_MUSTLOCK(surface); SDL_WarpMouse(SurfaceX/4,SurfaceY/4); @@ -1357,7 +1354,7 @@ void drawscreenwin(void) break; default: UnlockSurface(); - fprintf(stderr, "Mode only available in 16 bit color.\nTry running ZSNES with -b 16.\n"); + fprintf(stderr, "Mode only available in 16 bit color.\n"); LinuxExit(); /* cvidmode=2; @@ -1380,7 +1377,7 @@ void drawscreenwin(void) break; default: UnlockSurface(); - fprintf(stderr, "Mode only available in 16 bit color.\nTry running ZSNES with -b 16.\n"); + fprintf(stderr, "Mode only available in 16 bit color.\n"); LinuxExit(); /* cvidmode=2; diff --git a/zsnes/src/linux/zloaderw.c b/zsnes/src/linux/zloaderw.c index fa7a8290..780e14a6 100644 --- a/zsnes/src/linux/zloaderw.c +++ b/zsnes/src/linux/zloaderw.c @@ -54,7 +54,6 @@ extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, int getopt(int argc, char *const argv[], const char *optstring); extern char *optarg; extern int optind, opterr, optopt; -extern int BitDepth; void ccmdline(void); @@ -99,7 +98,7 @@ int main (int argc, char *argv[]) { char *fvar; UnProtectMemory(); - while((opt = getopt(argc, argv, "01:2:789ab:c:d:ef:g:hijk:lmno:p:r:s:tuv:wyz?")) != -1) { + while((opt = getopt(argc, argv, "01:2:789ac:d:ef:g:hijk:lmno:p:r:s:tuv:wyz?")) != -1) { switch(opt) { /* Palette 0 disable */ case '0': { @@ -144,21 +143,6 @@ int main (int argc, char *argv[]) { break; } - case 'b': { - // What was this? - DDOI - //SoundCompD = 1; - if(optarg != NULL) - BitDepth = atoi(optarg); - if (BitDepth != 8 && BitDepth != 16 && - BitDepth != 24 && BitDepth != 32) - { - printf ("%d is not a valid bit depth.\n", BitDepth); - exit(1); - } - - break; - } - case 'c': { if (strcmp(optarg,"b") == 0) { printf("\nRemove background color in 256 modes not implemented!\n"); diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm index 3b350b59..75f937f4 100644 --- a/zsnes/src/ui.asm +++ b/zsnes/src/ui.asm @@ -145,7 +145,7 @@ NEWSYM welcome %else %ifdef __LINUX__ db 'ZSNES v1.',ZVERSION,' beta (c)1997-2001 ZSNES Team (zsKnight - _Demo_)',13,10 - db 'Linux beta version, please report crashes to zsnes-devel@lists.sourceforge.net.',13,10 + db 'Linux version, please report crashes to zsnes-devel@lists.sourceforge.net.',13,10 db 'Compiled under NASM, GCC',13,10,13,10 %else db 'ZSNES v1.',ZVERSION,' beta (c)1997-2001 ZSNES Team (zsKnight - _Demo_)',13,10 @@ -1359,7 +1359,6 @@ SECTION .data db ' -9 Off by 1 line fix',13,10 db ' -a Turn on auto frame skip',13,10 %ifdef __LINUX__ - db ' -b # Select bit depth',13,10 db ' -cs Scale to fit screen (320x240 VESA2/640x480 VESA2)',13,10 %else db ' -c Scale to fit screen (320x240 VESA2/640x480 VESA2)',13,10