more

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index eb60019526cd06876b0f75fce37269891a5efd18..e7987762f78ec3b587e2c3432cac78c45130493f 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
  *
  * This file is part of Project 16.
  *
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -36,6 +36,8 @@ player_t player[MaxPlayers];
 map_view_t mv[3];
 map_view_t *bg, *spri, *mask;//, *tmp;
 bitmap_t p;
+word pn=0;
+static planar_buf_t huge *pp;
 float t;
 sword bakapee;
 
@@ -57,17 +59,18 @@ sword bakapee;
 
 void main(int argc, char *argv[])
 {
-
        byte *mesg=malloc(sizeof(dword));
 
-
        if(argv[1]) bakapee = atoi(argv[1]);
        else bakapee = 1;
 
+       testcontrolnoisy=0;
+
        player[0].persist_aniframe=0;
        player[0].speed=4;
+       //player[0].data = &pp;
 
-       printf("starting timer\n");
+       printf("starting timer  ");
        start_timer(&gvar);
        printf("ok\n");
        //extern struct inconfig inpu;
@@ -75,10 +78,10 @@ void main(int argc, char *argv[])
 //     atexit(qclean());
 
        /* create the map */
-       fprintf(stderr, "testing map load~\n");
+       fprintf(stderr, "testing map load~      ");
        loadmap("data/test.map", &map);
        chkmap(&map, 0);
-       printf("chkmap ok\n");
+       printf("chkmap ok       ");
        fprintf(stderr, "yay map loaded~~\n");
        mv[0].map = ↦
        mv[1].map = ↦
@@ -87,7 +90,7 @@ void main(int argc, char *argv[])
        /* draw the tiles */
 #ifdef MODEX
        ptr = map.data;
-       mappalptr = map.tiles->btdata->palette;
+       //mappalptr = map.tiles->btdata->palette;
 
        /* data */
        p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
@@ -95,6 +98,9 @@ void main(int argc, char *argv[])
 
        /* create the planar buffer */
 ////++++       (player[0].data) = *planar_buf_from_bitmap(&p);
+       printf("load pee!!      ");
+       pp = planar_buf_from_bitmap(&p);
+       printf("done!\n");
 
 #endif
        /*      input!  */
@@ -121,7 +127,8 @@ void main(int argc, char *argv[])
 //     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());
 //++++ player[0].data.offset=(paloffset/3);
 //++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-               modexPalUpdate1(p.palette);
+               //modexPalUpdate1(p.palette);
+               modexPalUpdate1(map.tiles->btdata->palette);
        //printf("      %d\n", sizeof(ptmp->data));
        //printf("1:    %d\n", paloffset);
 //++++ map.tiles->data->offset=(paloffset/3);
@@ -186,14 +193,15 @@ void main(int argc, char *argv[])
        npc0.q=1;
        npc0.d=0;
        modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
-IN_Ack();
+
        modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
 #ifndef        SPRITE
        modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #else
-       PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data);
+       //PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,       PLAYERBMPDATA);
+       PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp);
 #endif
-IN_Ack();
+
        modexShowPage(spri->page);
        //modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
@@ -416,6 +424,7 @@ IN_Ack();
        printf("player[0].tx: %d", player[0].tx); printf("              player[0].ty: %d\n", player[0].ty);
        printf("player[0].triggx: %d", player[0].triggerx); printf("    player[0].triggy: %d\n", player[0].triggery);
        printf("player[0].hp: %d", (player[0].hp));     printf("        player[0].q: %d", player[0].q); printf("        player[0].info.dir: %d", player[0].info.dir);   printf("        player[0].d: %d\n", player[0].d);
+               printf("pdir=%d\n", player[0].pdir);
        printf("tile data value at player trigger position: %d\n", bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
 //     printf("palette offset: %d\n", paloffset/3);
 //++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize());