ok getting there!

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index bd1035342417aece703aad109b65e89ef3dcf58f..41476b585927ab16bff9e03597ebfdc6b6751e60 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-//#include "src/lib/mapread.h"
+#include "src/lib/timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -36,8 +36,10 @@ page_t screen, screen2, screen3;
 map_view_t mv[3];
 map_view_t *bg, *spri, *mask;//, *tmp;
 planar_buf_t *p;
+float t;
+sword bakapee;
 
-void main()
+void main(int argc, char *argv[])
 {
 //     word panswitch=0, panq=1, pand=0;
        word panpagenum=0; //for panning!
@@ -47,6 +49,7 @@ void main()
        //static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
 
        //map_view_db_t pgid[4];
+       word pg;
 #ifdef FADE
        byte *dpal, *gpal;
 #endif
@@ -54,14 +57,17 @@ void main()
        byte *mappalptr;
        byte *mesg=malloc(sizeof(dword));
 
+
+       if(argv[1]) bakapee = atoi(argv[1]);
+       else bakapee = 1;
+
        player[0].persist_aniframe=0;
        player[0].speed=4;
-       gvar.clock=*hwclockw;
-       //0000printf("starting timer\n");
-//++++
-       //++++????start_timer(&gvar);
-//++++ gvar.frames_per_second = 60;
-//0000 printf("ok\n");
+       gvar.video.page=&screen;
+
+       printf("starting timer\n");
+       start_timer(&gvar);
+       printf("ok\n");
        //extern struct inconfig inpu;
 
 //     atexit(qclean());
@@ -104,7 +110,7 @@ void main()
 #endif
 
        textInit();
-       VGAmodeX(1, &gvar);
+       VGAmodeX(bakapee, &gvar);
 #ifdef FADE
        modexPalBlack();        //reset the palette~
 #endif
@@ -151,8 +157,8 @@ void main()
 
        //TODO: put player in starting position of spot
        //default player position on the viewable map
-       player[0].tx = bg->tx + 10;
-       player[0].ty = bg->ty + 8;
+       player[0].tx = bg->tx + bg->page->tilemidposscreenx;
+       player[0].ty = bg->ty + bg->page->tilemidposscreeny;
        player[0].x = player[0].tx*TILEWH;
        player[0].y = player[0].ty*TILEWH;
        player[0].triggerx = player[0].tx;
@@ -186,7 +192,6 @@ void main()
 #endif
 
        modexShowPage(spri->page);
-//     printf("Total used @ before loop:                       %zu\n", oldfreemem-GetFreeSize());
        modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
 #ifdef FADE
@@ -195,9 +200,7 @@ void main()
 #endif
        while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
        {
-               sprintf(mesg, "%lu", gvar.tiku);
-               modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg);
-               shinku(mv[1].page, &gvar);
+               shinku(mv, &gvar);
                IN_ReadControl(0,&player);
        //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
        //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
@@ -362,10 +365,28 @@ void main()
                        int 21h
                }
        }
+       if(IN_KeyDown(88))      //s
+       {
+               switch(gvar.kurokku.fpscap)
+               {
+                       case 0:
+                               gvar.kurokku.fpscap=1;
+                       break;
+                       case 1:
+                               gvar.kurokku.fpscap=0;
+                       break;
+               }
+               IN_Ack();
+       }
+       //TODO fmemtest into page
+       if(IN_KeyDown(4+1))     //4
+       {
+               pg=1;
+               SELECT_ALL_PLANES();
+               _fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);
+       }
 
        if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!
-
-       gvar.tiku++;
        }
 
        /* fade back to text mode */