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 a3d0e92c0a3ed25b245436207fbf26ca079352ce..18c02bbb7da332a4260ca928391fd4d0cad08888 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1361,7 +1361,7 @@ extern char global_temp_status_text2[512];
 void MM_ShowMemory (global_game_variables_t *gvar)\r
 {\r
        mmblocktype far *scan;\r
 void MM_ShowMemory (global_game_variables_t *gvar)\r
 {\r
        mmblocktype far *scan;\r

-       unsigned color,temp,x,y         ,w,width;\r
+       unsigned color,temp,x,y         ,w,width,sw;\r

        sdword  end,owner;\r
        byte            scratch[160],scratch0[4096],str[16];\r
 #ifdef MMSMSCANINFO\r
        sdword  end,owner;\r
        byte            scratch[160],scratch0[4096],str[16];\r
 #ifdef MMSMSCANINFO\r


@@ -1387,7 +1387,7 @@ reset:
 \r
        end = -1; w = 0;\r
 \r
 \r
        end = -1; w = 0;\r
 \r

-       width = gvar->video.page[0].sw;\r
+       width = gvar->video.page[0].width; sw = gvar->video.page[0].sw;\r

 \r
        CA_OpenDebug (gvar);\r
        while (scan)\r
 \r
        CA_OpenDebug (gvar);\r
        while (scan)\r


@@ -1419,8 +1419,8 @@ reset:
                        Quit (gvar, "MM_ShowMemory: Memory block order currupted!");\r
                }\r
                end = scan->length-1;\r
                        Quit (gvar, "MM_ShowMemory: Memory block order currupted!");\r
                }\r
                end = scan->length-1;\r

-               y = scan->start/width;\r
-               x = scan->start%width;\r
+               y = gvar->video.page[0].dx+(scan->start/sw);\r
+               x = gvar->video.page[0].dy+(scan->start%sw);\r

 #if 0\r
 //def MMSMSCANINFO\r
                if(restarted){\r
 #if 0\r
 //def MMSMSCANINFO\r
                if(restarted){\r


@@ -1591,8 +1591,8 @@ reset:
                }else   ypos+=8;\r
                if(gvar->video.VL_Started)\r
                {\r
                }else   ypos+=8;\r
                if(gvar->video.VL_Started)\r
                {\r

-                       y = scaninfo[q].scan->start/width;\r
-                       x = scaninfo[q].scan->start%width;\r
+                       y = scaninfo[q].scan->start/sw;\r
+                       x = scaninfo[q].scan->start%sw;\r

                        if(!mmsmscaninfoxyposinew)\r
                        {\r
                                y = ypos;\r
                        if(!mmsmscaninfoxyposinew)\r
                        {\r
                                y = ypos;\r