BROKE build of 0.exe

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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 8d0f49c9cc1760fcefd25cbb48d78825c2f755e0..940baa8aab75b8ff30c3ca851d6b2584277a8011 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -267,71 +267,7 @@ void panPageManual(map_view_t *pip, player_t *player, word pn)
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
                                } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].ty--; }\r
-                       }\r
-                       break;\r
-       }\r
-       //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
-//panning vmem\r
-void panVmemManual(map_view_t *pip, player_t *player, word pn)\r
-{\r
-       switch(player[pn].d)\r
-       {\r
-               //right movement\r
-               case 3:\r
-                       if(pip[pip[0].pan->pn].tx >= 0 && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tw < pip[pip[0].pan->pn].page->tilesw)\r
-                       {\r
-                               if(player[pn].q<=player[pn].spt)\r
-                               {\r
-                                       pip[pip[0].pan->pn].page[0].dx+=4;\r
-                                       //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
-                                       modexShowPage(pip[pip[0].pan->pn].page);\r
-                                       player[pn].q++;\r
-                               } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].tx++; }\r
-                       }\r
-               break;\r
-\r
-               //left movement\r
-               case 1:\r
-                       if(pip[pip[0].pan->pn].tx > 0 && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tw <= pip[pip[0].pan->pn].page->tilesw)\r
-                       {\r
-                               if(player[pn].q<=player[pn].spt)\r
-                               {\r
-                                       pip[pip[0].pan->pn].page[0].dx-=4;\r
-                                       //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
-                                       modexShowPage(pip[pip[0].pan->pn].page);\r
-                                       player[pn].q++;\r
-                               } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].tx--; }\r
-                       }\r
-               break;\r
-\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)\r
-                       {\r
-                               if(player[pn].q<=player[pn].spt)\r
-                               {\r
-                                       pip[pip[0].pan->pn].page[0].dy+=4;\r
-                                       //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
-                                       modexShowPage(pip[pip[0].pan->pn].page);\r
-                                       player[pn].q++;\r
-                               } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].ty++; }\r
-                       }\r
-               break;\r
-\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)\r
-                       {\r
-                               if(player[pn].q<=player[pn].spt)\r
-                               {\r
-                                       pip[pip[0].pan->pn].page[0].dy-=4;\r
-                                       //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
-                                       modexShowPage(pip[pip[0].pan->pn].page);\r
-                                       player[pn].q++;\r
-                               } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].ty--; }\r
-                       }\r
+                       }//tx ty dx dy th tw\r
                        break;\r
        }\r
        //if (player[pn].d!=2) printf("player[%u].d=%u player[%u].q=%u\n", pn, player[pn].d, pn, player[pn].q);\r
@@ -356,15 +292,17 @@ void modexMVSetup(map_view_t *pip, map_t *map, pan_t *pan, global_game_variables
                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
+               //pip[i].tx     =       1;\r
+               //pip[i].ty     =       1;\r
        }\r
 }\r
 \r
-void modexMVInit(map_view_t *pip, int tx, int ty)\r
+void modexMVInit(map_view_t *mv, int tx, int ty)\r
 {\r
-       pip[0].tx = tx;\r
-       pip[0].ty = ty;\r
+       mv[0].tx = tx;\r
+       mv[0].ty = ty;\r
+       //mv[0].tx = mv[1].tx = tx;\r
+       //mv[0].ty = mv[1].ty = ty;\r
 }\r
 \r
 /*map_t\r
@@ -642,6 +580,16 @@ void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)
        }\r
 }\r
 \r
+//===========================================================================\r
+//TODO: put player in starting position of assigned spot on map\r
+//default player position on the viewable map\r
+void playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn)\r
+{\r
+       player[pn].tx = x + pip[0].tx + pip[0].page->tilemidposscreenx;\r
+       player[pn].ty = y + pip[0].ty + pip[0].page->tilemidposscreeny;\r
+}\r
+//===========================================================================\r
+\r
 sword chkmap(map_t *map, word q)\r
 {\r
 //     bitmap_t bp;\r