From f61e0d49fed82ca3f74ca8712d165096adb0f6a3 Mon Sep 17 00:00:00 2001 From: Themaister Date: Mon, 10 Jan 2011 14:39:14 +0100 Subject: [PATCH] Super Scope can only be plugged in port 2. --- ssnes.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/ssnes.c b/ssnes.c index 837d4c5fcb..78d08125c7 100644 --- a/ssnes.c +++ b/ssnes.c @@ -241,8 +241,7 @@ static void print_help(void) puts("\t-c/--config: Path for config file." SSNES_DEFAULT_CONF_PATH_STR); puts("\t-m/--mouse: Connect a virtual mouse into designated port of the SNES (1 or 2)."); puts("\tThis argument can be specified several times to connect more mice."); - puts("\t-p/--scope: Connect a virtual SuperScope into designated port of the SNES (1 or 2)."); - puts("\tThis argument can be specified several times to connect more scopes."); + puts("\t-p/--scope: Connect a virtual SuperScope into port 2 of the SNES."); #ifdef HAVE_FFMPEG puts("\t-r/--record: Path to record video file. Settings for video/audio codecs are found in config file."); @@ -267,7 +266,7 @@ static void parse_input(int argc, char *argv[]) { "verbose", 0, NULL, 'v' }, { "config", 0, NULL, 'c' }, { "mouse", 1, NULL, 'm' }, - { "scope", 1, NULL, 'p' }, + { "scope", 0, NULL, 'p' }, { "savestate", 1, NULL, 't' }, { NULL, 0, NULL, 0 } }; @@ -280,7 +279,7 @@ static void parse_input(int argc, char *argv[]) #define FFMPEG_RECORD_ARG #endif - char optstring[] = "hs:vc:t:m:p:" FFMPEG_RECORD_ARG; + char optstring[] = "hs:vc:t:m:p" FFMPEG_RECORD_ARG; for(;;) { int c = getopt_long(argc, argv, optstring, opts, &option_index); @@ -319,14 +318,7 @@ static void parse_input(int argc, char *argv[]) break; case 'p': - port = strtol(optarg, NULL, 0); - if (port < 1 || port > 2) - { - SSNES_ERR("Connect scope to port 1 or 2.\n"); - print_help(); - exit(1); - } - g_extern.has_scope[port - 1] = true; + g_extern.has_scope[1] = true; break; case 'c':