textInit() for font. add variable so shinku() knows what page we're on.

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 903bf280ae634e6c4044c7c3847d62fb11f08d61..d13d7d01b30b272ff2e210b3d9d4e74679ed4271 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -145,7 +145,7 @@ void main(int argc, char *argv[])
 //++++ player[0].data.offset=(paloffset/3);
 //++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
                //modexPalUpdate1(p.palette);
-               modexPalUpdate1(map.tiles->btdata->palette);
+//++++0000             modexPalUpdate1(map.tiles->btdata->palette);
        //printf("      %d\n", sizeof(ptmp->data));
        //printf("1:    %d\n", paloffset);
 //++++ map.tiles->data->offset=(paloffset/3);
@@ -165,7 +165,7 @@ void main(int argc, char *argv[])
        /* setup camera and screen~ */
        gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
        gvar.video.page[0].width += (TILEWH*2);
-       gvar.video.page[0].height += (TILEWH*2);//+QUADWH;
+       gvar.video.page[0].height += (TILEWH*2);
        mv[0].page = &gvar.video.page[0];
        gvar.video.page[1] = modexNextPage(mv[0].page);
        mv[1].page = &gvar.video.page[1];
@@ -179,22 +179,11 @@ void main(int argc, char *argv[])
        mapGoTo(&mv[0], 0, 0);
        mapGoTo(&mv[1], 0, 0);
        //mapGoTo(mask, 0, 0);
-//IN_Ack();
        //TODO: put player in starting position of spot
        //default player position on the viewable map
        player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
        player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
        IN_initplayer(&player, 0);
-       //npc
-       /*npc0.tx = mv[0].tx + 1;
-       npc0.ty = mv[0].ty + 1;
-       npc0.x = npc0.tx*TILEWH;
-       npc0.y = npc0.ty*TILEWH;
-       npc0.triggerx = npc0.tx;
-       npc0.triggery = npc0.ty+1;
-       npc0.q=1;
-       npc0.d=0;
-       modexDrawSpriteRegion(mv[1].page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
 
        modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
 #ifndef        SPRITE
@@ -205,6 +194,7 @@ void main(int argc, char *argv[])
 #endif
 
        modexShowPage(mv[1].page);
+       shinku_fps_indicator_page = 1; // we're on page 1 now, shinku(). follow along please or it will not be visible.
        //modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
 #ifdef FADE
@@ -213,7 +203,7 @@ void main(int argc, char *argv[])
 #endif
        while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
        {
-               shinku(mv, &gvar);
+               shinku(&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