]> 4ch.mooo.com Git - 16.git/blobdiff - src/scroll.c
wwww
[16.git] / src / scroll.c
index 0b5fc6b1fc86d786f2a3d5d1420457fc19228e36..65929b5a9bca125bb8a076b16a0ecef6929f3839 100644 (file)
@@ -1,30 +1,34 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 #include "src/lib/dos_kb.h"\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
+#include "src/lib/wcpu/wcpu.h"\r
+#include "src/lib/planar.h"\r
 //====#include "src\lib\ems.c"\r
-
-//#define LOADDATA
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
-/*typedef struct {\r
-       bitmap_t *data;\r
-       word tileHeight;\r
-       word tileWidth;\r
-       unsigned int rows;\r
-       unsigned int cols;\r
-} tiles_t;\r
-\r
-\r
-typedef struct {\r
-       byte    *data;\r
-       tiles_t *tiles;\r
-       int width;\r
-       int height;\r
-} map_t;*/\r
-\r
+//optimize scroll*!!!!\r
 \r
 typedef struct {\r
        map_t *map;\r
@@ -48,21 +52,26 @@ typedef struct {
        word d; //direction\r
        bitmap_t data; //supposively the sprite sheet data\r
        int hp; //hitpoints of the player\r
-} actor_t;\r
+} actor_t;
+
+typedef struct
+{
+       map_view_t *mv;
+} map_view_db_t;\r
 \r
 map_t allocMap(int w, int h);\r
 void initMap(map_t *map);\r
-void mapScrollRight(map_view_t *mv, byte offset);\r
-void mapScrollLeft(map_view_t *mv, byte offest);\r
-void mapScrollUp(map_view_t *mv, byte offset);\r
-void mapScrollDown(map_view_t *mv, byte offset);\r
+void mapScrollRight(map_view_t *mv, byte offset, word id);\r
+void mapScrollLeft(map_view_t *mv, byte offest, word id);\r
+void mapScrollUp(map_view_t *mv, byte offset, word id);\r
+void mapScrollDown(map_view_t *mv, byte offset, word id);\r
 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 qclean();\r
 void pdump(map_view_t *pee);\r
-void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);\r
+void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);
 \r
 #define TILEWH 16\r
 #define QUADWH                 TILEWH/2\r
@@ -72,15 +81,15 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 //place holder definitions\r
 //#define MAPX 200\r
 //#define MAPY 150\r
-#define TRIGGX 10\r
-#define TRIGGY 9\r
+//#define TRIGGX 10\r
+//#define TRIGGY 9\r
 \r
 void main() {\r
-       size_t oldfreemem=GetFreeSize();\r
+//++++ size_t oldfreemem=GetFreeSize();\r
        /*long emmhandle;\r
        long emsavail;\r
-       char teststr[80];*/
-       word panswitch=0, panq=1, pand=0; //for panning!\r
+       char teststr[80];*/\r
+       word panswitch=0, panq=1, pand=0, panpagenum=0; //for panning!\r
        int i;\r
        static word paloffset=0;\r
        bitmap_t ptmp;//, npctmp; // player sprite\r
@@ -89,12 +98,14 @@ void main() {
        static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
        page_t screen, screen2, screen3;\r
        map_t map;\r
-       map_view_t mv, mv2, mv3;\r
-       map_view_t *bg, *spri, *mask;//, *tmp;\r
+       map_view_t mv[3];//mv, mv2, mv3;\r
+       map_view_t *bg, *spri, *mask;//, *tmp;
+       //map_view_db_t pgid[4];
        byte *dpal, *gpal;\r
-       byte huge *ptr;
+       byte *ptr;\r
        byte *mappalptr;\r
        actor_t player;\r
+//     bitmap_t font;\r
        //actor_t npc0;\r
 \r
 //     atexit(qclean());\r
@@ -125,34 +136,29 @@ void main() {
        }*/\r
 \r
        /* create the map */\r
-//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
-       fprintf(stderr, "testing~\n");
-//#ifdef LOADDATA
-       loadmap("data/test.map", &map);
-//#endif
-       fprintf(stderr, "yay map loaded~~\n");\r
+//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());\r
+//0000 fprintf(stderr, "testing~\n");\r
+       loadmap("data/test.map", &map);\r
+//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
-       mv.map = &map;\r
-       mv2.map = &map;\r
-       mv3.map = &map;\r
+       mv[0].map = &map;\r
+       mv[1].map = &map;\r
+       mv[2].map = &map;\r
 \r
        /* draw the tiles */\r
        ptr = map.data;\r
        mappalptr = map.tiles->data->palette;\r
        /* data */\r
-//0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
-#ifdef LOADDATA\r
-       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
-#endif\r
+//0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());\r
+       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite\r
+//     font = bitmapLoadPcx("data/font.pcx");\r
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
-       \r
+\r
        /* create the planar buffer */\r
-//0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
-#ifdef LOADDATA\r
-       p = planar_buf_from_bitmap(&ptmp);
-#endif\r
+//0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());\r
+       p = planar_buf_from_bitmap(&ptmp);\r
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());\r
 \r
        /*if(isEMS())\r
@@ -200,7 +206,7 @@ void main() {
        //printf("      %d\n", sizeof(ptmp.data));\r
        //printf("1:    %d\n", paloffset);\r
        map.tiles->data->offset=(paloffset/3);\r
-       modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
+       //XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
        printf("\n====\n");\r
        printf("0       paloffset=      %d\n", paloffset/3);\r
        printf("====\n\n");\r
@@ -212,17 +218,18 @@ void main() {
        /* setup camera and screen~ */\r
        screen = modexDefaultPage();\r
        screen.width += (TILEWH*2);\r
-       screen.height += (TILEWH*2)+QUADWH;\r
-       mv.page = &screen;\r
-       screen2 = modexNextPage(mv.page);\r
-       mv2.page = &screen2;\r
-       screen3 = screen2;\r
-       mv3.page = &screen3;\r
+       screen.height += (TILEWH*2);//+QUADWH;\r
+       mv[0].page = &screen;\r
+       screen2 = modexNextPage(mv[0].page);\r
+       mv[1].page = &screen2;\r
+       screen3 = modexNextPage0(mv[1].page, 320, 240); //(352*176)+1024 is the remaining amount of memory left wwww\r
+       //screen3 = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww\r
+       mv[2].page = &screen3;\r
 \r
        /* set up paging */\r
-       bg = &mv;\r
-       spri = &mv2;\r
-       mask = &mv3;\r
+       bg = &mv[0];\r
+       spri = &mv[1];\r
+       mask = &mv[2];
 \r
 //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
        mapGoTo(bg, 0, 0);\r
@@ -253,146 +260,33 @@ void main() {
        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);\r
 \r
        modexShowPage(spri->page);\r
-//     printf("Total used @ before loop:                       %zu\n", oldfreemem-GetFreeSize());\r
+//     printf("Total used @ before loop:                       %zu\n", oldfreemem-GetFreeSize());
+       modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);\r
        modexFadeOn(4, gpal);\r
        while(!keyp(1) && player.hp>0)\r
        {\r
        //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;
-
-       //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
-       if(npc0.d>4)\r
-               npc0.d=0;\r
-\r
-       //right movement\r
-       if(npc0.d == 2)\r
-       {\r
-               if(npc0.tx < map.width && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty))\r
-               {\r
-                       if(npc0.q<=(TILEWH/SPEED))\r
-                       {\r
-                               INC_PER_FRAME_NPC;\r
-                               npc0.x+=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 1, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);\r
-                               animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);\r
-                               modexShowPage(spri->page);\r
-                               npc0.q++;\r
-                       } else { npc0.q = 1; npc0.d = 0; npc0.tx++; }\r
-               }\r
-               else\r
-               {\r
-                       modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 32, 24, 32, &npctmp);\r
-                       modexShowPage(spri->page);\r
-                       npc0.d = 0;\r
-               }\r
-               npc0.triggerx = npc0.tx+1;\r
-               npc0.triggery = npc0.ty;\r
-       }\r
-\r
-       //left movement\r
-       if(npc0.d == 4)\r
-       {\r
-               if(npc0.tx > 1 && !(npc0.tx-1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx-1 == player.tx && npc0.ty == player.ty))\r
-               {\r
-                       if(npc0.q<=(TILEWH/SPEED))\r
-                       {\r
-                               INC_PER_FRAME_NPC;\r
-                               npc0.x-=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 3, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);\r
-                               animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);\r
-                               modexShowPage(spri->page);\r
-                               npc0.q++;\r
-                       } else { npc0.q = 1; npc0.d = 0; npc0.tx--; }\r
-               }\r
-               else\r
-               {\r
-                       modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 96, 24, 32, &npctmp);\r
-                       modexShowPage(spri->page);\r
-                       npc0.d = 0;\r
-               }\r
-               npc0.triggerx = npc0.tx-1;\r
-               npc0.triggery = npc0.ty;\r
-       }\r
-\r
-       //down movement\r
-       if(npc0.d == 3)\r
-       {\r
-               if(npc0.ty < map.height && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1))\r
-               {\r
-                       if(npc0.q<=(TILEWH/SPEED))\r
-                       {\r
-                               INC_PER_FRAME_NPC;\r
-                               npc0.y+=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 2, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);\r
-                               animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);\r
-                               modexShowPage(spri->page);\r
-                               npc0.q++;\r
-                       } else { npc0.q = 1; npc0.d = 0; npc0.ty++; }\r
-               }\r
-               else\r
-               {\r
-                       modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);\r
-                       modexShowPage(spri->page);\r
-                       npc0.d = 0;\r
-               }\r
-               npc0.triggerx = npc0.tx;\r
-               npc0.triggery = npc0.ty+1;\r
-       }\r
-\r
-       //up movement\r
-       if(npc0.d == 1)\r
-       {\r
-               if(npc0.ty > 1 && !(npc0.tx == TRIGGX &&  npc0.ty-1 == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty-1))\r
-               {\r
-                       if(npc0.q<=(TILEWH/SPEED))\r
-                       {\r
-                               INC_PER_FRAME_NPC;\r
-                               npc0.y-=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 0, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);\r
-                               modexShowPage(spri->page);\r
-                               animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);\r
-                               npc0.q++;\r
-                       } else { npc0.q = 1; npc0.d = 0; npc0.ty--; }\r
-               }\r
-               else\r
-               {\r
-                       modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 0, 24, 32, &npctmp);\r
-                       modexShowPage(spri->page);\r
-                       npc0.d = 0;\r
-               }\r
-               npc0.triggerx = npc0.tx;\r
-               npc0.triggery = npc0.ty-1;\r
-       }\r
-\r
-       if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; }\r
-*/\r
+       #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;\r
 \r
        //player movement\r
-       //TODO: make movement into a function!
+       //TODO: make movement into a function!\r
        if(!panswitch){\r
        //right movement\r
        if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)\r
        {\r
                if(player.d == 0){ player.d = 2; }\r
-               if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
+               if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&\r
                !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
                                //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
-                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
-                               mapScrollRight(bg, SPEED);\r
-                               mapScrollRight(spri, SPEED);\r
+                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+                               mapScrollRight(mv, SPEED, 0);\r
+                               mapScrollRight(mv, SPEED, 1);
                                //mapScrollRight(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
@@ -425,7 +319,7 @@ void main() {
        if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4)\r
        {\r
                if(player.d == 0){ player.d = 4; }\r
-               if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
+               if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&\r
                !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))       //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
@@ -433,8 +327,8 @@ void main() {
                                INC_PER_FRAME;\r
                                //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
                                animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
-                               mapScrollLeft(bg, SPEED);\r
-                               mapScrollLeft(spri, SPEED);\r
+                               mapScrollLeft(mv, SPEED, 0);\r
+                               mapScrollLeft(mv, SPEED, 1);\r
                                //mapScrollLeft(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
@@ -467,16 +361,16 @@ void main() {
        if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3)\r
        {\r
                if(player.d == 0){ player.d = 3; }\r
-               if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
+               if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&\r
                !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
                                //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
-                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
-                               mapScrollDown(bg, SPEED);\r
-                               mapScrollDown(spri, SPEED);\r
+                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+                               mapScrollDown(mv, SPEED, 0);\r
+                               mapScrollDown(mv, SPEED, 1);\r
                                //mapScrollDown(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
@@ -509,16 +403,16 @@ void main() {
        if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1)\r
        {\r
                if(player.d == 0){ player.d = 1; }\r
-               if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
+               if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&\r
                !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))       //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
                                //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
-                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
-                               mapScrollUp(bg, SPEED);\r
-                               mapScrollUp(spri, SPEED);\r
+                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+                               mapScrollUp(mv, SPEED, 0);\r
+                               mapScrollUp(mv, SPEED, 1);\r
                                //mapScrollUp(mask, SPEED);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
@@ -546,18 +440,32 @@ void main() {
                player.triggerx = player.tx;\r
                player.triggery = player.ty-1;\r
        }\r
-}else{
-//88 switch!
+}else{\r
+//88 switch!\r
        //right movement\r
        if((keyp(77) && !keyp(75) && pand == 0) || pand == 2)\r
        {\r
                if(pand == 0){ pand = 2; }\r
                        if(panq<=(TILEWH/SPEED))\r
-                       {
-                               bg->page->dx++;
-                               spri->page->dx++;
-                               modexShowPage(bg->page);
-                               modexShowPage(spri->page);
+                       {\r
+                               switch(panpagenum)\r
+                               {\r
+                                       case 0:\r
+                                               //bg\r
+                                               bg->page->dx++;\r
+                                               modexShowPage(bg->page);\r
+                                       break;\r
+                                       case 1:\r
+                                               //spri\r
+                                               spri->page->dx++;\r
+                                               modexShowPage(spri->page);\r
+                                       break;\r
+                                       case 2:\r
+                                               //fg\r
+                                               mask->page->dx++;\r
+                                               modexShowPage(mask->page);\r
+                                       break;\r
+                               }\r
                                panq++;\r
                        } else { panq = 1; pand = 0; }\r
        }\r
@@ -567,10 +475,24 @@ void main() {
                if(pand == 0){ pand = 4; }\r
                        if(panq<=(TILEWH/SPEED))\r
                        {\r
-                               bg->page->dx--;
-                               spri->page->dx--;
-                               modexShowPage(bg->page);
-                               modexShowPage(spri->page);
+                               switch(panpagenum)\r
+                               {\r
+                                       case 0:\r
+                                               //bg\r
+                                               bg->page->dx--;\r
+                                               modexShowPage(bg->page);\r
+                                       break;\r
+                                       case 1:\r
+                                               //spri\r
+                                               spri->page->dx--;\r
+                                               modexShowPage(spri->page);\r
+                                       break;\r
+                                       case 2:\r
+                                               //fg\r
+                                               mask->page->dx--;\r
+                                               modexShowPage(mask->page);\r
+                                       break;\r
+                               }\r
                                panq++;\r
                        } else { panq = 1; pand = 0; }\r
        }\r
@@ -580,10 +502,24 @@ void main() {
                if(pand == 0){ pand = 3; }\r
                        if(panq<=(TILEWH/SPEED))\r
                        {\r
-                               bg->page->dy--;
-                               spri->page->dy--;
-                               modexShowPage(bg->page);
-                               modexShowPage(spri->page);
+                               switch(panpagenum)\r
+                               {\r
+                                       case 0:\r
+                                               //bg\r
+                                               bg->page->dy--;\r
+                                               modexShowPage(bg->page);\r
+                                       break;\r
+                                       case 1:\r
+                                               //spri\r
+                                               spri->page->dy--;\r
+                                               modexShowPage(spri->page);\r
+                                       break;\r
+                                       case 2:\r
+                                               //fg\r
+                                               mask->page->dy--;\r
+                                               modexShowPage(mask->page);\r
+                                       break;\r
+                               }\r
                                panq++;\r
                        } else { panq = 1; pand = 0; }\r
        }\r
@@ -593,15 +529,32 @@ void main() {
                if(pand == 0){ pand = 1; }\r
                        if(panq<=(TILEWH/SPEED))\r
                        {\r
-                               bg->page->dy++;
-                               spri->page->dy++;
-                               modexShowPage(bg->page);
-                               modexShowPage(spri->page);\r
+                               switch(panpagenum)\r
+                               {\r
+                                       case 0:\r
+                                               //bg\r
+                                               bg->page->dy++;\r
+                                               modexShowPage(bg->page);\r
+                                       break;\r
+                                       case 1:\r
+                                               //spri\r
+                                               spri->page->dy++;\r
+                                               modexShowPage(spri->page);\r
+                                       break;\r
+                                       case 2:\r
+                                               //fg\r
+                                               mask->page->dy++;\r
+                                               modexShowPage(mask->page);\r
+                                       break;\r
+                               }\r
                                panq++;\r
                        } else { panq = 1; pand = 0; }\r
-       }
+       }\r
 }\r
-       //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+\r
+       //the scripting stuf....\r
+\r
+       //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
        if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
        {\r
                short i;\r
@@ -612,18 +565,24 @@ void main() {
                nosound();\r
        }\r
        if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }\r
+       //debugging binds!\r
        //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }\r
-       if(keyp(25)){ pdump(bg); pdump(spri); }\r
+       if(keyp(2)){ modexShowPage(bg->page); panpagenum=0; }\r
+       if(keyp(3)){ modexShowPage(spri->page); panpagenum=1; }\r
+       if(keyp(4)){ modexShowPage(mask->page); panpagenum=2; }\r
+       if(keyp(0x44)){ bputs(spri->page, player.x+(TILEWH*2), player.y+(TILEWH*2), "wwww"); }  //f10\r
+       if(keyp(25)){ pdump(bg); pdump(spri); } //p\r
        if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }\r
        if(keyp(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
        printf("2paloffset      =       %d\n", paloffset/3);\r
-        pdump(bg); pdump(spri); }
-\r
-       if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; }\r
-       if(keyp(87))\r
+        pdump(bg); pdump(spri); }\r
+       //pan switch\r
+       if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; }    //f12\r
+       //TSR\r
+       if(keyp(87))    //f11\r
        {\r
                modexLeave();\r
                setkb(0);\r
@@ -632,9 +591,9 @@ void main() {
                        mov ah,31h\r
                        int 21h\r
                }\r
-       }
-
-       if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync!
+       }\r
+\r
+       if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync!\r
 \r
        }\r
 \r
@@ -647,21 +606,21 @@ void main() {
        setkb(0);\r
        printf("Project 16 scroll.exe\n");\r
        printf("tx: %d\n", bg->tx);\r
-       printf("ty: %d\n", bg->ty);
+       printf("ty: %d\n", bg->ty);\r
        printf("player.x: %d", player.x); printf("              player.y: %d\n", player.y);\r
        //if(player.hp==0) printf("%d wwww\n", player.y+8);\r
        //else printf("\nplayer.y: %d\n", player.y);\r
        printf("player.tx: %d", player.tx); printf("            player.ty: %d\n", player.ty);\r
        printf("player.triggx: %d", player.triggerx); printf("  player.triggy: %d\n", player.triggery);\r
-       printf("player.hp: %d", player.hp);     printf("        player.q: %d", player.q);       printf("        player.d: %d\n", player.d);
+       printf("player.hp: %d", player.hp);     printf("        player.q: %d", player.q);       printf("        player.d: %d\n", player.d);\r
        printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]);\r
        printf("palette offset: %d\n", paloffset/3);\r
-       printf("Total used: %zu\n", oldfreemem-GetFreeSize());\r
-       printf("Total free: %zu\n", GetFreeSize());\r
+//++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize());\r
+//++++ printf("Total free: %zu\n", GetFreeSize());\r
        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);
+       printf("Screen2: %dx", screen2.width);  printf("%d\n", screen2.height);\r
        //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
@@ -669,6 +628,8 @@ void main() {
        //xmsfree(mask);\r
        //xmsreport();\r
        //emmclose(emmhandle);\r
+       printf("%Fp\n", bios_8x8_font());\r
+       //printf("%c\n", *bios_8x8_font());\r
        switch(detectcpu())\r
        {\r
                case 0: cpus = "8086/8088 or 186/88"; break;\r
@@ -766,98 +727,111 @@ initMap(map_t *map) {
                }\r
                //tile = tile ? 0 : 1;\r
        }*/\r
-}\r
-\r
+}
+
 \r
 void\r
-mapScrollRight(map_view_t *mv, byte offset) {\r
+mapScrollRight(map_view_t *mv, byte offset, word id)
+{\r
        word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
-       mv->page->dx += offset;\r
+       mv[id].page->dx += offset;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv->page->dx >= mv->dxThresh ) {\r
+       if(mv[id].page->dx >= mv[id].dxThresh ) {\r
        /* go forward one tile */\r
-       mv->tx++;\r
+       mv[id].tx++;\r
        /* Snap the origin forward */\r
-       mv->page->data += 4;\r
-       mv->page->dx = mv->map->tiles->tileWidth;\r
-       //}\r
+       mv[id].page->data += 4;\r
+       mv[id].page->dx = mv[id].map->tiles->tileWidth;\r
 \r
        /* draw the next column */\r
-       x= SCREEN_WIDTH + mv->map->tiles->tileWidth;\r
-               mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);\r
+       x= SCREEN_WIDTH + mv[id].map->tiles->tileWidth;\r
+               if(id==0)
+                       mapDrawCol(&mv[0], mv[0].tx + 20 , mv[0].ty-1, x);
+               else
+                       modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);
        }\r
 }\r
 \r
 \r
 void\r
-mapScrollLeft(map_view_t *mv, byte offset) {\r
+mapScrollLeft(map_view_t *mv, byte offset, word id)
+{\r
        word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
-       mv->page->dx -= offset;\r
+       mv[id].page->dx -= offset;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv->page->dx == 0) {\r
+       if(mv[id].page->dx == 0) {\r
        /* go backward one tile */\r
-       mv->tx--;\r
+       mv[id].tx--;\r
 \r
        /* Snap the origin backward */\r
-       mv->page->data -= 4;\r
-       mv->page->dx = mv->map->tiles->tileWidth;\r
-       //}\r
-       /* draw the next column */\r
-               mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);\r
+       mv[id].page->data -= 4;\r
+       mv[id].page->dx = mv[id].map->tiles->tileWidth;\r
+\r
+       /* draw the next column */
+       x= 0;\r
+               if(id==0)\r
+                       mapDrawCol(&mv[0], mv[0].tx-1, mv[0].ty-1, 0);
+               else
+                       modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);\r
        }\r
 }\r
 \r
 \r
 void\r
-mapScrollUp(map_view_t *mv, byte offset) {\r
+mapScrollUp(map_view_t *mv, byte offset, word id)
+{\r
        word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
-       mv->page->dy -= offset;\r
+       mv[id].page->dy -= offset;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv->page->dy == 0 ) {\r
+       if(mv[id].page->dy == 0 ) {\r
        /* go down one tile */\r
-       mv->ty--;\r
+       mv[id].ty--;\r
        /* Snap the origin downward */\r
-       mv->page->data -= mv->page->width*4;\r
-       mv->page->dy = mv->map->tiles->tileHeight;\r
-       //}\r
+       mv[id].page->data -= mv[id].page->width*4;\r
+       mv[id].page->dy = mv[id].map->tiles->tileHeight;\r
 \r
        /* draw the next row */\r
        y= 0;\r
-               mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);\r
+               if(id==0)\r
+                       mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty-1, 0);
+               else\r
+                       modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);
        }\r
 }\r
 \r
 \r
 void\r
-mapScrollDown(map_view_t *mv, byte offset) {\r
+mapScrollDown(map_view_t *mv, byte offset, word id)
+{\r
        word x, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
-       mv->page->dy += offset;\r
+       mv[id].page->dy += offset;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv->page->dy >= mv->dyThresh ) {\r
+       if(mv[id].page->dy >= mv[id].dyThresh ) {\r
        /* go down one tile */\r
-       mv->ty++;\r
+       mv[id].ty++;\r
        /* Snap the origin downward */\r
-       mv->page->data += mv->page->width*4;\r
-       mv->page->dy = mv->map->tiles->tileHeight;\r
-       //}\r
+       mv[id].page->data += mv[id].page->width*4;\r
+       mv[id].page->dy = mv[id].map->tiles->tileHeight;\r
 \r
        /* draw the next row */\r
-       y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;\r
-               mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);\r
+       y= SCREEN_HEIGHT + mv[id].map->tiles->tileHeight;\r
+               if(id==0)\r
+                       mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty+15, y);
+               else
+                       modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);\r
        }\r
-\r
 }\r
 \r
 \r
@@ -878,8 +852,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;
-       i=mv->ty * mv->map->width + mv->tx;
+       py=0;\r
+       i=mv->ty * mv->map->width + mv->tx;\r
        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
@@ -894,14 +868,14 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
        //if(i==0) i=2;\r
        if(i==0)\r
        {\r
-               //wwww
+               //wwww\r
                modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!\r
        }\r
        else\r
        {\r
        rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
-       ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
-       printf("i=%d\n", i);\r
+       ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);\r
+////0000       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
@@ -914,7 +888,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;
+       i=ty * mv->map->width + tx;\r
        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
@@ -1003,5 +977,6 @@ animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, s
        //modexClearRegion(top->page, 66, 66, 2, 40, 0);\r
        //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);\r
        //turn this off if XT\r
-       if(detectcpu() > 0) modexWaitBorder();\r
+       //XTif(detectcpu() > 0)
+       modexWaitBorder();\r
 }\r