]> 4ch.mooo.com Git - 16.git/blobdiff - 16/modex16/scroll.c
worked abit on the type_to_bianary functions
[16.git] / 16 / modex16 / scroll.c
old mode 100644 (file)
new mode 100755 (executable)
index 03d4b2c..8a960ee
@@ -11,7 +11,7 @@ typedef struct {
        word tileWidth;\r
        unsigned int rows;\r
        unsigned int cols;\r
-       //unsigned int tilex,tiley; // tile position on the map\r
+       unsigned int tilex,tiley; // tile position on the map\r
 } tiles_t;\r
 \r
 \r
@@ -26,18 +26,15 @@ typedef struct {
 typedef struct {\r
        map_t *map;\r
        page_t *page;\r
-       int tx; //appears to be the top left tile position on the viewable screen map\r
-       int ty; //appears to be the top left tile position on the viewable screen map
+       int tx; //???? appears to be the tile position on the viewable screen map\r
+       int ty; //???? appears to be the tile position on the viewable screen map\r
        word dxThresh; //????\r
        word dyThresh; //????\r
 } map_view_t;\r
 \r
-struct {
-       int x; //player exact position on the viewable map\r
-       int y; //player exact position on the viewable map\r
-       int tx; //player tile position on the viewable map\r
-       int ty; //player tile position on the viewable map
-       int hp; //hitpoints of the player\r
+struct {\r
+       int tx; //player position on the viewable map\r
+       int ty; //player position on the viewable map\r
 } player;\r
 \r
 \r
@@ -50,202 +47,101 @@ 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);
-void animatePlayer(map_view_t *mv, short d1, short d2, int x, int y, int ls, bitmap_t *bmp);\r
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);\r
 \r
 #define TILEWH 16\r
-#define QUADWH (TILEWH/4)
-#define SPEED 2
-
-//place holder definitions
-#define MAPX 40
-#define MAPY 30\r
-#define SWAP(a, b) tmp=a; a=b; b=tmp;\r
+#define QUADWH (TILEWH/4)\r
+//#define SWAP(a, b) tmp=a; a=b; b=tmp;\r
 void main() {\r
-       bitmap_t ptmp; // player sprite\r
+//     int show1=1;\r
+       int tx, ty;\r
+       int x, y;\r
+       //int ch=0x0;\r
+//     byte ch;\r
        int q=0;\r
-       page_t screenscreen2;\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
+       //default player position on the viewable map\r
+       player.tx = 10;\r
+       player.ty = 8;\r
+\r
        setkb(1);\r
        /* create the map */\r
-       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\r
+       map = allocMap(160,120); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
        initMap(&map);\r
-       mv.map = ↦
-       mv2.map = ↦\r
+       mv.map = ↦\r
+//     mv2.map = ↦\r
 \r
        /* draw the tiles */\r
-       ptr = map.data;
-       ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
-       modexEnter();
-       modexPalUpdate(ptmp.palette);\r
+       ptr = map.data;\r
+       modexEnter();\r
        screen = modexDefaultPage();\r
        screen.width += (TILEWH*2);\r
        mv.page = &screen;\r
-       screen2=modexNextPage(mv.page);\r
-       mv2.page = &screen2;\r
-       modexShowPage(mv.page);\r
+       mapGoTo(&mv, 16, 16);\r
+//     screen2=modexNextPage(mv.page);\r
+//     mv2.page = &screen2;\r
+//     mapGoTo(&mv2, 16, 16);\r
+//     modexShowPage(mv.page);\r
 \r
        /* set up paging */\r
-       show = &mv;\r
-       draw = &mv2;\r
-//     draw = &mv;
-
-//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-       mapGoTo(draw, 0, 0);
-       mapGoTo(show, 0, 0);\r
-
-       //TODO: put player in starting position of spot\r
-       //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;
-       modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-       
-       modexShowPage(draw->page);\r
-       while(!keyp(1))
-       {\r
-       //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
+//     show = &mv;\r
+//     draw = &mv2;\r
+       draw = &mv;\r
+\r
+       //TODO: set player position data here according to the viewable map screen thingy\r
+\r
+       while(!keyp(1)) {\r
+       //TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
        //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
-       //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
-       
-       //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, &bmp);
-                               animatePlayer(draw, 1, 1, player.x, player.y, q, &ptmp);
-                               mapScrollRight(draw, SPEED);
-                               modexShowPage(draw->page);\r
-//                             mapScrollRight(show, SPEED);\r
-//                             SWAP(draw, show);\r
-                       }
-                       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);
-                               animatePlayer(draw, 1, 0, player.x, player.y, q, &ptmp);
-                               modexShowPage(draw->page);
-                               SWAP(draw, show);
-                       }
-                       player.tx++;
-               }\r
+       //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\r
+       if(keyp(77)){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               mapScrollRight(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollRight(draw, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
        }\r
 \r
-       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)
-               {
-                       for(q=0; q<(TILEWH/SPEED); q++)
-                       {
-//                             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, SPEED);\r
-//                             SWAP(draw, show);\r
-                       }
-                       player.tx--;\r
-               }
-               else if(player.tx > 1)
-               {
-                       for(q=0; q<(TILEWH/SPEED); q++)
-                       {
-                               player.x-=SPEED;
-//                             modexDrawBmp(draw->page, player.x, player.y, &bmp);
-                               animatePlayer(draw, 3, 0, player.x, player.y, q, &ptmp);
-                               modexShowPage(draw->page);
-                               SWAP(draw, show);
-                       }
-                       player.tx--;
-               }
+       if(keyp(75)){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               mapScrollLeft(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollLeft(show, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
        }\r
 \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);
-                               animatePlayer(draw, 2, 1, player.x, player.y, q, &ptmp);
-                               mapScrollDown(draw, SPEED);
-                               modexShowPage(draw->page);\r
-//                             mapScrollDown(show, SPEED);\r
-//                             SWAP(draw, show);\r
-                       }
-                       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);
-                               animatePlayer(draw, 2, 0, player.x, player.y, q, &ptmp);
-                               modexShowPage(draw->page);
-//                             SWAP(draw, show);
-                       }
-                       player.ty++;
-               }\r
+       if(keyp(80)){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               mapScrollDown(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollDown(show, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
        }\r
 \r
-       if(keyp(72))
-       {
-               if(draw->ty > 0 && draw->ty+15 <= MAPY && player.ty == draw->ty + 8)
-               {\r
-                       for(q=0; q<(TILEWH/SPEED); q++)
-                       {\r
-//                             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, SPEED);\r
-//                             SWAP(draw, show);\r
-                       }
-                       player.ty--;
-               }
-               else if(player.ty > 1)
-               {
-                       for(q=0; q<(TILEWH/SPEED); q++)
-                       {
-                               player.y-=SPEED;
-//                             modexDrawBmp(draw->page, player.x, player.y, &bmp);
-                               animatePlayer(draw, 0, 0, player.x, player.y, q, &ptmp);
-                               modexShowPage(draw->page);
-//                             SWAP(draw, show);
-                       }
-                       player.ty--;
-               }\r
+       if(keyp(72)){\r
+//             for(q=0; q<TILEWH; q++) {\r
+               mapScrollUp(draw, 1);\r
+//             modexShowPage(draw->page);\r
+//             mapScrollUp(show, 1);\r
+//             SWAP(draw, show);\r
+//             }\r
        }\r
-//     modexDrawBmp(draw->page, player.x, player.y, &bmp);\r
-       //modexShowPage(draw->page);\r
+\r
+       //keyp(ch);\r
+       modexShowPage(draw->page);\r
 \r
        }\r
-
+\r
        modexLeave();\r
-       setkb(0);
-       printf("Project 16 scroll.exe\n");
-       printf("tx: %d\n", draw->tx);
-       printf("ty: %d\n", draw->ty);
-       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);
+       setkb(0);\r
 }\r
 \r
 \r
@@ -465,43 +361,3 @@ 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;
-       }
-}