X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscroll.c;h=239883f678332a467dd92647881c71e3454df139;hb=47de84fccfcf27e3cf83004b74eee1215284c5df;hp=fb0cde5258f25beca36888c98e20762ea273b91a;hpb=676e5f342c49b655bbc936225bf4524d1fbedc36;p=16.git diff --git a/src/scroll.c b/src/scroll.c index fb0cde52..239883f6 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,15 +1,13 @@ -#include "src\lib\modex16.h" -#include -#include -#include "src\lib\dos_kb.h" +#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\ems.c" +#include "src\lib\planar.c" +//====#include "src\lib\ems.c" -//word far *clock= (word far*) 0x046C; /* 18.2hz clock */ - -int emmhandle,ist; - -typedef struct { +//word far *clock= (word far*) 0x046C; /* 18.2hz clock */ + +/*typedef struct { bitmap_t *data; word tileHeight; word tileWidth; @@ -23,7 +21,7 @@ typedef struct { tiles_t *tiles; int width; int height; -} map_t; +} map_t;*/ typedef struct { @@ -45,7 +43,7 @@ typedef struct { int setx; //NOT USED YET! player sprite sheet set on the image x int sety; //NOT USED YET! player sprite sheet set on the image y word q; //loop variable - word d; //direction + word d; //direction bitmap_t data; //supposively the sprite sheet data int hp; //hitpoints of the player } actor_t; @@ -60,6 +58,7 @@ 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 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 @@ -68,15 +67,20 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword //#define LOOPMAX (TILEWH/SPEED) //place holder definitions -#define MAPX 40 -#define MAPY 30 +//#define MAPX 200 +//#define MAPY 150 #define TRIGGX 10 -#define TRIGGY 9 - +#define TRIGGY 9 + void main() { + long emmhandle; + long emsavail; + char teststr[80]; + int i; 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 */ + 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; @@ -85,55 +89,85 @@ void main() { byte *ptr; actor_t player; //actor_t npc0; - - if(isEMS() || checkEMS()){ printf("%d\n", coretotalEMS()); emmhandle = mallocEMS(coretotalEMS()); } - /* 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 - //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); +// 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); + } + + 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); + }*/ + + /* 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 + //loadmap(NULL, &map, 1); + //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); initMap(&map); mv.map = ↦ mv2.map = ↦ - mv3.map = ↦ - + mv3.map = ↦ + /* draw the tiles */ ptr = map.data; /* data */ ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite - //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite - - /*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); - } - - 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); - } + //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite + + /* create the planar buffer */ + p = planar_buf_from_bitmap(&ptmp); + + /*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); + } + + 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 */ - pal = modexNewPal(); + pal = modexNewPal(); modexPalSave(pal); modexFadeOff(4, pal); modexPalBlack(); @@ -207,7 +241,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)) { @@ -259,7 +293,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)) { @@ -317,7 +351,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)) { @@ -331,7 +365,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)) { @@ -358,7 +392,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)) { @@ -399,7 +433,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)) { @@ -413,7 +447,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)) { @@ -440,7 +474,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)) { @@ -488,14 +522,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(0x0E)) while(1){ if(xmsmalloc(24)) break; } + if(keyp(87)) + { + modexLeave(); + setkb(0); + __asm + { + mov ah,31h + int 21h + } + } } /* fade back to text mode */ modexFadeOff(4, ptmp.palette); modexPalBlack(); modexLeave(); - setkb(0); + setkb(0); //system("mem /E /P"); printf("Project 16 scroll.exe\n"); printf("tx: %d\n", bg->tx); @@ -512,19 +556,13 @@ void main() { printf("player.d: %d\n", player.d); 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()) - { - printf("%d\n", get_emem()); - printf("%d\n", coretotalEMS()); - dealloc_emem(emmhandle); - printf("%d\n", coretotalEMS()); - } + printf("\n"); + //xmsfree(&map); + //xmsfree(bg); + //xmsfree(spri); + //xmsfree(mask); + //xmsreport(); + //emmclose(emmhandle); switch(detectcpu()) { case 0: cpus = "8086/8088 or 186/88"; break; @@ -544,21 +582,21 @@ allocMap(int w, int h) { result.width =w; result.height=h; - result.data = malloc(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()); - }*/ + /*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; } @@ -571,26 +609,26 @@ initMap(map_t *map) { int tile = 1; //if(!isEMS() || !checkEMS()) map->tiles = malloc(sizeof(tiles_t)); - //else + //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 + //else // map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t)); map->tiles->data->width = (TILEWH*2); map->tiles->data->height= TILEWH; //if(!isEMS() || !checkEMS()) map->tiles->data->data = malloc((TILEWH*2)*TILEWH); - //else + //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; + /*i=0; for(y=0; ytiles->data->data[i] = 0;//0x34; i++; } - } + }*/ i=0; for(y=0; yheight; y++) { @@ -737,11 +775,12 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) { word ry; rx = (i % t->cols) * t->tileWidth; ry = (i / t->cols) * 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; @@ -757,7 +796,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) { } } -void +void mapDrawCol(map_view_t *mv, int tx, int ty, word x) { int y; int i; @@ -776,10 +815,11 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) { } } -/*void npcmove(map_view_t bg, map_view_t fg, ) +void qclean() { - -}*/ + modexLeave(); + setkb(0); +} 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)