From: sparky4 Date: Tue, 3 May 2016 19:58:16 +0000 (-0500) Subject: fack.... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=c21427f2bf5be1066b2a38fafd8b82cdbd178eae;p=16.git fack.... --- diff --git a/SCROLL.16L b/SCROLL.16L index 18608461..10d2d7ca 100755 --- a/SCROLL.16L +++ b/SCROLL.16L @@ -11,24 +11,226 @@ chkmap ok [2], vmem_remain=256 [3], video->page[i].pagesize=256 [3], vmem_remain=0 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=2 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=2 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=2 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=2 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=2 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=3 +pip[0].page->tilesw=22 pip[0].page->tw=20 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=2 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=2 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=2 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=2 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=4 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=0 +player[0].d=2 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=2 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=2 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=2 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=1 +player[0].d=2 +player[0].d=2 Project 16 scroll.exe. This is just a test file! -version May 2 2016 15:12:18 -tx: -16 -ty: -1 -player.x: 144 player.y: 112 -player.tx: 9 player.ty: 7 -player.triggx: 9 player.triggy: 8 -player.hp: 4 player.q: 1 player.info.dir: 2 player.d: 1 pdir=1 +version May 3 2016 13:10:29 +tx: 2 +ty: 0 +player.x: 160 player.y: 80 +player.tx: 12 player.ty: 5 +player.triggx: 11 player.triggy: 5 +player.hp: 4 player.q: 1 player.info.dir: 2 player.d: 2 pdir=1 tile data value at player trigger position: 1 Virtual Screen: 352x272 Screen: 320x240 -tile resolution: 15x15 middle tile position: 10x8 +virtual tile resolution: 22x17 +tile resolution: 20x15 +middle tile position: 10x8 video memory remaining: 0 -page [0]=(a000:0000) - [1]=(a000:5d80) - [2]=(a000:bb00) - [3]=(a000:ffc0) -mv[0].tx: -16 mv[0].ty: -1 +page [0]=(a000:0008) + [1]=(a000:5d88) + [2]=(a000:bb8c) + [3]=(a000:000c) +mv[1].tx: 2 mv[1].ty: 0 panswitch=0 detected CPU type: 386 or newer diff --git a/pcx2vrl b/pcx2vrl index 3d9ac6e6..bd947e55 100755 Binary files a/pcx2vrl and b/pcx2vrl differ diff --git a/pcxsscut b/pcxsscut index d743ac3b..1deec74d 100755 Binary files a/pcxsscut and b/pcxsscut differ diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index f9a23fc4..277beb46 100755 --- 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 40dc8fc2..6357ad9b 100755 --- 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 acdd4bda..b67956b7 100755 Binary files a/vrl2vrs and b/vrl2vrs differ diff --git a/vrsdump b/vrsdump index 8ba0497d..dbaba30e 100755 Binary files a/vrsdump and b/vrsdump differ