bakapi modex16 test fun: allow video mode choice from command line.

[16.git] / src / bakapi.c

diff --git a/src/bakapi.c b/src/bakapi.c
index 5549ee4694f76163662a8d6d770180ba7d04a6de..1b839a21bb0d8b9c7c0aa5d43267746e928d0b15 100755 (executable)
--- a/src/bakapi.c
+++ b/src/bakapi.c
@@ -28,11 +28,42 @@
 global_game_variables_t gvar;
 static bakapee_t bakapee;
 word key,d,xpos,ypos,xdir,ydir;
+sword vgamodex_mode = 1; // 320x240 default
 int ch=0x0;
 
 void
 main(int argc, char *argvar[])
 {
+       char *a;
+       int i;
+
+       // allow changing default mode from command line
+       for (i=1;i < argc;) {
+               a = argvar[i++];
+
+               if (*a == '-') {
+                       do { a++; } while (*a == '-');
+
+                       if (!strcmp(a,"mx")) {
+                               // (based on src/lib/modex16.c)
+                               // 1 = 320x240
+                               // 2 = 160x120
+                               // 3 = 320x200
+                               // 4 = 192x144
+                               // 5 = 256x192
+                               vgamodex_mode = (sword)strtoul(argvar[i++],NULL,0);
+                       }
+                       else {
+                               fprintf(stderr,"Unknown switch %s\n",a);
+                               return;
+                       }
+               }
+               else {
+                       fprintf(stderr,"Unknown command arg %s\n",a);
+                       return;
+               }
+       }
+
        // DOSLIB: check our environment
        probe_dos();
 
@@ -63,7 +94,7 @@ main(int argc, char *argvar[])
        ydir=1;
 
 #ifdef MXLIB
-       VGAmodeX(1, &gvar); // TODO: Suggestion: Instead of magic numbers for the first param, might I suggest defining an enum or some #define constants that are easier to remember? --J.C.
+       VGAmodeX(vgamodex_mode, &gvar); // TODO: Suggestion: Instead of magic numbers for the first param, might I suggest defining an enum or some #define constants that are easier to remember? --J.C.
 #else
 # error REMOVED // this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in.
                // we'll integrate DOSLIB vga into that part of the code instead for less disruption. -- J.C.
@@ -94,12 +125,19 @@ main(int argc, char *argvar[])
 #ifdef BOINK
        while(d>0)      // on!
        {
-               if(!kbhit())
-               { // conditions of screen saver
+               /* run screensaver routine until keyboard input */
+               while (key > 0) {
+                       if (kbhit()) {
+                               getch(); // eat keyboard input
+                               break;
+                       }
+
                        ding(&gvar.video.page[0], &bakapee, key);
                }
-               else
+
                {
+                       int c;
+
 # ifndef MXLIB
 #  error REMOVED // this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in.
                // we'll integrate DOSLIB vga into that part of the code instead for less disruption. -- J.C.
@@ -108,20 +146,15 @@ main(int argc, char *argvar[])
 # endif
                        // user imput switch
                        fprintf(stderr, "xx=%d  yy=%d   tile=%d\n", bakapee.xx, bakapee.yy, bakapee.tile);
-                       printf("Enter 1, 2, 3, 4, or 6 to run a screensaver, or enter 0 to quit.\n", getch());  // prompt the user
-                       //scanf("%d", &key);
-                       if(scanf("%d", &key) != 1)
-                       {
-                               printf("%d\n", key);
-                       }
-                       getch();
-                       //if(key==3){xx=yy=0;} // crazy screen saver wwww
-                       switch (key)
-                       {
-                               case 0:
+                       printf("Enter 1, 2, 3, 4, or 6 to run a screensaver, or enter 0 to quit.\n");
+
+                       c = getch();
+                       switch (c) {
+                               case 27: /* Escape key */
+                               case '0':
                                        d=0;
-                               break;
-                               case 65536:
+                                       break;
+                               case 'b': // test tile change
                                        switch (bakapee.tile)
                                        {
                                                case 0:
@@ -131,19 +164,29 @@ main(int argc, char *argvar[])
                                                        bakapee.tile=0;
                                                break;
                                        }
-                                       d=2;
-                               default:
+                                       key=0;
+                                       break;
+                               case '1':
+                               case '2':
+                               case '3':
+                               case '4':
+                               case '5':
+                               case '6':
+                                       key = c - '0';
 # ifdef MXLIB
                                        gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
                                        gvar.video.page[0].width += (TILEWH*2);
                                        gvar.video.page[0].height += (TILEWH*2);
-                                       VGAmodeX(1, &gvar);
+                                       VGAmodeX(vgamodex_mode, &gvar);
 # else
 #  error REMOVED // this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in.
                // we'll integrate DOSLIB vga into that part of the code instead for less disruption. -- J.C.
 # endif
                                        modexShowPage(&gvar.video.page[0]);
-                               break;
+                                       break;
+                               default:
+                                       key=0;
+                                       break;
                        }
                }
        }