made a new function modexMVSetup() and made scroller use dx and dy on page[0].dx...

[16.git] / src / lib / scroll16.c

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 112610c98d324923af851f6d1e76d1f395367070..f0945ee27f304a3f2e95600ef2cfb6800cf6405d 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -306,7 +306,7 @@ void panVmemManual(map_view_t *pip, player_t *player, word pn)
 \r
                //down movement\r
                case 4:\r
-                       if(pip[pip[0].pan->pn].ty >= 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th < pip[pip[0].pan->pn].page->tilesh+pip[pip[1].pan->pn].page->tilesh)//+pip[pip[2].pan->pn].page->tilesh+pip[pip[3].pan->pn].page->tilesh)\r
+                       if(pip[pip[0].pan->pn].ty >= 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th < pip[pip[0].pan->pn].page->tilesh)\r
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
@@ -319,7 +319,7 @@ void panVmemManual(map_view_t *pip, player_t *player, word pn)
 \r
                //up movement\r
                case 0:\r
-                       if(pip[pip[0].pan->pn].ty > 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th <= pip[pip[0].pan->pn].page->tilesh+pip[pip[1].pan->pn].page->tilesh)//+pip[pip[2].pan->pn].page->tilesh+pip[pip[3].pan->pn].page->tilesh)\r
+                       if(pip[pip[0].pan->pn].ty > 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th <= pip[pip[0].pan->pn].page->tilesh)\r
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
@@ -333,6 +333,36 @@ void panVmemManual(map_view_t *pip, player_t *player, word pn)
        //if (player[pn].d!=2) printf("player[%u].d=%u player[%u].q=%u\n", pn, player[pn].d, pn, player[pn].q);\r
 }\r
 \r
+/*\r
+ * modex mv setup\r
+*/\r
+void modexMVSetup(map_view_t *pip, map_t *map, pan_t *pan, global_game_variables_t *gv)\r
+{\r
+       nibble i;\r
+       // 1st page\r
+       pip[0].page = &gv->video.page[0];\r
+       pip[0].map = map;\r
+       pip[0].video = &gv->video;\r
+       pip[0].pan      = pan;\r
+       modexMVInit(pip, 1, 1);\r
+\r
+       for(i=1;i<gv->video.num_of_pages;i++)\r
+       {\r
+               pip[i].page     =       &gv->video.page[i];\r
+               pip[i].map      =       pip[0].map;\r
+               pip[i].video    =       pip[0].video;\r
+               pip[i].pan      =       pip[0].pan;\r
+               pip[i].tx       =       1;\r
+               pip[i].ty       =       1;\r
+       }\r
+}\r
+\r
+void modexMVInit(map_view_t *pip, int tx, int ty)\r
+{\r
+       pip[0].tx = tx;\r
+       pip[0].ty = ty;\r
+}\r
+\r
 /*map_t\r
 allocMap(int w, int h) {\r
        map_t result;\r
@@ -640,14 +670,20 @@ sword chkmap(map_t *map, word q)
                //fix this to be far~\r
 //             bp = bitmapLoadPcx("data/ed.pcx");\r
 //             map->tiles->data = &bp;\r
-               map->tiles->debug_data = map->data;\r
+#ifdef __DEBUG_MAP__\r
+               dbg_mapdata = map->data;\r
+#endif\r
                map->tiles->tileHeight = 16;\r
                map->tiles->tileWidth = 16;\r
                map->tiles->rows = 1;\r
                map->tiles->cols = 1;\r
-               map->tiles->debug_text = true;\r
+#ifdef __DEBUG_MAP__\r
+               dbg_maptext = true;\r
+#endif\r
        }\r
-       else map->tiles->debug_text = false;\r
+#ifdef __DEBUG_MAP__\r
+       else dbg_maptext = false;\r
+#endif\r
        return 0;\r
 }\r
 \r
@@ -711,11 +747,13 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
                ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);\r
 ////0000printf("i=%d\n", i);\r
-               switch(t->debug_text)\r
+#ifdef __DEBUG_MAP__\r
+               switch(dbg_maptext)\r
                {\r
                        case 0:\r
+#endif\r
 #ifndef TILERENDER\r
-                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1));\r
+                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((dbg_mapdata[i])+1));\r
                                //modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i]));\r
 #else\r
                                PBUFBFUN                (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
@@ -723,9 +761,10 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                                //draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
                                //modexDrawBmpRegion    (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
 #endif\r
+#ifdef __DEBUG_MAP__\r
                        break;\r
                        case 1:\r
-                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i])+1);\r
+                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (dbg_mapdata[i])+1);\r
                                //modexprintbig(page, x, y, 1, 15, 0, (t->debug_data));\r
                                /*for(texty=0; texty<2; texty++)\r
                                {\r
@@ -736,6 +775,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                                }*/\r
                        break;\r
                }\r
+#endif\r
        }\r
 }\r
 \r