stuff is not aligning... ><

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 7e04266a478e5f0c607a71100c59bc199f1aca2c..8279a20e10a17cb8ce9eb5a26641563a20d126a8 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 #include "src/lib/dos_kb.h"\r
-#include "src/lib/mapread.c"\r
+#include "src/lib/mapread.h"\r
 //#include "16\lib\x\modex.h"\r
 #include "src/lib/wtest/wtest.c"\r
 #include "src/lib/planar.c"\r
@@ -75,9 +75,9 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 \r
 void main() {\r
        size_t oldfreemem=GetFreeSize();\r
-       long emmhandle;\r
+       /*long emmhandle;\r
        long emsavail;\r
-       char teststr[80];
+       char teststr[80];*/
        word panswitch=0, panq=1, pand=0; //for panning!\r
        int i;\r
        static word paloffset=0;\r
@@ -90,7 +90,8 @@ void main() {
        map_view_t mv, mv2, mv3;\r
        map_view_t *bg, *spri, *mask;//, *tmp;\r
        byte *dpal, *gpal;\r
-       byte *ptr, *mappalptr;\r
+       byte huge *ptr;
+       byte *mappalptr;\r
        actor_t player;\r
        //actor_t npc0;\r
 \r
@@ -100,7 +101,7 @@ void main() {
                printf("Expanded memory is not present\n");\r
                exit(0);\r
        }\r
-     \r
+\r
        if(!emmok())\r
        {\r
                printf("Expanded memory manager is not present\n");\r
@@ -122,8 +123,10 @@ void main() {
        }*/\r
 \r
        /* create the map */\r
-//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());\r
-       loadmap("data/test.map", &map);\r
+//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
+//0000 fprintf(stderr, "testing~\n");\r
+       loadmap("data/test.map", &map);
+//0000 fprintf(stderr, "yay map loaded~~\n");\r
 //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r
@@ -249,7 +252,9 @@ void main() {
        //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\r
-       #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;\r
+       #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+
+       //modexClearRegion(bg->page, player.x, player.y, 16, 16, 4); //currently the over scan color!\r
        /*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;\r
 \r
        if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8;\r
@@ -648,7 +653,8 @@ void main() {
        printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
        printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
        printf("Screen: %dx", screen.width);    printf("%d\n", screen.height);\r
-       printf("Screen2: %dx", screen2.width);  printf("%d\n", screen2.height);\r
+       printf("Screen2: %dx", screen2.width);  printf("%d\n", screen2.height);
+       //printf("map.width=%d  map.height=%d   map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);\r
        //xmsfree(&map);\r
        //xmsfree(bg);\r
        //xmsfree(spri);\r
@@ -864,8 +870,8 @@ mapGoTo(map_view_t *mv, int tx, int ty) {
 \r
        /* draw the tiles */\r
        modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);\r
-       py=0;\r
-       i=mv->ty * mv->map->width + mv->tx;\r
+       py=0;
+       i=mv->ty * mv->map->width + mv->tx;
        for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {\r
                mapDrawRow(mv, tx-1, ty, py);\r
        i+=mv->map->width - tx;\r
@@ -886,7 +892,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
        else\r
        {\r
        rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
-       ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);\r
+       ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
+       printf("i=%d\n", i);\r
        //mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);\r
        modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
        }\r
@@ -899,7 +906,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
        int i;\r
 \r
        /* the position within the map array */\r
-       i=ty * mv->map->width + tx;\r
+       i=ty * mv->map->width + tx;
        for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {\r
        if(i>=0) {\r
                /* we are in the map, so copy! */\r