16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 7383b693c016d2d72de5441eaff123f3e2e9ed3a..a3d0e92c0a3ed25b245436207fbf26ca079352ce 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1387,7 +1387,7 @@ reset:
 \r
        end = -1; w = 0;\r
 \r
-       width = gvar->video.page[0].width;\r
+       width = gvar->video.page[0].sw;\r
 \r
        CA_OpenDebug (gvar);\r
        while (scan)\r
@@ -1544,7 +1544,7 @@ reset:
        }\r
 #endif\r
 #ifdef MMSMSCANINFO\r
-       maxq = q-1;\r
+       maxq = q;\r
        if(restarted) q = oldq;\r
        else q = 0;\r
        restarted = false;\r
@@ -1576,7 +1576,7 @@ reset:
                if(gvar->video.VL_Started)\r
                {\r
                        VL_ShowPage(&gvar->video.page[0], 1, 0);\r
-                       modexClearRegion(&gvar->video.page[0], 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 8);\r
+                       modexClearRegion(&gvar->video.page[0], gvar->video.page[0].dx, gvar->video.page[0].dy, gvar->video.page[0].sw, gvar->video.page[0].sh, 8);\r
                }else\r
 #endif\r
                        clrscr();\r
@@ -1665,17 +1665,17 @@ reset:
                                else q = 0;\r
                        break;\r
                        case sc_UpArrow:\r
-                               if(q>10) q-=10;\r
+                               if(q>9) q-=10;\r
                                else    q = maxq;\r
                        break;\r
                        case sc_DownArrow:\r
-                               if(q<maxq+10) q+=10;\r
+                               if(q<maxq-9) q+=10;\r
                                else q = 0;\r
                        break;\r
                        case sc_Space:\r
                                oldq = q;\r
                                restarted = true;\r
-                               modexClearRegion(&gvar->video.page[0], 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 8);\r
+                               modexClearRegion(&gvar->video.page[0], gvar->video.page[0].dx, gvar->video.page[0].dy, gvar->video.page[0].sw, gvar->video.page[0].sh, 8);\r
                                goto reset;\r
                        break;\r
                        case sc_Escape:\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index f7db2a7a016b04ef08c9a74ceb50e52d69f7fe37..3c7bc5597e261a20cd4a955f4c71e86792d5c449 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -42,8 +42,7 @@
 #define SPRITE\r
 //#define TILERENDER\r
 \r
-//0000\r
-#define SHOWFPS\r
+//0000#define SHOWFPS\r
 //#define OLDWALKSHOWPAGESTUFF\r
 \r
 \r