X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=4e13f5d7e64d1f759e2356af151e23f8843a5547;hb=f3b2cbc51effb91a651abe469e0d3cec58a491e5;hp=cdf1011efe71096b42c2788ff946110bcd187f2f;hpb=06eefddf479ee2591beaf79e72d7cf679f163b12;p=16.git diff --git a/src/scroll.c b/src/scroll.c index cdf1011e..4e13f5d7 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -3,6 +3,7 @@ #include #include "src\lib\dos_kb.h" #include "src\lib\wtest\wtest.c" +#include "src\lib\ems.c" //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ @@ -38,8 +39,8 @@ typedef struct { int tx; //player tile position on the viewable map int ty; //player tile position on the viewable map int triggerx; //player's trigger box tile position on the viewable map - int triggery; //player's trigger box tile position on the viewable map - int setx; //NOT USED YET! player sprite sheet set on the image x + int triggery; //player's trigger box tile position on the viewable map + 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 @@ -77,18 +78,12 @@ void main() { page_t screen, screen2, screen3; map_t map; map_view_t mv, mv2, mv3; - map_view_t *bg, *spri, *mask;//, *tmp; + map_view_t *bg, *spri, *mask;//, *tmp; byte *pal; byte *ptr; actor_t player; //actor_t npc0; - /* save the palette */ - pal = modexNewPal(); - modexPalSave(pal); - modexFadeOff(4, pal); - modexPalBlack(); - /* 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); @@ -99,8 +94,15 @@ void main() { /* draw the tiles */ ptr = map.data; /* data */ - ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite + ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite + + /* save the palette */ + pal = modexNewPal(); + modexPalSave(pal); + modexFadeOff(4, pal); + modexPalBlack(); + setkb(1); modexEnter(); modexPalBlack(); @@ -126,7 +128,7 @@ void main() { //mapGoTo(mask, 0, 0); //TODO: put player in starting position of spot - //default player position on the viewable map + //default player position on the viewable map player.tx = bg->tx + 10; player.ty = bg->ty + 8; player.x = player.tx*TILEWH; @@ -134,9 +136,9 @@ void main() { player.triggerx = player.tx; player.triggery = player.ty+1; player.q=1; - player.d=0; - player.hp=4; - //npc + player.d=0; + player.hp=4; + //npc /*npc0.tx = bg->tx + 1; npc0.ty = bg->ty + 1; npc0.x = npc0.tx*TILEWH; @@ -144,32 +146,32 @@ void main() { npc0.triggerx = npc0.tx; npc0.triggery = npc0.ty+1; npc0.q=1; - npc0.d=0; + npc0.d=0; 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(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) { //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_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; - if(npc0.d>4) - npc0.d=0; - + #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; + /*#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; + if(npc0.d>4) + npc0.d=0; + //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.q<=(TILEWH/SPEED)) @@ -191,11 +193,11 @@ void main() { } npc0.triggerx = npc0.tx+1; npc0.triggery = npc0.ty; - } + } //left movement if(npc0.d == 4) - { + { if(npc0.tx > 1 && !(npc0.tx-1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx-1 == player.tx && npc0.ty == player.ty)) { if(npc0.q<=(TILEWH/SPEED)) @@ -217,11 +219,11 @@ void main() { } npc0.triggerx = npc0.tx-1; npc0.triggery = npc0.ty; - } + } //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.q<=(TILEWH/SPEED)) @@ -244,10 +246,10 @@ void main() { npc0.triggerx = npc0.tx; npc0.triggery = npc0.ty+1; } - + //up movement if(npc0.d == 1) - { + { if(npc0.ty > 1 && !(npc0.tx == TRIGGX && npc0.ty-1 == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty-1)) { if(npc0.q<=(TILEWH/SPEED)) @@ -269,16 +271,16 @@ void main() { } npc0.triggerx = npc0.tx; npc0.triggery = npc0.ty-1; - } - - if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; } -*/ - - //player movement - //TODO: make movement into a function! + } + + if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; } +*/ + + //player movement + //TODO: make movement into a function! //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 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { @@ -315,11 +317,11 @@ void main() { } player.triggerx = player.tx+1; player.triggery = player.ty; - } + } //left movement 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)) { @@ -356,11 +358,11 @@ void main() { } player.triggerx = player.tx-1; player.triggery = player.ty; - } + } //down movement 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)) { @@ -398,10 +400,10 @@ void main() { player.triggerx = player.tx; player.triggery = player.ty+1; } - + //up movement 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)) { @@ -440,8 +442,8 @@ void main() { player.triggery = player.ty-1; } //modexClearRegion(mask->page, 66, 66, 2, 40, 0); - - if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(KEY_ENTER))||(player.tx == 5 && player.ty == 5)) + + if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) { short i; for(i=800; i>=400; i--) @@ -449,9 +451,9 @@ void main() { sound(i); } nosound(); - } - if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; } - if(keyp(0x0E)) while(1){ if(malloc(24)) break; } + } + 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; } } /* fade back to text mode */ @@ -462,19 +464,24 @@ void main() { printf("Project 16 scroll.exe\n"); printf("tx: %d\n", bg->tx); printf("ty: %d\n", bg->ty); - printf("player.x: %d", player.x); + 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.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("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("\n"); + //xmsfree(&map); + //xmsfree(bg); + //xmsfree(spri); + //xmsfree(mask); + //xmsreport(); switch(detectcpu()) { case 0: cpus = "8086/8088 or 186/88"; break; @@ -494,7 +501,9 @@ allocMap(int w, int h) { result.width =w; result.height=h; + if(!isEMS()) result.data = malloc(sizeof(byte) * w * h); + else result.data = (byte *)alloc_emem(sizeof(byte) * w * h); return result; } @@ -506,13 +515,19 @@ initMap(map_t *map) { int x, y; int i; int tile = 1; + if(!isEMS()) map->tiles = malloc(sizeof(tiles_t)); + else map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t)); /* create the tile set */ + if(!isEMS()) 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; + if(!isEMS()) 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; @@ -702,11 +717,11 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) { } i += mv->map->width; } -} - -/*void npcmove(map_view_t bg, map_view_t fg, ) -{ - +} + +/*void npcmove(map_view_t bg, map_view_t fg, ) +{ + }*/ void