poke

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 55df4a4b40ce8481db4da50e67a7cdae18f1ef4d..23307d63ff47179e057430db08d018e347d96f51 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -35,7 +35,7 @@ player_t player[MaxPlayers];
 //page_t screen, gvar.video.page[1], gvar.video.page[2];
 map_view_t mv[3];
 map_view_t *bg, *spri, *mask;//, *tmp;
-planar_buf_t *p;
+bitmap_t p;
 float t;
 sword bakapee;
 
@@ -87,14 +87,14 @@ void main(int argc, char *argv[])
        /* draw the tiles */
 #ifdef MODEX
        ptr = map.data;
-       mappalptr = map.tiles->data->palette;
+       mappalptr = map.tiles->btdata->palette;
 
        /* data */
-       player[0].data = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+       p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
        /* create the planar buffer */
-       p = planar_buf_from_bitmap(&player[0].data);
+       (player[0].data) = *planar_buf_from_bitmap(&p);
 //0000 printf("planar buffer ok\n");
 #endif
        /*      input!  */
@@ -120,7 +120,8 @@ void main(int argc, char *argv[])
 #endif
 //     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());
 //++++ player[0].data.offset=(paloffset/3);
-//++++ modexPalUpdate(&player[0].data, &paloffset, 0, 0);
+//++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
+               modexPalUpdate1(p.palette);
        //printf("      %d\n", sizeof(ptmp->data));
        //printf("1:    %d\n", paloffset);
 //++++ map.tiles->data->offset=(paloffset/3);
@@ -186,13 +187,9 @@ void main(int argc, char *argv[])
        modexDrawSpriteRegion(spri->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);
 #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);
+#else
+       modexDrawSpritePBufRegion(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data);
 #endif
 
        modexShowPage(spri->page);