Fixed args logic

1 files changed, 8 insertions, 8 deletions

diff --git a/nyan.c b/nyan.c
index 974972f..926ead6 100644
--- a/nyan.c
+++ b/nyan.c
@@ -243,11 +243,11 @@ handle_args(int argc, char **argv) {
             SURF_TYPE = SDL_HWSURFACE;

         else if (!strcmp(argv[i], "-sw"))

             SURF_TYPE = SDL_SWSURFACE;

-        else if (!(strcmp(argv[i], "-f") && strcmp(argv[i], "--fullscreen")))

+        else if (!(strcmp(argv[i], "-f") || !strcmp(argv[i], "--fullscreen")))

             fullscreen = 1;

-        else if(!(strcmp(argv[i], "-nf") && strcmp(argv[i], "--nofullscreen")))

+        else if(!(strcmp(argv[i], "-nf") || !strcmp(argv[i], "--nofullscreen")))

             fullscreen = 0;

-        else if((!(strcmp(argv[i], "-c") && strcmp(argv[i], "--catsize"))) && i != argc - 1) { // I don't know boolean order of operations, please cut down on unneeded parenthases

+        else if((!(strcmp(argv[i], "-c") || !strcmp(argv[i], "--catsize"))) && i != argc - 1) { // I don't know boolean order of operations, please cut down on unneeded parenthases

             if (++i < argc) {

                 if(!strcmp(argv[i], "full"))

                     catsize = 1;

@@ -264,13 +264,13 @@ handle_args(int argc, char **argv) {
             else

                 puts("Arguments do not appear to be valid screen sizes. Defaulting.");

         }

-        else if(!(strcmp(argv[i], "-nc") && strcmp(argv[i], "--nocursor")))

+        else if(!(strcmp(argv[i], "-nc") || !strcmp(argv[i], "--nocursor")))

             cursor = 0;

-        else if(!(strcmp(argv[i], "-sc") && strcmp(argv[i], "--cursor") && strcmp(argv[i], "--showcursor")))

+        else if(!(strcmp(argv[i], "-sc") || !strcmp(argv[i], "--cursor") || !strcmp(argv[i], "--showcursor")))

             cursor = 1;

-        else if(!(strcmp(argv[i], "-ns") && strcmp(argv[i], "--nosound")))

+        else if(!(strcmp(argv[i], "-ns") || !strcmp(argv[i], "--nosound")))

             sound = 0;

-        else if(! strcmp(argv[i], "--help")) {

+        else if(!strcmp(argc[i], "-h") || !strcmp(argv[i], "--help")) {

             printf("Usage: %s [OPTIONS]\n\

     -h,  --help                    This help message\n\

     -f,  --fullscreen              Enable fullscreen mode\n\

@@ -284,7 +284,7 @@ handle_args(int argc, char **argv) {
             exit(0);

         }

         else

-            printf("Unrecognised option: %s", argv[i]);

+            printf("Unrecognised option: %s\n", argv[i]);

     }

 }