X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=263b66027e6ce2b990eee5e8c17e4cd657cce3ec;hb=b5c46f5e85d6be9895fa484766867907a885439c;hp=557b1a072c4ae78c217d20130085a3638043f9aa;hpb=297bb09194f5c064eb36728bce04309f72fa1431;p=16.git diff --git a/src/scroll.c b/src/scroll.c index 557b1a07..263b6602 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,13 +1,13 @@ -#include "src\lib\modex16.h" -#include -#include -#include "src\lib\dos_kb.h" -#include "src\lib\wtest\wtest.c" -#include "src\lib\ems.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\ems.c" //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ -typedef struct { +/*typedef struct { bitmap_t *data; word tileHeight; word tileWidth; @@ -21,7 +21,7 @@ typedef struct { tiles_t *tiles; int width; int height; -} map_t; +} map_t;*/ typedef struct { @@ -44,10 +44,10 @@ typedef struct { int sety; //NOT USED YET! player sprite sheet set on the image y word q; //loop variable word d; //direction + bitmap_t data; //supposively the sprite sheet data int hp; //hitpoints of the player } actor_t; - map_t allocMap(int w, int h); void initMap(map_t *map); void mapScrollRight(map_view_t *mv, byte offset); @@ -58,65 +58,147 @@ 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 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) //place holder definitions -#define MAPX 200 -#define MAPY 150 +//#define MAPX 200 +//#define MAPY 150 #define TRIGGX 10 #define TRIGGY 9 -void main() { +void main() { + size_t oldfreemem=GetFreeSize(); + long emmhandle; + long emsavail; + char teststr[80]; + int i; + static word paloffset=0; bitmap_t ptmp;//, npctmp; // player sprite + planar_buf_t *p; const char *cpus; - static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ - int emmhandle; + static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ page_t screen, screen2, screen3; 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; - /* create the map */ - map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly - initMap(&map); - mv.map = ↦ - mv2.map = ↦ - mv3.map = ↦ +// atexit(qclean()); + /*if(!emmtest()) + { + printf("Expanded memory is not present\n"); + exit(0); + } + + if(!emmok()) + { + printf("Expanded memory manager is not present\n"); + exit(0); + } - /* draw the tiles */ - ptr = map.data; - /* data */ - ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite - //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite + emsavail = emmavail(); + if(emsavail == -1) + { + printf("Expanded memory manager error\n"); + exit(0); + } + printf("There are %ld pages available\n",emsavail); + + if((emmhandle = emmalloc(emsavail)) < 0) + { + printf("Insufficient pages available\n"); + exit(0); + }*/ - if(isEMS()) printf("%d\n", coretotalEMS()); - if(isEMS()) - { - emmhandle = alloc_emem(256); - printf("%d\n", emmhandle); - } + /* create the map */ +//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; + mm.length=sizeof(map); + mm.sourceH=0; + mm.sourceOff=(long)↦ + mm.destH=emmhandle; + mm.destOff=1; + //halp! + ist = move_emem(&mm); + printf("%d\n", coretotalEMS()); + if(!ist){ dealloc_emem(emmhandle); exit(5); } + //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(); + if(isEMS()) + { + XMOVE mm; + mm.length=emmhandle; + mm.sourceH=0; + mm.sourceOff=(long)&ptmp; + mm.destH=emmhandle; + mm.destOff=0; + //halp! + ist = move_emem(&mm); + printf("%d\n", coretotalEMS()); + if(!ist){ dealloc_emem(emmhandle); exit(5); } + //printf("%d\n", emmhandle); + } +*/ + + /* 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; @@ -158,14 +240,15 @@ 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, 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); - while(!keyp(1) && player.hp!=0) + //----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 @@ -180,7 +263,7 @@ void main() { //right movement if(npc0.d == 2) { - if(npc0.tx < MAPX && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty)) + 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)) { @@ -232,7 +315,7 @@ void main() { //down movement if(npc0.d == 3) { - if(npc0.ty < MAPY && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1)) + 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)) { @@ -290,7 +373,7 @@ void main() { 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 < MAPX && 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 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -304,7 +387,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.tx++; } } - else if(player.tx < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) + else if(player.tx < map.width && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -331,7 +414,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 <= MAPX && 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 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -372,7 +455,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 < MAPY && 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 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -386,7 +469,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.ty++; } } - else if(player.ty < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) + else if(player.ty < map.height && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -413,7 +496,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 <= MAPY && 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 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -461,14 +544,36 @@ 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(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(); + setkb(0); + __asm + { + mov ah,31h + int 21h + } + } } - /* 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"); printf("Project 16 scroll.exe\n"); printf("tx: %d\n", bg->tx); printf("ty: %d\n", bg->ty); @@ -481,16 +586,19 @@ void main() { 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"); - //xmsfree(&map); - //xmsfree(bg); - //xmsfree(spri); - //xmsfree(mask); - //xmsreport(); - if(isEMS()) dealloc_emem(emmhandle); + printf("\n"); + //xmsfree(&map); + //xmsfree(bg); + //xmsfree(spri); + //xmsfree(mask); + //xmsreport(); + //emmclose(emmhandle); switch(detectcpu()) { case 0: cpus = "8086/8088 or 186/88"; break; @@ -498,9 +606,8 @@ void main() { 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); } @@ -510,62 +617,85 @@ allocMap(int w, int h) { result.width =w; result.height=h; - //if(!isEMS() || !checkEMS()) - result.data = malloc(sizeof(byte) * w * h); - //else - // result.data = (byte *)alloc_emem(sizeof(byte) * w * h); + result.data = malloc(sizeof(byte) * w * h); + //result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024); + /*if(isEMS() || checkEMS()) + { + XMOVE mm; + //emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map)) + mm.length=sizeof(result); + mm.sourceH=0; + mm.sourceOff=ptr2long(&result); + mm.destH=emmhandle; + mm.destOff=0; + ist = move_emem(&mm); + if(!ist){ dealloc_emem(emmhandle); exit(5); } + printf("%d\n", coretotalEMS()); + }*/ return result; } - 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 +// map->tiles = malloc(sizeof(tiles_t)); + //else // map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t)); /* create the tile set */ //if(!isEMS() || !checkEMS()) - map->tiles->data = malloc(sizeof(bitmap_t)); - //else +// 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->height= TILEWH; +// 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 = 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; - +// 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(y=0; ytiles->data->data[i] = 28;//0x24; - else - map->tiles->data->data[i] = 0;//0x34; + 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; + }*/ } @@ -690,14 +820,23 @@ 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; - modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data); + 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)); + } } -void +void mapDrawRow(map_view_t *mv, int tx, int ty, word y) { word x; int i; @@ -706,14 +845,14 @@ 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! */ } } -void +void mapDrawCol(map_view_t *mv, int tx, int ty, word x) { int y; int i; @@ -725,17 +864,32 @@ 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; } } -/*void npcmove(map_view_t bg, map_view_t fg, ) +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)