modified: Project 16.bfproject

[16.git] / scroll.c

diff --git a/scroll.c b/scroll.c
index 24198a9f7021c21de7bf52c5506af7c61fb8ccab..da3369eb387fbeb8efbb14a6062a804ab62df941 100644 (file)
--- a/scroll.c
+++ b/scroll.c
@@ -55,7 +55,7 @@ void animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x,
 
 #define TILEWH 16
 #define QUADWH (TILEWH/4)
-#define SPEED 2
+#define SPEED 4
 
 //place holder definitions
 #define MAPX 40
@@ -63,7 +63,7 @@ void animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x,
 #define SWAP(a, b) tmp=a; a=b; b=tmp;
 void main() {
        bitmap_t ptmp; // player sprite
-       int q=0;
+       int q=1;
        page_t screen, screen2;
        map_t map;
        map_view_t mv, mv2;
@@ -72,23 +72,22 @@ void main() {
 
        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 bgn properly
+       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 = ↦
 
-       /* bg the tiles */
+       /* draw the tiles */
        ptr = map.data;
        ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
        modexEnter();
        modexPalUpdate(ptmp.palette);
        screen = modexDefaultPage();
        screen.width += (TILEWH*2);
+       screen.height += (TILEWH*2);
        mv.page = &screen;
        screen2 = modexNextPage(mv.page);
-       screen2.width += (TILEWH*2);
        mv2.page = &screen2;
-       //modexShowPage(mv.page);
 
        /* set up paging */
        bg = &mv;
@@ -105,7 +104,7 @@ void main() {
        player.x = player.tx*TILEWH;
        player.y = player.ty*TILEWH;
        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-       modexCopyPageRegion(bg->page, spri->page, player.x-4, player.y-TILEWH-2, player.x-4, player.y-TILEWH-2, 24, 36);
+       modexCopyPageRegion(bg->page, spri->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
        modexShowPage(bg->page);
        while(!keyp(1))
        {
@@ -115,11 +114,11 @@ void main() {
        
        //TODO: render the player properly with animation and sprite sheet
        //TODO: fexible speeds
-       if(keyp(77))
+       if(keyp(77) && !keyp(75))
        {
                if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                animatePlayer(bg, spri, 1, 1, player.x, player.y, q, &ptmp);
                                mapScrollRight(bg, SPEED);
@@ -130,7 +129,7 @@ void main() {
                }
                else if(player.tx < MAPX)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                player.x+=SPEED;
                                animatePlayer(bg, spri, 1, 0, player.x, player.y, q, &ptmp);
@@ -140,17 +139,17 @@ void main() {
                }
                else
                {
-                       modexCopyPageRegion(bg->page, spri->page, player.x-4, player.y-TILEWH-2, player.x-4, player.y-TILEWH-2, 24, 36);
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
                        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);
                        modexShowPage(spri->page);
                }
        }
 
-       if(keyp(75))
+       if(keyp(75) && !keyp(77))
        {
                if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                
                                animatePlayer(bg, spri, 3, 1, player.x, player.y, q, &ptmp);
@@ -162,7 +161,7 @@ void main() {
                }
                else if(player.tx > 1)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                player.x-=SPEED;
                                animatePlayer(bg, spri, 3, 0, player.x, player.y, q, &ptmp);
@@ -172,17 +171,17 @@ void main() {
                }
                else
                {
-                       modexCopyPageRegion(bg->page, spri->page, player.x-4, player.y-TILEWH-2, player.x-4, player.y-TILEWH-2, 24, 36);
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
                        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);
                        modexShowPage(spri->page);
                }
        }
 
-       if(keyp(80))
+       if(keyp(80) && !keyp(72))
        {
                if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                animatePlayer(bg, spri, 2, 1, player.x, player.y, q, &ptmp);
                                mapScrollDown(bg, SPEED);
@@ -193,7 +192,7 @@ void main() {
                }
                else if(player.ty < MAPY)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                player.y+=SPEED;
                                animatePlayer(bg, spri, 2, 0, player.x, player.y, q, &ptmp);
@@ -203,17 +202,17 @@ void main() {
                }
                else
                {
-                       modexCopyPageRegion(bg->page, spri->page, player.x-4, player.y-TILEWH-2, player.x-4, player.y-TILEWH-2, 24, 36);
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
                        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
                        modexShowPage(spri->page);
                }
        }
 
-       if(keyp(72))
+       if(keyp(72) && !keyp(80))
        {
                if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                animatePlayer(bg, spri, 0, 1, player.x, player.y, q, &ptmp);
                                mapScrollUp(bg, SPEED);
@@ -224,7 +223,7 @@ void main() {
                }
                else if(player.ty > 1)
                {
-                       for(q=0; q<(TILEWH/SPEED); q++)
+                       for(q=1; q<=(TILEWH/SPEED); q++)
                        {
                                player.y-=SPEED;
                                animatePlayer(bg, spri, 0, 0, player.x, player.y, q, &ptmp);
@@ -234,12 +233,12 @@ void main() {
                }
                else
                {
-                       modexCopyPageRegion(bg->page, spri->page, player.x-4, player.y-TILEWH-2, player.x-4, player.y-TILEWH-2, 24, 36);
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
                        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);
                        modexShowPage(spri->page);
                }
        }
-       
+
        }
 
        modexLeave();
@@ -309,7 +308,7 @@ initMap(map_t *map) {
 
 void
 mapScrollRight(map_view_t *mv, byte offset) {
-       word x, y;  /* coordinate for bging */
+       word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
        mv->page->dx += offset;
@@ -323,7 +322,7 @@ mapScrollRight(map_view_t *mv, byte offset) {
        mv->page->dx = mv->map->tiles->tileWidth;
 
 
-       /* bg the next column */
+       /* draw the next column */
        x= SCREEN_WIDTH + mv->map->tiles->tileWidth;
                mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);
        }
@@ -332,7 +331,7 @@ mapScrollRight(map_view_t *mv, byte offset) {
 
 void
 mapScrollLeft(map_view_t *mv, byte offset) {
-       word x, y;  /* coordinate for bging */
+       word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
        mv->page->dx -= offset;
@@ -346,7 +345,7 @@ mapScrollLeft(map_view_t *mv, byte offset) {
        mv->page->data -= 4;
        mv->page->dx = mv->map->tiles->tileWidth;
 
-       /* bg the next column */
+       /* draw the next column */
                mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);
        }
 }
@@ -354,7 +353,7 @@ mapScrollLeft(map_view_t *mv, byte offset) {
 
 void
 mapScrollUp(map_view_t *mv, byte offset) {
-       word x, y;  /* coordinate for bging */
+       word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
        mv->page->dy -= offset;
@@ -368,7 +367,7 @@ mapScrollUp(map_view_t *mv, byte offset) {
        mv->page->dy = mv->map->tiles->tileHeight;
 
 
-       /* bg the next row */
+       /* draw the next row */
        y= 0;
                mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);
        }
@@ -377,7 +376,7 @@ mapScrollUp(map_view_t *mv, byte offset) {
 
 void
 mapScrollDown(map_view_t *mv, byte offset) {
-       word x, y;  /* coordinate for bging */
+       word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
        mv->page->dy += offset;
@@ -391,7 +390,7 @@ mapScrollDown(map_view_t *mv, byte offset) {
        mv->page->dy = mv->map->tiles->tileHeight;
 
 
-       /* bg the next row */
+       /* draw the next row */
        y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;
                mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);
        }
@@ -414,7 +413,7 @@ mapGoTo(map_view_t *mv, int tx, int ty) {
        mv->dxThresh = mv->map->tiles->tileWidth * 2;
        mv->dyThresh = mv->map->tiles->tileHeight * 2;
 
-       /* bg the tiles */
+       /* draw the tiles */
        modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);
        py=0;
        i=mv->ty * mv->map->width + mv->tx;
@@ -480,7 +479,7 @@ animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int
        short loo = (ls + lo);
 
        if(d2==0) qq = 0;
-       else qq = ((ls+1)*SPEED);
+       else qq = ((ls)*SPEED);
        switch (d1)
        {
                case 0:
@@ -503,13 +502,12 @@ animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int
                        x=x-qq-4;
                        y=y-TILEWH;
                break;
-       }               //TODO: make flexible animation thingy
-                       if(ls<1) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else
-                       if(4>ls && ls>=1) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else
-                       if(7>ls && ls>=4) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else
-                       if(8>=ls && ls>=7) { modexCopyPageRegion(dest->page, src->page, x, y-2, x, y-2, 24, 36);// modexWaitBorder();
-                       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else ls-=ls;
+       }
+       //TODO: make flexible animation thingy
+       modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);
+       if(2>ls && ls>=1) { modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else
+       if(3>ls && ls>=2) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else
+       if(4>ls && ls>=3) { modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else
+       if(5>ls && ls>=4) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }
+       modexWaitBorder();
 }