X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=7c542a8db1d46a9978a6d8879f4c01a3d8dbea8a;hb=5a58cbe2fbb89c31abbb46b23d6bfc6d2765cca5;hp=6f5356597926111586f1fea442728c05d044e2b3;hpb=ab40c4c4e3a470df1236523a679677e4e17e41a7;p=16.git diff --git a/src/scroll.c b/src/scroll.c index 6f535659..7c542a8d 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,8 +1,8 @@ -#include "src\lib\dos_kb.h" -#include "src\lib\mapread.c" +#include "src/lib/dos_kb.h" +#include "src/lib/mapread.h" //#include "16\lib\x\modex.h" -#include "src\lib\wtest\wtest.c" -#include "src\lib\planar.c" +#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 */ @@ -58,11 +58,11 @@ void mapGoTo(map_view_t *mv, int tx, int ty); void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y); void mapDrawRow(map_view_t *mv, int tx, int ty, word y); void mapDrawCol(map_view_t *mv, int tx, int ty, word x); -void qclean(); +void qclean(); void pdump(map_view_t *pee); void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp); -#define TILEWH 16 +#define TILEWH 16 #define QUADWH TILEWH/2 #define SPEED 4 //#define LOOPMAX (TILEWH/SPEED) @@ -74,10 +74,12 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword #define TRIGGY 9 void main() { + size_t oldfreemem=GetFreeSize(); long emmhandle; long emsavail; - char teststr[80]; - int i; + char teststr[80]; + word panswitch=0, panq=1, pand=0; //for panning! + int i; static word paloffset=0; bitmap_t ptmp;//, npctmp; // player sprite planar_buf_t *p; @@ -98,7 +100,7 @@ void main() { printf("Expanded memory is not present\n"); exit(0); } - + if(!emmok()) { printf("Expanded memory manager is not present\n"); @@ -118,25 +120,32 @@ void main() { printf("Insufficient pages available\n"); exit(0); }*/ - - /* create the map */ + + /* create the map */ +//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); + fprintf(stderr, "testing~\n"); loadmap("data/test.map", &map); -//---- 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); - mv.map = ↦ - mv2.map = ↦ - mv3.map = ↦ - - /* draw the tiles */ - ptr = map.data; - mappalptr = map.tiles->data->palette; - /* data */ - ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite - //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite - /* create the planar buffer */ + 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); + mv.map = ↦ + mv2.map = ↦ + mv3.map = ↦ + + /* draw the tiles */ + 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 + //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 @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); + /*if(isEMS()) { XMOVE mm; @@ -167,28 +176,32 @@ void main() { //printf("%d\n", emmhandle); } */ - - /* save the palette */ - dpal = modexNewPal(); - modexPalSave(dpal); - modexFadeOff(4, dpal); - - setkb(1); - modexEnter(); - modexPalBlack(); //reset the palette~ - ptmp.offset=(paloffset/3); - modexPalUpdate(&ptmp, &paloffset, 0, 0); - //printf(" %d\n", sizeof(ptmp.data)); - //printf("1: %d\n", paloffset); - map.tiles->data->offset=(paloffset/3); - modexPalUpdate(map.tiles->data, &paloffset, 0, 0); + + /* save the palette */ + dpal = modexNewPal(); + modexPalSave(dpal); + modexFadeOff(4, dpal); + + setkb(1); + modexEnter(); + modexPalBlack(); //reset the palette~ +// printf("Total used @ before palette initiation: %zu\n", oldfreemem-GetFreeSize()); + ptmp.offset=(paloffset/3); + modexPalUpdate(&ptmp, &paloffset, 0, 0); + //printf(" %d\n", sizeof(ptmp.data)); + //printf("1: %d\n", paloffset); + map.tiles->data->offset=(paloffset/3); + modexPalUpdate(map.tiles->data, &paloffset, 0, 0); + printf("\n====\n"); + printf("0 paloffset= %d\n", paloffset/3); + printf("====\n\n"); gpal = modexNewPal(); - modexPalSave(gpal); - modexSavePalFile("data/g.pal", gpal); - modexPalBlack(); //so player will not see loadings~ - - /* setup camera and screen~ */ - screen = modexDefaultPage(); + modexPalSave(gpal); + modexSavePalFile("data/g.pal", gpal); + modexPalBlack(); //so player will not see loadings~ + + /* setup camera and screen~ */ + screen = modexDefaultPage(); screen.width += (TILEWH*2); screen.height += (TILEWH*2)+QUADWH; mv.page = &screen; @@ -230,19 +243,17 @@ void main() { modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/ modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp); - //----modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1); - //----modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1); - - //----modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255); - //----modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255); - modexShowPage(spri->page); + modexShowPage(spri->page); +// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize()); modexFadeOn(4, gpal); while(!keyp(1) && player.hp>0) { //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; + #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; @@ -357,12 +368,14 @@ void main() { */ //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 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) + 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)) { @@ -376,7 +389,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.tx++; } } - else if(player.tx < map.width && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) + else if(player.tx < map.width && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -403,7 +416,8 @@ 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 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) + 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)) { @@ -417,7 +431,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.tx--; } } - else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) + else if(player.tx > 1 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -444,7 +458,8 @@ 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 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) + 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)) { @@ -458,7 +473,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.ty++; } } - else if(player.ty < map.height && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) + else if(player.ty < map.height && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -485,7 +500,8 @@ 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 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) + 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)) { @@ -499,7 +515,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.ty--; } } - else if(player.ty > 1 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) + else if(player.ty > 1 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -521,9 +537,63 @@ void main() { player.triggerx = player.tx; player.triggery = player.ty-1; } - //modexClearRegion(mask->page, 66, 66, 2, 40, 0); - - if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) +}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); + panq++; + } else { panq = 1; pand = 0; } + } + //left movement + if((keyp(75) && !keyp(77) && pand == 0) || pand == 4) + { + if(pand == 0){ pand = 4; } + if(panq<=(TILEWH/SPEED)) + { + bg->page->dx--; + spri->page->dx--; + modexShowPage(bg->page); + modexShowPage(spri->page); + panq++; + } else { panq = 1; pand = 0; } + } + //down movement + if((keyp(72) && !keyp(80) && pand == 0) || pand == 3) + { + if(pand == 0){ pand = 3; } + if(panq<=(TILEWH/SPEED)) + { + bg->page->dy--; + spri->page->dy--; + modexShowPage(bg->page); + modexShowPage(spri->page); + panq++; + } else { panq = 1; pand = 0; } + } + //up movement + if((keyp(80) && !keyp(72) && pand == 0) || pand == 1) + { + if(pand == 0){ pand = 1; } + if(panq<=(TILEWH/SPEED)) + { + bg->page->dy++; + spri->page->dy++; + modexShowPage(bg->page); + modexShowPage(spri->page); + panq++; + } else { panq = 1; pand = 0; } + } +} + //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; for(i=800; i>=400; i--) @@ -533,43 +603,56 @@ 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(25)){ pdump(bg); pdump(spri); } - - if(keyp(87)) - { + //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; } + if(keyp(25)){ pdump(bg); pdump(spri); } + 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); } + + if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; } + if(keyp(87)) + { modexLeave(); - setkb(0); - __asm - { - mov ah,31h - int 21h - } - } + setkb(0); + __asm + { + mov ah,31h + int 21h + } + } + + if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync! + } - /* fade back to text mode */ + /* fade back to text mode */ + /* but 1st lets save the game palette~ */ + modexPalSave(gpal); + modexSavePalFile("data/g.pal", gpal); modexFadeOff(4, gpal); modexLeave(); setkb(0); - //system("mem /E /P"); printf("Project 16 scroll.exe\n"); printf("tx: %d\n", bg->tx); - printf("ty: %d\n", bg->ty); - printf("player.x: %d", player.x); - if(player.hp==0) printf("%d wwww\n", player.y+8); - else printf("\nplayer.y: %d\n", player.y); - printf("player.tx: %d\n", player.tx); - printf("player.ty: %d\n", player.ty); - printf("player.triggx: %d\n", player.triggerx); - printf("player.triggy: %d\n", player.triggery); - printf("player.hp: %d\n", player.hp); - printf("player.q: %d\n", player.q); - printf("player.d: %d\n", player.d); - printf("palette offset: %d\n", paloffset/3); + 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("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()); + printf("Total free: %zu\n", GetFreeSize()); 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("\n"); + printf("Screen: %dx", screen.width); printf("%d\n", screen.height); + printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height); //xmsfree(&map); //xmsfree(bg); //xmsfree(spri); @@ -583,7 +666,7 @@ void main() { case 2: cpus = "386 or newer"; break; default: cpus = "internal error"; break; } - printf("detected CPU type: %s\n", cpus); + printf("detected CPU type: %s\n", cpus); modexFadeOn(4, dpal); } @@ -640,32 +723,32 @@ initMap(map_t *map) { // map->tiles->rows = 1; // map->tiles->cols = 1;//2; - /*q=0; + /*q=0; //for(y=0; yheight; y++) { - //for(x=0; xwidth; x++) { + //for(x=0; xwidth; x++) { i=0; for(yy=0; yytiles->data->data[i+1] = map->data[q];//28;//0x24; + map->tiles->data->data[i+1] = map->data[q];//28;//0x24; // printf("[%d]", map->tiles->data->data[i]); //}else{ - //map->tiles->data->data[i] = map->data[q];//0;//0x34; - //printf("]%d[==[%d]", i, map->tiles->data->data[i]); + //map->tiles->data->data[i] = map->data[q];//0;//0x34; + //printf("]%d[==[%d]", i, map->tiles->data->data[i]); //} i++; - } -// printf("\n"); - } -// printf("[%d]", map->data[q]); - q++; -// } + } +// printf("\n"); + } +// printf("[%d]", map->data[q]); + q++; +// } //printf("\n\n"); // }*/ /*i=0; for(y=0; yheight; y++) { - for(x=0; xwidth; x++) { + for(x=0; xwidth; x++) { // map->data[i]=255; printf("[%d]", map->data[i]); //tile = tile ? 0 : 1; @@ -797,18 +880,19 @@ mapGoTo(map_view_t *mv, int tx, int ty) { void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) { word rx; - word ry; - //if(i==0) i=2; - if(i==0) - { + word ry; + //if(i==0) i=2; + if(i==0) + { //wwww - } - else - { + 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); //mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight); - modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); + modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); } } @@ -822,7 +906,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) { 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! */ + /* we are in the map, so copy! */ mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y); } i++; /* next! */ @@ -841,7 +925,7 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) { i + 1 row above and one below */ for(y=0; ydyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) { if(i>=0) { - /* we are in the map, so copy away! */ + /* we are in the map, so copy away! */ mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y); } i += mv->map->width; @@ -852,16 +936,16 @@ void qclean() { modexLeave(); setkb(0); -} - -void pdump(map_view_t *pee) +} + +void pdump(map_view_t *pee) { int mult=(QUADWH); int palq=(mult)*TILEWH; - int palcol=0; - int palx, paly; + int palcol=0; + int palx, paly; for(paly=0; palypage, palx+TILEWH, paly+TILEWH, mult, mult, palcol); palcol++; }