aniani/trader
1
0
Fork 0
mirror of https://git.zap.org.au/git/trader.git synced 2025-02-02 15:08:13 -05:00
Code

Change the "--no-encrypt" command line option to "--dont-encrypt"

Browse Source 
Some versions of getopt_long() show ALL options if an ambiguous
abbreviation was supplied (such as "--no"), and we don't really want
players to discover this option by accident, do we? :-)
This commit is contained in:
John Zaitseff 2011-07-22 12:20:58 +10:00
parent c18f913710
commit 65a9dacbfc
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileio.c
View File

@ -320,7 +320,7 @@ bool save_game (int num)
err_exit_nomem(); err_exit_nomem();
} }
crypt_key = option_no_encrypt ? 0 : crypt_key = option_dont_encrypt ? 0 :
game_file_crypt_key[randi(GAME_FILE_CRYPT_KEY_SIZE)]; game_file_crypt_key[randi(GAME_FILE_CRYPT_KEY_SIZE)];
// Create the data directory, if needed // Create the data directory, if needed

6
src/globals.c
View File

@ -85,9 +85,9 @@ int game_num = 0; // Game number (1-9)
bool quit_selected = false; // Is a player trying to quit the game? bool quit_selected = false; // Is a player trying to quit the game?
bool abort_game = false; // Abort game without declaring winner? bool abort_game = false; // Abort game without declaring winner?
bool option_no_color = false; // True if --no-color was specified bool option_no_color = false; // True if --no-color was specified
bool option_no_encrypt = false; // True if --no-encrypt was specified bool option_dont_encrypt = false; // True if --dont-encrypt was specified
int option_max_turn = 0; // Max. turns if --max-turn was specified int option_max_turn = 0; // Max. turns if --max-turn was specified
/***********************************************************************/ /***********************************************************************/

2
src/globals.h
View File

@ -198,7 +198,7 @@ extern bool quit_selected; // Is a player trying to quit the game?
extern bool abort_game; // Abort game without declaring winner? extern bool abort_game; // Abort game without declaring winner?
extern bool option_no_color; // True if --no-color was specified extern bool option_no_color; // True if --no-color was specified
extern bool option_no_encrypt; // True if --no-encrypt was specified extern bool option_dont_encrypt; // True if --dont-encrypt was specified
extern int option_max_turn; // Max. turns if --max-turn was specified extern int option_max_turn; // Max. turns if --max-turn was specified

22
src/trader.c
View File

@ -43,7 +43,7 @@
enum options_char { enum options_char {
OPTION_NO_COLOR = 1, OPTION_NO_COLOR = 1,
OPTION_NO_ENCRYPT, OPTION_DONT_ENCRYPT,
OPTION_MAX_TURN OPTION_MAX_TURN
}; };
@ -52,13 +52,13 @@ static const char options_short[] = "hV";
// -V, --version // -V, --version
static struct option const options_long[] = { static struct option const options_long[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' }, { "version", no_argument, NULL, 'V' },
{ "no-color", no_argument, NULL, OPTION_NO_COLOR }, { "no-color", no_argument, NULL, OPTION_NO_COLOR },
{ "no-colour", no_argument, NULL, OPTION_NO_COLOR }, { "no-colour", no_argument, NULL, OPTION_NO_COLOR },
{ "no-encrypt", no_argument, NULL, OPTION_NO_ENCRYPT }, { "dont-encrypt", no_argument, NULL, OPTION_DONT_ENCRYPT },
{ "max-turn", required_argument, NULL, OPTION_MAX_TURN }, { "max-turn", required_argument, NULL, OPTION_MAX_TURN },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -215,9 +215,9 @@ void process_cmdline (int argc, char *argv[])
option_no_color = true; option_no_color = true;
break; break;
case OPTION_NO_ENCRYPT: case OPTION_DONT_ENCRYPT:
// --no-encrypt: don't encrypt game files // --dont-encrypt: don't encrypt game files
option_no_encrypt = true; option_dont_encrypt = true;
break; break;
case OPTION_MAX_TURN: case OPTION_MAX_TURN: