summaryrefslogtreecommitdiffstats
path: root/nyan.c
diff options
context:
space:
mode:
authorJohn Anthony <johnanthony@lavabit.com>2012-07-31 17:31:58 +0100
committerJohn Anthony <johnanthony@lavabit.com>2012-07-31 17:31:58 +0100
commit0567847ded2f2528682937448121fdd0ba869323 (patch)
treee7d36e97fd4fbf17a5e6056c0e70d1ca15639891 /nyan.c
parent3b0d9c70a8e5764ebb6ad551f69c71840342fd54 (diff)
downloadnyancat-0567847ded2f2528682937448121fdd0ba869323.tar.gz
nyancat-0567847ded2f2528682937448121fdd0ba869323.tar.bz2
nyancat-0567847ded2f2528682937448121fdd0ba869323.zip
Fixed arg clobbering and added to the README for new data sets
Diffstat (limited to 'nyan.c')
-rw-r--r--nyan.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/nyan.c b/nyan.c
index 619ba6a..7fb8251 100644
--- a/nyan.c
+++ b/nyan.c
@@ -292,7 +292,7 @@ handle_args(int argc, char **argv) {
printf("Unrecognised scaling option: %s - please select either 'full' or 'small' cat size.\n", argv[i]);
}
}
- else if(!strcmp(argv[i], "-r") || !strcmp(argv[i], "--resource")) {
+ else if(!strcmp(argv[i], "-d") || !strcmp(argv[i], "--data-set")) {
if (++i < argc) {
if (RESOURCE_PATH)
free(RESOURCE_PATH);
@@ -595,10 +595,13 @@ usage(char* exname) {
-nc, --nocursor Don't show the cursor (default)\n\
-sc, --cursor, --showcursor Show the cursor\n\
-ns, --nosound Don't play sound\n\
- -v, --volume Set Volume, if enabled, from 0 - 128\n\
+ -v, --volume Set Volume, if enabled, from 0 - 128\n\
-r, --resolution Make next two arguments the screen \n\
resolution to use (0 and 0 for full \n\
resolution) (800x600 default)\n\
+ -d, --data-set Use an alternate data set. Packaged with\n\
+ this program by default are \"basic\"\n\
+ (the default) and \"freedom\" sets.\n\
-hw, -sw Use hardware or software SDL rendering, \n\
respectively. Hardware is default\n", exname);
exit(0);