fack....

diff --git a/SCROLL.16L b/SCROLL.16L
index 1860846115726ac639c2e3ac591ddf21f7e97d76..10d2d7ca2c3de74bdbb730674cd7d8d8c114a5e6 100755 (executable)
--- a/SCROLL.16L
+++ b/SCROLL.16L
@@ -11,24 +11,226 @@ chkmap ok
                [2], vmem_remain=256\r
                [3], video->page[i].pagesize=256\r
                [3], vmem_remain=0\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=2\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=2\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=2\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=2\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=2\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=3\r
+pip[0].page->tilesw=22 pip[0].page->tw=20\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=2\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=2\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=2\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=2\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=4\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=0\r
+player[0].d=2\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=2\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=2\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=2\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=1\r
+player[0].d=2\r
+player[0].d=2\r
 Project 16 scroll.exe. This is just a test file!\r
-version May  2 2016 15:12:18\r
-tx: -16\r
-ty: -1\r
-player.x: 144          player.y: 112\r
-player.tx: 9           player.ty: 7\r
-player.triggx: 9       player.triggy: 8\r
-player.hp: 4   player.q: 1     player.info.dir: 2      player.d: 1 pdir=1\r
+version May  3 2016 13:10:29\r
+tx: 2\r
+ty: 0\r
+player.x: 160          player.y: 80\r
+player.tx: 12          player.ty: 5\r
+player.triggx: 11      player.triggy: 5\r
+player.hp: 4   player.q: 1     player.info.dir: 2      player.d: 2 pdir=1\r
 tile data value at player trigger position: 1\r
 Virtual Screen: 352x272\r
 Screen: 320x240\r
-tile resolution: 15x15 middle tile position: 10x8\r
+virtual tile resolution: 22x17\r
+tile resolution: 20x15 \r
+middle tile position: 10x8\r
 video memory remaining: 0\r
-page   [0]=(a000:0000)\r
-       [1]=(a000:5d80)\r
-       [2]=(a000:bb00)\r
-       [3]=(a000:ffc0)\r
-mv[0].tx: -16  mv[0].ty: -1\r
+page   [0]=(a000:0008)\r
+       [1]=(a000:5d88)\r
+       [2]=(a000:bb8c)\r
+       [3]=(a000:000c)\r
+mv[1].tx: 2    mv[1].ty: 0     panswitch=0\r
 \r
 \r
 detected CPU type: 386 or newer\r

diff --git a/pcx2vrl b/pcx2vrl
index 3d9ac6e6d0e4fe19bb8f1962de5fd02253dea7be..bd947e55158b82b4f9d900234745aca806cde60e 100755 (executable)
Binary files a/pcx2vrl and b/pcx2vrl differ

diff --git a/pcxsscut b/pcxsscut
index d743ac3b8ac58a73b3cb2380e2367aee9b167169..1deec74dc0487422bfdb03acb381df671e83a049 100755 (executable)
Binary files a/pcxsscut and b/pcxsscut differ

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index f9a23fc466407c63edbef7a01cd3468937ffe853..277beb461c725eb10b75d7ba7b751d5f82f8c370 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -27,11 +27,12 @@
 void walk(map_view_t *pip, player_t *player, word pn)
 {
        #define INC_PER_FRAME if(player[pn].q&1) player[pn].persist_aniframe++; if(player[pn].persist_aniframe>4) player[pn].persist_aniframe = 1;
+       //printf("player[%d].d=%d\n", pn, player[pn].d);
        switch(player[pn].d)
        {
                //right movement
                case 3:
-                       //printf("pip[0].page->tilesw=%d\n", pip[0].page->tilesw);
+                       //printf("pip[0].page->tilesw=%d        ", pip[0].page->tilesw); printf("pip[0].page->tw=%d\n", pip[0].page->tw);
                        if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
                        !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))      //collision detection!
                        {
@@ -717,7 +718,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 }*/
 
 unsigned char shinku_fps_indicator_page = 0;
-boolean pageflipflop;
+boolean pageflipflop=0;
 //gv->video.p
 
 /*     sync    */

diff --git a/src/scroll.c b/src/scroll.c
index 40dc8fc295e4c013d0125f862d406eac52af6f18..6357ad9bf45c3f61634485495df38b6f3036bc17 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -118,7 +118,7 @@ void main(int argc, char *argv[])
        /*      input!  */
        IN_Startup();
        IN_Default(0,&player,ctrl_Joystick);
-       IN_Default(1,&player,ctrl_Joystick);
+       //IN_Default(1,&player,ctrl_Joystick);
 
        /* save the palette */
 #ifdef MODEX
@@ -166,26 +166,25 @@ void main(int argc, char *argv[])
                mv[i].map = ↦
                mv[i].video = &gvar.video;
                mv[i].pan       = &pan;
-               /* set up paging */
-//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-               mapGoTo(&mv[i], 0, 0);
        }
-
-       //modexClearRegion(mv[0].page, 0, 0, mv[0].page->width+TILEWH, mv[0].page->height+TILEWH, 15);
+       /* set up paging */
+       //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
+       mapGoTo(&mv[0], 0, 0);
+       mapGoTo(&mv[1], 0, 0);
+       //modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height);
 
        //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);
-       IN_initplayer(&player, 1);
+       //IN_initplayer(&player, 1);
 
-       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[panswitch].x-4, player[panswitch].y-TILEWH, 24, 32, 15);
+       modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #else
-       //PBUFSFUN(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 64, 24, 32,       PLAYERBMPDATA);
-       PBUFSFUN(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 64, 24, 32, &pp);
+       //PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,       PLAYERBMPDATA);
+       PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp);
 #endif
 
        modexShowPage(mv[1].page);
@@ -204,17 +203,17 @@ void main(int argc, char *argv[])
        //when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
        //player movement
-               IN_ReadControl(panswitch,&player);
+               IN_ReadControl(0,&player);
        if(!panswitch){
                walk(mv, player, 0);
        }else{
                panpagemanual(mv, player, pan.pn);
-               //printf("      player[panswitch].q: %d", player[panswitch].q); printf("        player[panswitch].d: %d\n", player[panswitch].d);
+               //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);
        }
 
 
        //the scripting stuff....
-       //if(((player[panswitch].triggerx == TRIGGX && player[panswitch].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[panswitch].tx == 5 && player[panswitch].ty == 5))
+       //if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
        if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
        {
                short i;
@@ -294,14 +293,14 @@ void main(int argc, char *argv[])
        printf("version %s\n", VERSION);
        printf("tx: %d\n", mv[0].tx);
        printf("ty: %d\n", mv[0].ty);
-       printf("player.x: %d", player[panswitch].x); printf("           player.y: %d\n", player[panswitch].y);
+       printf("player.x: %d", player[0].x); printf("           player.y: %d\n", player[0].y);
        //if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);
        //else printf("\nplayer[0].y: %d\n", player[0].y);
-       printf("player.tx: %d", player[panswitch].tx); printf("         player.ty: %d\n", player[panswitch].ty);
-       printf("player.triggx: %d", player[panswitch].triggerx); printf("       player.triggy: %d\n", player[panswitch].triggery);
-       printf("player.hp: %d", (player[panswitch].hp));        printf("        player.q: %d", player[panswitch].q);    printf("        player.info.dir: %d", player[panswitch].info.dir);      printf("        player.d: %d ", player[panswitch].d);
-               printf("pdir=%d\n", player[panswitch].pdir);
-       printf("tile data value at player trigger position: %d\n", mv[0].map->data[(player[panswitch].triggerx-1)+(map.width*(player[panswitch].triggery-1))]);
+       printf("player.tx: %d", player[0].tx); printf("         player.ty: %d\n", player[0].ty);
+       printf("player.triggx: %d", player[0].triggerx); printf("       player.triggy: %d\n", player[0].triggery);
+       printf("player.hp: %d", (player[0].hp));        printf("        player.q: %d", player[0].q);    printf("        player.info.dir: %d", player[0].info.dir);      printf("        player.d: %d ", player[0].d);
+               printf("pdir=%d\n", player[0].pdir);
+       printf("tile data value at player trigger position: %d\n", mv[0].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());
 //++++ printf("Total free: %zu\n", GetFreeSize());
@@ -319,7 +318,7 @@ void main(int argc, char *argv[])
                printf("        [%u]=", i);
                printf("(%Fp)\n", (gvar.video.page[i].data));
        }
-       printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("        mv[%u].ty: %d\n", pan.pn, mv[pan.pn].ty);
+       printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("        mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty); printf("panswitch=%u\n", panswitch);
        //printf("player[1].q: %d", player[1].q);       printf("        player[1].d: %d\n", player[1].d);
        printf("\n");
 //     printf("Screen2: %dx", gvar.video.page[1].width);       printf("%d\n", gvar.video.page[1].height);

diff --git a/vrl2vrs b/vrl2vrs
index acdd4bda2f0dd8772cdce97a19b6c906e4e09f8e..b67956b7baa37941b88ad79da1a2ff49c0c435a0 100755 (executable)
Binary files a/vrl2vrs and b/vrl2vrs differ

diff --git a/vrsdump b/vrsdump
index 8ba0497deb819d75caeef21a3a0d4086b394845b..dbaba30e42b8639969d3bdd4433243eb338adcbe 100755 (executable)
Binary files a/vrsdump and b/vrsdump differ