wwww

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 5a33b0f97bc10520d6e66f5e1be7edccc27190cc..f3a7c7769e76b5a2755d9de2115f34751668e58f 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -251,7 +251,7 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
        result.id = p->id+1;\r
        result.stridew=result.width/4;\r
        result.pagesize = (word)(result.width/4)*result.height;\r
-       if(result.id==2)                result.pi=p->width*p->pi;\r
+       if(result.id==2)                result.pi=p->width;//*p->pi;\r
        else if(result.id==3)   result.pi=p->pi;\r
 \r
        return result;\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index a43591f6300c69b5a54c6aacfc269db676946528..248a1a09e0f0a3b27d1ca0388f7add7207eaf518 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -44,10 +44,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                {
                                        INC_PER_FRAME;
                                        animatePlayer(pip, player, pn, 1);
-                                       mapScrollRight(pip, player, !(pip[0].video->p), pn);
-                                       mapScrollRight(pip, player, (pip[0].video->p), pn);
-                                       ScrollRight(pip, player, 2, pn);
                                        ScrollRight(pip, player, 3, pn);
+                                       ScrollRight(pip, player, 2, pn);
+                                       mapScrollRight(pip, player, (pip[0].video->p), pn);
+                                       mapScrollRight(pip, player, !(pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
                                        pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
@@ -88,10 +88,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                {
                                        INC_PER_FRAME;
                                        animatePlayer(pip, player, pn, 1);
-                                       mapScrollLeft(pip, player, !(pip[0].video->p), pn);
-                                       mapScrollLeft(pip, player, (pip[0].video->p), pn);
-                                       ScrollLeft(pip, player, 2, pn);
                                        ScrollLeft(pip, player, 3, pn);
+                                       ScrollLeft(pip, player, 2, pn);
+                                       mapScrollLeft(pip, player, (pip[0].video->p), pn);
+                                       mapScrollLeft(pip, player, !(pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
                                        pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
@@ -132,10 +132,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                {
                                        INC_PER_FRAME;
                                        animatePlayer(pip, player, pn, 1);
-                                       mapScrollDown(pip, player, !(pip[0].video->p), pn);
-                                       mapScrollDown(pip, player, (pip[0].video->p), pn);
-                                       ScrollDown(pip, player, 2, pn);
                                        ScrollDown(pip, player, 3, pn);
+                                       ScrollDown(pip, player, 2, pn);
+                                       mapScrollDown(pip, player, (pip[0].video->p), pn);
+                                       mapScrollDown(pip, player, !(pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
                                        pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
@@ -176,10 +176,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                {
                                        INC_PER_FRAME;
                                        animatePlayer(pip, player, pn, 1);
-                                       mapScrollUp(pip, player, !(pip[0].video->p), pn);
-                                       mapScrollUp(pip, player, (pip[0].video->p), pn);
-                                       ScrollUp(pip, player, 2, pn);
                                        ScrollUp(pip, player, 3, pn);
+                                       ScrollUp(pip, player, 2, pn);
+                                       mapScrollUp(pip, player, (pip[0].video->p), pn);
+                                       mapScrollUp(pip, player, !(pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
                                        pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;