modified: 16/modex16/ptmp.pcx temperary player sprite

	new file:   16/modex16/ptmp.png
	modified:   16/modex16/scroll.c added animated sprites
	modified:   16/modex16/scroll.exe exe file

diff --git a/16/modex16/ptmp.pcx b/16/modex16/ptmp.pcx
index 879e70c290e421070df45c09d121804d437f05f8..57cfd19698e19e70b54414bc3613029bae8af08d 100644 (file)
Binary files a/16/modex16/ptmp.pcx and b/16/modex16/ptmp.pcx differ

diff --git a/16/modex16/ptmp.png b/16/modex16/ptmp.png
new file mode 100644 (file)
index 0000000..e3e46aa
Binary files /dev/null and b/16/modex16/ptmp.png differ

diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
index 33965008c0adab7df24ba956089b95b27b0c4f7c..24e91e7460a2d3b0be45299ca97378d79b9bb1a0 100644 (file)
--- a/16/modex16/scroll.c
+++ b/16/modex16/scroll.c
@@ -51,7 +51,8 @@ void mapScrollDown(map_view_t *mv, byte offset);
 void mapGoTo(map_view_t *mv, int tx, int ty);\r
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);\r
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x);\r
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
+void animatePlayer(map_view_t *mv, short d1, short d2, int x, int y, int ls, bitmap_t *bmp);\r
 \r
 #define TILEWH 16\r
 #define QUADWH (TILEWH/4)
@@ -62,12 +63,12 @@ void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
 #define MAPY 30\r
 //#define SWAP(a, b) tmp=a; a=b; b=tmp;\r
 void main() {\r
-       bitmap_t bmp;\r
+       bitmap_t ptmp; // player sprite\r
        int q=0;\r
-       page_t screen;//,screen2;\r
+       page_t screen, screen2;\r
        map_t map;\r
-       map_view_t mv;//, mv2;\r
-       map_view_t *draw;//, *show, *tmp;\r
+       map_view_t mv, mv2;\r
+       map_view_t *draw, *show, *tmp;\r
        byte *ptr;\r
 \r
        setkb(1);\r
@@ -79,9 +80,9 @@ void main() {
 \r
        /* draw the tiles */\r
        ptr = map.data;
-       bmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
-       modexPalUpdate(bmp.palette);\r
-       modexEnter();\r
+       ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
+       modexEnter();
+       modexPalUpdate(ptmp.palette);\r
        screen = modexDefaultPage();\r
        screen.width += (TILEWH*2);\r
        mv.page = &screen;\r
@@ -104,7 +105,8 @@ void main() {
        player.ty = draw->ty + 8;
        player.x = player.tx*TILEWH;
        player.y = player.ty*TILEWH;
-
+       modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
+       
        modexShowPage(draw->page);\r
        while(!keyp(1))
        {\r
@@ -115,11 +117,13 @@ void main() {
        //TODO: render the player properly with animation and sprite sheet
        if(keyp(77))
        {
+//             modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);
                if(draw->tx >= 0 && draw->tx+20 < MAPX && player.tx == draw->tx + 10)
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {\r
-                               modexDrawBmp(draw->page, player.x+((q+1)*SPEED), player.y, &bmp);
+//                             modexDrawBmp(draw->page, &bmp);
+                               animatePlayer(draw, 1, 1, player.x, player.y, q, &ptmp);
                                mapScrollRight(draw, SPEED);
                                modexShowPage(draw->page);\r
 //             mapScrollRight(draw, 1);\r
@@ -132,19 +136,23 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.x+=SPEED;
-                               modexDrawBmp(draw->page, player.x, player.y, &bmp);
+//                             modexDrawBmp(draw->page, player.x, player.y, &bmp);
+                               animatePlayer(draw, 1, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(draw->page);
                        }
                        player.tx++;
                }\r
        }\r
 \r
-       if(keyp(75)){
+       if(keyp(75))
+       {
+//             modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);
                if(draw->tx > 0 && draw->tx+20 <= MAPX && player.tx == draw->tx + 10)
-               {\r
+               {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
-                               modexDrawBmp(draw->page, player.x-((q+1)*SPEED), player.y, &bmp);
+//                             modexDrawBmp(draw->page, player.x-((q+1)*SPEED), player.y, &bmp);
+                               animatePlayer(draw, 3, 1, player.x, player.y, q, &ptmp);
                                mapScrollLeft(draw, SPEED);
                                modexShowPage(draw->page);\r
 //             mapScrollLeft(show, 1);\r
@@ -157,7 +165,8 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.x-=SPEED;
-                               modexDrawBmp(draw->page, player.x, player.y, &bmp);
+//                             modexDrawBmp(draw->page, player.x, player.y, &bmp);
+                               animatePlayer(draw, 3, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(draw->page);
                        }
                        player.tx--;
@@ -166,11 +175,13 @@ void main() {
 \r
        if(keyp(80))
        {
+               modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
                if(draw->ty >= 0 && draw->ty+15 < MAPY && player.ty == draw->ty + 8)
                {\r
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
-                               modexDrawBmp(draw->page, player.x, player.y+((q+1)*SPEED), &bmp);
+//                             modexDrawBmp(draw->page, player.x, player.y+((q+1)*SPEED), &bmp);
+                               animatePlayer(draw, 2, 1, player.x, player.y, q, &ptmp);
                                mapScrollDown(draw, SPEED);
                                modexShowPage(draw->page);\r
 //             mapScrollDown(show, 1);\r
@@ -183,7 +194,8 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.y+=SPEED;
-                               modexDrawBmp(draw->page, player.x, player.y, &bmp);
+//                             modexDrawBmp(draw->page, player.x, player.y, &bmp);
+                               animatePlayer(draw, 2, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(draw->page);
                        }
                        player.ty++;
@@ -196,7 +208,8 @@ void main() {
                {\r
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {\r
-                               modexDrawBmp(draw->page, player.x, player.y-((q+1)*SPEED), &bmp);
+//                             modexDrawBmp(draw->page, player.x, player.y-((q+1)*SPEED), &bmp);
+                               animatePlayer(draw, 0, 1, player.x, player.y, q, &ptmp);
                                mapScrollUp(draw, SPEED);
                                modexShowPage(draw->page);
 //             mapScrollUp(show, 1);\r
@@ -209,13 +222,14 @@ void main() {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
                                player.y-=SPEED;
-                               modexDrawBmp(draw->page, player.x, player.y, &bmp);
+//                             modexDrawBmp(draw->page, player.x, player.y, &bmp);
+                               animatePlayer(draw, 0, 0, player.x, player.y, q, &ptmp);
                                modexShowPage(draw->page);
                        }
                        player.ty--;
                }\r
        }\r
-       modexDrawBmp(draw->page, player.x, player.y, &bmp);\r
+//     modexDrawBmp(draw->page, player.x, player.y, &bmp);\r
        //modexShowPage(draw->page);\r
 \r
        }\r
@@ -448,3 +462,43 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
        i += mv->map->width;\r
        }\r
 }\r
+
+void animatePlayer(map_view_t *mv, short d1, short d2, int x, int y, int ls, bitmap_t *bmp)
+{
+       int qq;
+
+       if(d2==0) qq = 0;
+       else qq = ((ls+1)*SPEED);
+       switch (d1)
+       {
+               case 0:
+                       //up
+                       if(ls<2) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 24, 0, 24, 32, bmp);
+                       if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 0, 0, 24, 32, bmp);
+                       if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 48, 0, 24, 32, bmp);
+                       if(ls>6) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 24, 0, 24, 32, bmp);
+               break;
+               case 1:
+                       // right
+               //right
+                       if(ls<2) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 24, 32, 24, 32, bmp);
+                       if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 0, 32, 24, 32, bmp);
+                       if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 48, 32, 24, 32, bmp);
+                       if(ls>6) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 24, 32, 24, 32, bmp);
+               break;
+               case 2:
+                       //down
+                       if(ls<2) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 24, 64, 24, 32, bmp);
+                       if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 0, 64, 24, 32, bmp);
+                       if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 48, 64, 24, 32, bmp);
+                       if(ls>6) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 24, 64, 24, 32, bmp);
+               break;
+               case 3:
+                       //left
+                       if(ls<2) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 24, 96, 24, 32, bmp);
+                       if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 0, 96, 24, 32, bmp);
+                       if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 48, 96, 24, 32, bmp);
+                       if(ls>6) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 24, 96, 24, 32, bmp);
+               break;
+       }
+}

diff --git a/16/modex16/scroll.exe b/16/modex16/scroll.exe
index 9539ab01f1dc0a4a92009e7d24f38bff4019bdfc..b3114f26aa540c4ab3345cdc5c5f1fe86b12d911 100755 (executable)
Binary files a/16/modex16/scroll.exe and b/16/modex16/scroll.exe differ