X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=16%2Fmodex16%2Fscroll.c;h=55ca2cedc07bab235cc820f4f0500a1c2b104e1d;hb=d55b4f17a016ad04e99c3ba78d01a3403585deda;hp=49130bfc0449c2ea4b829875a9b99512b27531be;hpb=092df3c756423869db765af38bd0736a91f12ec1;p=16.git diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c index 49130bfc..55ca2ced 100644 --- a/16/modex16/scroll.c +++ b/16/modex16/scroll.c @@ -11,7 +11,7 @@ typedef struct { word tileWidth; unsigned int rows; unsigned int cols; - unsigned int tilex,tiley; // tile position on the map + //unsigned int tilex,tiley; // tile position on the map } tiles_t; @@ -34,9 +34,11 @@ typedef struct { word dyThresh; //???? } map_view_t; -struct { - int tx; //player position on the viewable map - int ty; //player position on the viewable map +struct { + int x; //player exact position on the viewable map + int y; //player exact position on the viewable map + int tx; //player tile position on the viewable map + int ty; //player tile position on the viewable map } player; @@ -53,18 +55,14 @@ void mapDrawCol(map_view_t *mv, int tx, int ty, word x); #define TILEWH 16 #define QUADWH (TILEWH/4) -#define SPEED 1 +#define SPEED 2 //place holder definitions #define MAPX 40 #define MAPY 30 //#define SWAP(a, b) tmp=a; a=b; b=tmp; void main() { -// int show1=1; - int tx, ty; - int x, y; - //int ch=0x0; -// byte ch; + bitmap_t bmp; int q=0; page_t screen;//,screen2; map_t map; @@ -72,23 +70,17 @@ void main() { map_view_t *draw;//, *show, *tmp; byte *ptr; - //default player position on the viewable map - player.tx = 10; - player.ty = 8; - setkb(1); /* 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 = ↦ - - //initiate bottem right edge trigger -// mv.ttx = mv.tx + 20; -// mv.tty = mv.ty + 15; // mv2.map = ↦ /* draw the tiles */ - ptr = map.data; + ptr = map.data; + bmp = bitmapLoadPcx("ptmp.pcx"); // load sprite + modexPalUpdate(bmp.palette); modexEnter(); screen = modexDefaultPage(); screen.width += (TILEWH*2); @@ -103,60 +95,125 @@ void main() { // draw = &mv2; draw = &mv; +//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen mapGoTo(draw, 0, 0); - - //TODO: set player position data here according to the viewable map screen thingy + + //TODO: put player in starting position of spot + //default player position on the viewable map + player.tx = draw->tx + 10; + player.ty = draw->ty + 8; + player.x = player.tx*TILEWH; + player.y = player.ty*TILEWH; modexShowPage(draw->page); - while(!keyp(1)) { - //TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square + while(!keyp(1)) + { + //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 - if(keyp(77)){ - if(draw->tx >= 0 && draw->tx+20 < MAPX) - for(q=0; qtx >= 0 && draw->tx+20 < MAPX && player.tx == draw->tx + 10) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + modexDrawBmp(draw->page, player.x+((q+1)*SPEED), player.y, &bmp); + mapScrollRight(draw, SPEED); modexShowPage(draw->page); // mapScrollRight(draw, 1); // SWAP(draw, show); } - + player.tx++; + } + else if(player.tx < MAPX) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + player.x+=SPEED; + modexDrawBmp(draw->page, player.x, player.y, &bmp); + modexShowPage(draw->page); + } + player.tx++; + } } if(keyp(75)){ - if(draw->tx > 0 && draw->tx+20 <= MAPX) - for(q=0; qtx > 0 && draw->tx+20 <= MAPX && player.tx == draw->tx + 10) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + modexDrawBmp(draw->page, player.x-((q+1)*SPEED), player.y, &bmp); + mapScrollLeft(draw, SPEED); modexShowPage(draw->page); // mapScrollLeft(show, 1); // SWAP(draw, show); - } - + } + player.tx--; + } + else if(player.tx > 0) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + player.x-=SPEED; + modexDrawBmp(draw->page, player.x, player.y, &bmp); + modexShowPage(draw->page); + } + player.tx--; + } } - if(keyp(80)){ - if(draw->ty >= 0 && draw->ty+15 < MAPY) - for(q=0; qty >= 0 && draw->ty+15 < MAPY && player.ty == draw->ty + 8) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + modexDrawBmp(draw->page, player.x, player.y+((q+1)*SPEED), &bmp); + mapScrollDown(draw, SPEED); modexShowPage(draw->page); // mapScrollDown(show, 1); // SWAP(draw, show); } - + player.ty++; + } + else if(player.ty < MAPY) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + player.y+=SPEED; + modexDrawBmp(draw->page, player.x, player.y, &bmp); + modexShowPage(draw->page); + } + player.ty++; + } } - if(keyp(72)){ - if(draw->ty > 0 && draw->ty+15 <= MAPY) - for(q=0; qpage); + if(keyp(72)) + { + if(draw->ty > 0 && draw->ty+15 <= MAPY && player.ty == draw->ty + 8) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + modexDrawBmp(draw->page, player.x, player.y-((q+1)*SPEED), &bmp); + mapScrollUp(draw, SPEED); + modexShowPage(draw->page); // mapScrollUp(show, 1); // SWAP(draw, show); } - + player.ty--; + } + else if(player.ty > 0)// && player.ty <= draw->ty + 8)// && player.ty >= draw->ty+8) + { + for(q=0; q<(TILEWH/SPEED); q++) + { + player.y-=SPEED; + modexDrawBmp(draw->page, player.x, player.y, &bmp); + modexShowPage(draw->page); + } + player.ty--; + } } - - //keyp(ch); + //modexDrawBmp(draw->page, player.x, player.y, &bmp); //modexShowPage(draw->page); } @@ -166,8 +223,10 @@ void main() { printf("Project 16 scroll.exe\n"); printf("tx: %d\n", draw->tx); printf("ty: %d\n", draw->ty); - //printf("ttx: %d\n", draw->ttx); - //printf("tty: %d\n", draw->tty); + printf("player.x: %d\n", player.x); + printf("player.y: %d\n", player.y); + printf("player.tx: %d\n", player.tx); + printf("player.ty: %d\n", player.ty); }