revert!

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 02cdd8c621476502a2144f93bf8cddc0aff12ce5..aafa30503366d618d6f9de0aa45d1f42c5e2ef07 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -25,7 +25,6 @@
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
-//#define SPRITE
 #define MODEX  //this is for mode x initiating
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
@@ -37,6 +36,7 @@ page_t screen, screen2, screen3;
 map_view_t mv[3];
 map_view_t *bg, *spri, *mask;//, *tmp;
 planar_buf_t *p;
+float t;
 
 void main()
 {
@@ -57,6 +57,7 @@ void main()
 
        player[0].persist_aniframe=0;
        player[0].speed=4;
+       gvar.clock_start=*clockdw;
        //0000printf("starting timer\n");
 //++++
        //++++????start_timer(&gvar);
@@ -68,10 +69,10 @@ void main()
 
        /* create the map */
        fprintf(stderr, "testing map load~\n");
-//++++ loadmap("data/test.map", &map);
-       map.width=0;
-       map.height=0;
-       chkmap(&map, 1);
+       loadmap("data/test.map", &map);
+//0000 map.width=0;
+//0000 map.height=0;
+       chkmap(&map, 0);
        printf("chkmap ok\n");
        fprintf(stderr, "yay map loaded~~\n");
        mv[0].map = ↦
@@ -135,7 +136,7 @@ void main()
        mv[0].page = &screen;
        screen2 = modexNextPage(mv[0].page);
        mv[1].page = &screen2;
-       screen3 = modexNextPage0(mv[1].page, 320, 240); //(352*176)+1024 is the remaining amount of memory left wwww
+       screen3 = modexNextPageFlexibleSize(mv[1].page, 320, 240);      //(352*176)+1024 is the remaining amount of memory left wwww
        //screen3 = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww
        mv[2].page = &screen3;
 
@@ -176,7 +177,11 @@ void main()
        npc0.d=0;
        modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
 #ifdef SPRITE
+#ifdef BMPTYPE
+       oldDrawBmp(VGA, player[0].x-4, player[0].y-TILEWH, &player[0].data, 1);
+#else
        modexDrawSpriteRegion(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data);
+#endif
 #else
        modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #endif
@@ -191,8 +196,6 @@ 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);
                IN_ReadControl(0,&player);
        //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square