diff options
author | Simon Howard | 2011-02-12 18:42:10 +0000 |
---|---|---|
committer | Simon Howard | 2011-02-12 18:42:10 +0000 |
commit | 516a7028994df6718289a7e3db4d07a45c95466b (patch) | |
tree | cf974cb4bd38b8e9d0101a41263b42b8c87e96c7 /src/m_argv.c | |
parent | a15ba75736d15409876c1f0a44fffc99adf1c192 (diff) | |
parent | a9996b41e954d85fde5ec5188bbf6a7f4df88011 (diff) | |
download | chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.gz chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.bz2 chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.zip |
Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled
temporarily until the netgame changes on raven-branch are finished.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2259
Diffstat (limited to 'src/m_argv.c')
-rw-r--r-- | src/m_argv.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/m_argv.c b/src/m_argv.c index 79702e56..59381b65 100644 --- a/src/m_argv.c +++ b/src/m_argv.c @@ -47,13 +47,13 @@ char** myargv; // or 0 if not present // -int M_CheckParm (char *check) +int M_CheckParmWithArgs(char *check, int num_args) { - int i; + int i; - for (i = 1;i<myargc;i++) + for (i = 1; i < myargc - num_args; i++) { - if ( !strcasecmp(check, myargv[i]) ) + if (!strcasecmp(check, myargv[i])) return i; } @@ -72,6 +72,11 @@ boolean M_ParmExists(char *check) return M_CheckParm(check) != 0; } +int M_CheckParm(char *check) +{ + return M_CheckParmWithArgs(check, 0); +} + #define MAXARGVS 100 static void LoadResponseFile(int argv_index) @@ -88,7 +93,7 @@ static void LoadResponseFile(int argv_index) response_filename = myargv[argv_index] + 1; // Read the response file into memory - handle = fopen(response_filename, "r"); + handle = fopen(response_filename, "rb"); if (handle == NULL) { |