X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=263b66027e6ce2b990eee5e8c17e4cd657cce3ec;hb=02dd99850b12a31480e011885a8299a0e24f7dd8;hp=506288dbab1828610b1ce3722e2115f049206525;hpb=92f4ec25d971a1da4f97474b4596a006f5e1fcfa;p=16.git diff --git a/src/scroll.c b/src/scroll.c index 506288db..263b6602 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.c" //#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,12 @@ 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 QUADWH (TILEWH/4) +#define TILEWH 16 +#define QUADWH TILEWH/2 #define SPEED 4 //#define LOOPMAX (TILEWH/SPEED) @@ -72,11 +73,13 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword #define TRIGGX 10 #define TRIGGY 9 -void main() { +void main() { + size_t oldfreemem=GetFreeSize(); long emmhandle; long emsavail; char teststr[80]; - int i; + int i; + static word paloffset=0; bitmap_t ptmp;//, npctmp; // player sprite planar_buf_t *p; const char *cpus; @@ -85,8 +88,8 @@ 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 *ptr, *mappalptr; actor_t player; //actor_t npc0; @@ -102,7 +105,7 @@ void main() { printf("Expanded memory manager is not present\n"); exit(0); } - + emsavail = emmavail(); if(emsavail == -1) { @@ -116,26 +119,30 @@ void main() { printf("Insufficient pages available\n"); 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 - //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); - //++++ - initMap(&map); - mv.map = ↦ - mv2.map = ↦ - mv3.map = ↦ - - /* draw the tiles */ - ptr = map.data; - /* data */ -//++++ ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite - //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite -printf("\nwwww\n"); - /* create the planar buffer */ -//++++ p = planar_buf_from_bitmap(&ptmp); - +//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); + 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 */ +//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; @@ -166,18 +173,32 @@ printf("\nwwww\n"); //printf("%d\n", emmhandle); } */ - /* save the palette */ - pal = modexNewPal(); - modexPalSave(pal); - modexFadeOff(4, pal); - modexPalBlack(); - - setkb(1); - modexEnter(); - modexPalBlack(); - modexPalUpdate(ptmp.palette); - modexFadeOn(4, ptmp.palette); - screen = modexDefaultPage(); + + /* 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(); screen.width += (TILEWH*2); screen.height += (TILEWH*2)+QUADWH; mv.page = &screen; @@ -219,13 +240,14 @@ printf("\nwwww\n"); 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, 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); + //----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 @@ -523,6 +545,15 @@ printf("\nwwww\n"); } 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(24)){ modexPalUpdate3(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(87)) { modexLeave(); @@ -535,9 +566,11 @@ printf("\nwwww\n"); } } - /* fade back to text mode */ - modexFadeOff(4, ptmp.palette); - modexPalBlack(); + /* 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"); @@ -553,7 +586,10 @@ printf("\nwwww\n"); 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("player.d: %d\n", player.d); + 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"); @@ -570,9 +606,8 @@ printf("\nwwww\n"); case 2: cpus = "386 or newer"; break; default: cpus = "internal error"; break; } - printf("detected CPU type: %s\n", cpus); - modexPalBlack(); - modexFadeOn(4, pal); + printf("detected CPU type: %s\n", cpus); + modexFadeOn(4, dpal); } @@ -604,9 +639,9 @@ allocMap(int w, int h) { void initMap(map_t *map) { /* just a place holder to fill out an alternating pattern */ - int x, y; - int i; - int tile = 1; + int x, y, xx, yy; + int i, q; +// int tile = 1; //if(!isEMS() || !checkEMS()) // map->tiles = malloc(sizeof(tiles_t)); //else @@ -617,37 +652,50 @@ initMap(map_t *map) { // map->tiles->data = malloc(sizeof(bitmap_t)); //else // map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t)); -// map->tiles->data->width = (TILEWH*2); +// map->tiles->data->width = (TILEWH/**2*/); // map->tiles->data->height= TILEWH; //if(!isEMS() || !checkEMS()) // map->tiles->data->data = malloc((TILEWH*2)*TILEWH); //else // map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH); - map->tiles->tileHeight = TILEWH; - map->tiles->tileWidth =TILEWH; - map->tiles->rows = 1; - map->tiles->cols = 2; - - /*i=0; - for(y=0; ytiles->data->data[i] = 28;//0x24; - else - map->tiles->data->data[i] = 0;//0x34; +// map->tiles->tileHeight = TILEWH; +// map->tiles->tileWidth =TILEWH; +// map->tiles->rows = 1; +// map->tiles->cols = 1;//2; + + /*q=0; + //for(y=0; yheight; y++) { + //for(x=0; xwidth; x++) { + i=0; + for(yy=0; yytiles->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]); + //} i++; - } - }*/ + } +// printf("\n"); + } +// printf("[%d]", map->data[q]); + q++; +// } + //printf("\n\n"); +// }*/ - i=0; + /*i=0; for(y=0; yheight; y++) { - for(x=0; xwidth; x++) { - map->data[i] = tile; - tile = tile ? 0 : 1; + for(x=0; xwidth; x++) { +// map->data[i]=255; + printf("[%d]", map->data[i]); + //tile = tile ? 0 : 1; i++; } - tile = tile ? 0 : 1; - } + //tile = tile ? 0 : 1; + }*/ } @@ -772,11 +820,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; - rx = (i % t->cols) * t->tileWidth; - ry = (i / t->cols) * t->tileHeight; + word ry; + //if(i==0) i=2; + if(i==0) + { + //wwww + } + else + { + rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth); + 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)); + } } @@ -789,7 +845,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! */ @@ -808,7 +864,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; @@ -819,7 +875,21 @@ void qclean() { modexLeave(); 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)