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

remove bit depth switch

Browse Source
This commit is contained in:
theoddone33
2001-04-30 23:52:29 +00:00
parent e3e98f719e
commit d3f2b2cf92
3 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,14 +491,11 @@ int startgame(void)
surface = SDL_SetVideoMode(WindowWidth, WindowHeight, BitDepth, flags); surface = SDL_SetVideoMode(WindowWidth, WindowHeight, BitDepth, flags);
if (surface == NULL) { if (surface == NULL) {
if (BitDepth) fprintf (stderr, "Could not set %ldx%ld video mode.\n",WindowWidth,
fprintf (stderr, "Could not set %ld%ld%ld video mode.\n", WindowHeight);
WindowWidth,WindowHeight,BitDepth); return FALSE;
else
fprintf (stderr, "Could not set %ldx%ld video mode.\n",WindowWidth,
WindowHeight);
return FALSE;
} }
SurfaceLocking = SDL_MUSTLOCK(surface); SurfaceLocking = SDL_MUSTLOCK(surface);
SDL_WarpMouse(SurfaceX/4,SurfaceY/4); SDL_WarpMouse(SurfaceX/4,SurfaceY/4);
@@ -1357,7 +1354,7 @@ void drawscreenwin(void)
break; break;
default: default:
UnlockSurface(); 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(); LinuxExit();
/* /*
cvidmode=2; cvidmode=2;
@@ -1380,7 +1377,7 @@ void drawscreenwin(void)
break; break;
default: default:
UnlockSurface(); 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(); LinuxExit();
/* /*
cvidmode=2; cvidmode=2;

18
zsnes/src/linux/zloaderw.c
View File

@@ -54,7 +54,6 @@ extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable,
int getopt(int argc, char *const argv[], const char *optstring); int getopt(int argc, char *const argv[], const char *optstring);
extern char *optarg; extern char *optarg;
extern int optind, opterr, optopt; extern int optind, opterr, optopt;
extern int BitDepth;
void ccmdline(void); void ccmdline(void);
@@ -99,7 +98,7 @@ int main (int argc, char *argv[]) {
char *fvar; char *fvar;
UnProtectMemory(); 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) { switch(opt) {
/* Palette 0 disable */ /* Palette 0 disable */
case '0': { case '0': {
@@ -144,21 +143,6 @@ int main (int argc, char *argv[]) {
break; 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': { case 'c': {
if (strcmp(optarg,"b") == 0) { if (strcmp(optarg,"b") == 0) {
printf("\nRemove background color in 256 modes not implemented!\n"); printf("\nRemove background color in 256 modes not implemented!\n");

3
zsnes/src/ui.asm
View File

@@ -145,7 +145,7 @@ NEWSYM welcome
%else %else
%ifdef __LINUX__ %ifdef __LINUX__
db 'ZSNES v1.',ZVERSION,' beta (c)1997-2001 ZSNES Team (zsKnight - _Demo_)',13,10 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 db 'Compiled under NASM, GCC',13,10,13,10
%else %else
db 'ZSNES v1.',ZVERSION,' beta (c)1997-2001 ZSNES Team (zsKnight - _Demo_)',13,10 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 ' -9 Off by 1 line fix',13,10
db ' -a Turn on auto frame skip',13,10 db ' -a Turn on auto frame skip',13,10
%ifdef __LINUX__ %ifdef __LINUX__
db ' -b # Select bit depth',13,10
db ' -cs Scale to fit screen (320x240 VESA2/640x480 VESA2)',13,10 db ' -cs Scale to fit screen (320x240 VESA2/640x480 VESA2)',13,10
%else %else
db ' -c Scale to fit screen (320x240 VESA2/640x480 VESA2)',13,10 db ' -c Scale to fit screen (320x240 VESA2/640x480 VESA2)',13,10