wwww

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 6ffd01dc0a2e9bcd051a89a65a10e7fe91815ae8..5a33b0f97bc10520d6e66f5e1be7edccc27190cc 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -1162,9 +1162,9 @@ void modexprintmeminfo(video_t *v)
                printf("        [%u]=", i);\r
                printf("(%Fp)", (v->page[i].data));\r
                printf(" size=%u        ", v->page[i].pagesize);\r
+               printf("w=%lu  h=%lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);\r
                printf("sw=%lu  sh=%lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);\r
-               printf(" width=%lu  height=%lu", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);\r
-               printf(" pi=%u", v->page[i].pi);\r
+               printf("pi=%u", v->page[i].pi);\r
                printf("\n");\r
        }\r
 }\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index a875ff20d96acdef126b8c66f0b6b04774fb8cc6..a43591f6300c69b5a54c6aacfc269db676946528 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);
-                                       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);
+                                       ScrollRight(pip, player, 2, pn);
+                                       ScrollRight(pip, player, 3, 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);
-                                       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);
+                                       ScrollLeft(pip, player, 2, pn);
+                                       ScrollLeft(pip, player, 3, 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);
-                                       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);
+                                       ScrollDown(pip, player, 2, pn);
+                                       ScrollDown(pip, player, 3, 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);
-                                       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);
+                                       ScrollUp(pip, player, 2, pn);
+                                       ScrollUp(pip, player, 3, pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
                                        pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;

diff --git a/src/scroll.c b/src/scroll.c
index e21ea54dd933fb6981894f525700dae28865121c..3e7032e5e43504ec885423c3b60ff607430ffcd7 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -277,7 +277,7 @@ void main(int argc, char *argv[])
        if(IN_KeyDown(67))      //f9
        {
                modexClearRegion(mv[3].page, 0, 0/*128*/, 28, 36, 15);
-               IN_UserInput(1,1);
+               //IN_UserInput(1,1);
        }
        //TODO fmemtest into page
        /*if(IN_KeyDown(4+1))   //4