X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=ceee8644a7fcd03b181050fdf85ce34586820f17;hb=26444a1f2a6670976e67509ac92c8420bf9c7fdc;hp=dd66f556781431be8bce4e868b259d713f8934c9;hpb=58947b239b0c268e8eecf88906e4d742e877956b;p=16.git diff --git a/src/scroll.c b/src/scroll.c index dd66f556..ceee8644 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,29 +1,11 @@ -#include "src\lib\dos_kb.h" -#include "src\lib\mapread.c" -//#include "16\lib\x\modex.h" -#include "src\lib\wtest\wtest.c" -#include "src\lib\planar.c" +#include "src/lib/dos_kb.h" +#include "src/lib/mapread.h" +#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 */ -/*typedef struct { - bitmap_t *data; - word tileHeight; - word tileWidth; - unsigned int rows; - unsigned int cols; -} tiles_t; - - -typedef struct { - byte *data; - tiles_t *tiles; - int width; - int height; -} map_t;*/ - - typedef struct { map_t *map; page_t *page; @@ -59,24 +41,28 @@ 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 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 QUADWH (TILEWH/4) +#define QUADWH TILEWH/2 #define SPEED 4 //#define LOOPMAX (TILEWH/SPEED) //place holder definitions //#define MAPX 200 //#define MAPY 150 -#define TRIGGX 10 -#define TRIGGY 9 +//#define TRIGGX 10 +//#define TRIGGY 9 void main() { - long emmhandle; + size_t oldfreemem=GetFreeSize(); + /*long emmhandle; long emsavail; - char teststr[80]; + 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; const char *cpus; @@ -85,8 +71,9 @@ void main() { map_t map; map_view_t mv, mv2, mv3; map_view_t *bg, *spri, *mask;//, *tmp; - byte *pal; - byte *ptr; + byte *dpal, *gpal; + byte huge *ptr; + byte *mappalptr; actor_t player; //actor_t npc0; @@ -96,13 +83,13 @@ void main() { printf("Expanded memory is not present\n"); exit(0); } - + if(!emmok()) { printf("Expanded memory manager is not present\n"); exit(0); } - + emsavail = emmavail(); if(emsavail == -1) { @@ -117,22 +104,30 @@ void main() { exit(0); }*/ - /* create the map */ - loadmap("data/test.map", &map/*, 0*/); -// 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 + /* 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"); +//---- 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); +//---- 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 +//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 */ - 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()) { @@ -164,17 +159,31 @@ void main() { //printf("%d\n", emmhandle); } */ + /* save the palette */ - pal = modexNewPal(); - modexPalSave(pal); - modexFadeOff(4, pal); - modexPalBlack(); + dpal = modexNewPal(); + modexPalSave(dpal); + modexFadeOff(4, dpal); setkb(1); modexEnter(); - modexPalBlack(); - modexPalUpdate(ptmp.palette); - modexFadeOn(4, ptmp.palette); + 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(); screen.width += (TILEWH*2); screen.height += (TILEWH*2)+QUADWH; @@ -217,19 +226,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); +// 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; @@ -344,12 +351,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)) { @@ -363,7 +372,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)) { @@ -390,7 +399,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)) { @@ -404,7 +414,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)) { @@ -431,7 +441,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)) { @@ -445,7 +456,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)) { @@ -472,7 +483,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)) { @@ -486,7 +498,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)) { @@ -508,9 +520,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--) @@ -520,42 +586,57 @@ 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(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 */ - modexFadeOff(4, ptmp.palette); - modexPalBlack(); + /* 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("%d\n", map.data[0]); + 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); + //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); @@ -570,8 +651,7 @@ void main() { default: cpus = "internal error"; break; } printf("detected CPU type: %s\n", cpus); - modexPalBlack(); - modexFadeOn(4, pal); + modexFadeOn(4, dpal); } @@ -627,32 +707,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; @@ -772,8 +852,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; @@ -785,10 +865,20 @@ void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) { word rx; word ry; - rx = (i % t->cols) * t->tileWidth; - ry = (i / t->cols) * t->tileHeight; + //if(i==0) i=2; + if(i==0) + { + //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); + 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); + modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); + } } @@ -798,7 +888,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! */ @@ -833,6 +923,20 @@ void qclean() setkb(0); } +void pdump(map_view_t *pee) +{ + int mult=(QUADWH); + int palq=(mult)*TILEWH; + int palcol=0; + int palx, paly; + for(paly=0; palypage, palx+TILEWH, paly+TILEWH, mult, mult, palcol); + palcol++; + } + } +} + 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) {