X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=2164ca4c897d9d8ab20eb7278216409feaa1c2ff;hb=9c2785d66d34bd7ce81a2c85d4be3a6872609577;hp=f25f3a26ed169e7634162b43862e99e64ac0817b;hpb=c0fc8e76a7894a9ffaaf512a9ea93f5db9599e96;p=16.git diff --git a/src/scroll.c b/src/scroll.c index f25f3a26..2164ca4c 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -3,9 +3,11 @@ #include "src/lib/wtest/wtest.c" #include "src/lib/planar.c" //====#include "src\lib\ems.c" - + //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ +//optimize scroll*!!!! + typedef struct { map_t *map; page_t *page; @@ -59,8 +61,8 @@ void main() { size_t oldfreemem=GetFreeSize(); /*long emmhandle; long emsavail; - char teststr[80];*/ - word panswitch=0, panq=1, pand=0; //for panning! + char teststr[80];*/ + word panswitch=0, panq=1, pand=0, panpagenum=0; //for panning! int i; static word paloffset=0; bitmap_t ptmp;//, npctmp; // player sprite @@ -72,9 +74,9 @@ void main() { map_view_t mv, mv2, mv3; map_view_t *bg, *spri, *mask;//, *tmp; byte *dpal, *gpal; - byte *ptr; + byte *ptr; byte *mappalptr; - actor_t player; + actor_t player; // bitmap_t font; //actor_t npc0; @@ -106,10 +108,10 @@ void main() { }*/ /* create the map */ -//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); -//0000 fprintf(stderr, "testing~\n"); - loadmap("data/test.map", &map); -//0000 fprintf(stderr, "yay map loaded~~\n"); +//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); +//0000 fprintf(stderr, "testing~\n"); + loadmap("data/test.map", &map); +//0000 fprintf(stderr, "yay map loaded~~\n"); //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); //---- initMap(&map); @@ -121,14 +123,14 @@ void main() { ptr = map.data; mappalptr = map.tiles->data->palette; /* data */ -//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); - ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite -// font = bitmapLoadPcx("data/font.pcx"); +//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); + ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite +// font = bitmapLoadPcx("data/font.pcx"); //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite /* create the planar buffer */ -//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); - p = planar_buf_from_bitmap(&ptmp); +//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); + p = planar_buf_from_bitmap(&ptmp); //0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); /*if(isEMS()) @@ -176,7 +178,7 @@ void main() { //printf(" %d\n", sizeof(ptmp.data)); //printf("1: %d\n", paloffset); map.tiles->data->offset=(paloffset/3); -//++++ modexPalUpdate(map.tiles->data, &paloffset, 0, 0); + modexPalUpdate(map.tiles->data, &paloffset, 0, 0); printf("\n====\n"); printf("0 paloffset= %d\n", paloffset/3); printf("====\n\n"); @@ -192,7 +194,8 @@ void main() { mv.page = &screen; screen2 = modexNextPage(mv.page); mv2.page = &screen2; - screen3 = screen2; + screen3 = modexNextPage0(mv2.page, 352, 176); //(352*176)+1024 is the remaining amount of memory left wwww + //screen3 = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww mv3.page = &screen3; /* set up paging */ @@ -236,130 +239,16 @@ void main() { //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 //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map - #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - - //modexClearRegion(bg->page, player.x, player.y, 16, 16, 4); //currently the over scan color! - /*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - - if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8; - if(npc0.d>4) - npc0.d=0; - - //right movement - if(npc0.d == 2) - { - if(npc0.tx < map.width && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.x+=SPEED; - //animatePlayer(bg, spri, mask, 1, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - modexShowPage(spri->page); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.tx++; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 32, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx+1; - npc0.triggery = npc0.ty; - } - - //left movement - if(npc0.d == 4) - { - if(npc0.tx > 1 && !(npc0.tx-1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx-1 == player.tx && npc0.ty == player.ty)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.x-=SPEED; - //animatePlayer(bg, spri, mask, 3, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - modexShowPage(spri->page); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.tx--; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 96, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx-1; - npc0.triggery = npc0.ty; - } - - //down movement - if(npc0.d == 3) - { - if(npc0.ty < map.height && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.y+=SPEED; - //animatePlayer(bg, spri, mask, 2, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - modexShowPage(spri->page); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.ty++; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx; - npc0.triggery = npc0.ty+1; - } - - //up movement - if(npc0.d == 1) - { - if(npc0.ty > 1 && !(npc0.tx == TRIGGX && npc0.ty-1 == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty-1)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.y-=SPEED; - //animatePlayer(bg, spri, mask, 0, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - modexShowPage(spri->page); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.ty--; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 0, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx; - npc0.triggery = npc0.ty-1; - } - - if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; } -*/ + #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; //player movement - //TODO: make movement into a function! + //TODO: make movement into a function! if(!panswitch){ //right movement if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2) { if(player.d == 0){ player.d = 2; } - if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 && + if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) @@ -401,7 +290,7 @@ void main() { if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4) { if(player.d == 0){ player.d = 4; } - if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 && + if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) @@ -443,7 +332,7 @@ void main() { if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3) { if(player.d == 0){ player.d = 3; } - if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 && + if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) @@ -485,7 +374,7 @@ void main() { if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1) { if(player.d == 0){ player.d = 1; } - if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 && + if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) @@ -522,18 +411,32 @@ void main() { player.triggerx = player.tx; player.triggery = player.ty-1; } -}else{ -//88 switch! +}else{ +//88 switch! //right movement if((keyp(77) && !keyp(75) && pand == 0) || pand == 2) { if(pand == 0){ pand = 2; } if(panq<=(TILEWH/SPEED)) - { - bg->page->dx++; - spri->page->dx++; - modexShowPage(bg->page); - modexShowPage(spri->page); + { + switch(panpagenum) + { + case 0: + //bg + bg->page->dx++; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dx++; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dx++; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } } @@ -543,10 +446,24 @@ void main() { if(pand == 0){ pand = 4; } if(panq<=(TILEWH/SPEED)) { - bg->page->dx--; - spri->page->dx--; - modexShowPage(bg->page); - modexShowPage(spri->page); + switch(panpagenum) + { + case 0: + //bg + bg->page->dx--; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dx--; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dx--; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } } @@ -556,10 +473,24 @@ void main() { if(pand == 0){ pand = 3; } if(panq<=(TILEWH/SPEED)) { - bg->page->dy--; - spri->page->dy--; - modexShowPage(bg->page); - modexShowPage(spri->page); + switch(panpagenum) + { + case 0: + //bg + bg->page->dy--; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dy--; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dy--; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } } @@ -569,15 +500,32 @@ void main() { if(pand == 0){ pand = 1; } if(panq<=(TILEWH/SPEED)) { - bg->page->dy++; - spri->page->dy++; - modexShowPage(bg->page); - modexShowPage(spri->page); + switch(panpagenum) + { + case 0: + //bg + bg->page->dy++; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dy++; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dy++; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } - } + } } - //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) + + //the scripting stuf.... + + //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) { short i; @@ -588,20 +536,24 @@ void main() { nosound(); } if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; } - //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; } - if(keyp(0x44)){ bputs(spri->page, player.x+(TILEWH*2), player.y+(TILEWH*2), "wwww"); } //f10 - if(keyp(25)){ pdump(bg); pdump(spri); } + //debugging binds! + //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; } + if(keyp(2)){ modexShowPage(bg->page); panpagenum=0; } + if(keyp(3)){ modexShowPage(spri->page); panpagenum=1; } + if(keyp(4)){ modexShowPage(mask->page); panpagenum=2; } + if(keyp(0x44)){ bputs(spri->page, player.x+(TILEWH*2), player.y+(TILEWH*2), "wwww"); } //f10 + if(keyp(25)){ pdump(bg); pdump(spri); } //p if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); } if(keyp(22)){ paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0); printf("1paloffset = %d\n", paloffset/3); modexPalUpdate(map.tiles->data, &paloffset, 0, 0); printf("2paloffset = %d\n", paloffset/3); - pdump(bg); pdump(spri); } + pdump(bg); pdump(spri); } //pan switch - if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; } + if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; } //f12 //TSR - if(keyp(87)) + if(keyp(87)) //f11 { modexLeave(); setkb(0); @@ -610,9 +562,9 @@ void main() { mov ah,31h int 21h } - } - - if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync! + } + + if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync! } @@ -625,13 +577,13 @@ void main() { setkb(0); printf("Project 16 scroll.exe\n"); printf("tx: %d\n", bg->tx); - printf("ty: %d\n", bg->ty); + printf("ty: %d\n", bg->ty); printf("player.x: %d", player.x); printf(" player.y: %d\n", player.y); //if(player.hp==0) printf("%d wwww\n", player.y+8); //else printf("\nplayer.y: %d\n", player.y); printf("player.tx: %d", player.tx); printf(" player.ty: %d\n", player.ty); printf("player.triggx: %d", player.triggerx); printf(" player.triggy: %d\n", player.triggery); - printf("player.hp: %d", player.hp); printf(" player.q: %d", player.q); printf(" player.d: %d\n", player.d); + printf("player.hp: %d", player.hp); printf(" player.q: %d", player.q); printf(" player.d: %d\n", player.d); printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]); printf("palette offset: %d\n", paloffset/3); printf("Total used: %zu\n", oldfreemem-GetFreeSize()); @@ -639,16 +591,16 @@ void main() { printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n"); printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n"); printf("Screen: %dx", screen.width); printf("%d\n", screen.height); - printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height); + printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height); //printf("map.width=%d map.height=%d map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]); //xmsfree(&map); //xmsfree(bg); //xmsfree(spri); //xmsfree(mask); //xmsreport(); - //emmclose(emmhandle); - printf("%Fp\n", bios_8x8_font()); - printf("%c\n", *bios_8x8_font()); + //emmclose(emmhandle); + printf("%Fp\n", bios_8x8_font()); + //printf("%c\n", *bios_8x8_font()); switch(detectcpu()) { case 0: cpus = "8086/8088 or 186/88"; break; @@ -858,8 +810,8 @@ mapGoTo(map_view_t *mv, int tx, int ty) { /* draw the tiles */ modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0); - py=0; - i=mv->ty * mv->map->width + mv->tx; + py=0; + i=mv->ty * mv->map->width + mv->tx; for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) { mapDrawRow(mv, tx-1, ty, py); i+=mv->map->width - tx; @@ -874,13 +826,13 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) { //if(i==0) i=2; if(i==0) { - //wwww + //wwww modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color! } else { rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth); - ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight); + ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight); ////0000 printf("i=%d\n", i); //mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight); modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); @@ -894,7 +846,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) { int i; /* the position within the map array */ - i=ty * mv->map->width + tx; + i=ty * mv->map->width + tx; for(x=0; xdxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) { if(i>=0) { /* we are in the map, so copy! */