the near malloc is messy!! wwww

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

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index a0ffccb4b9f29e8acc25208507311f059bea6cc7..e5550b4c130f4a969a514d6df63c9f2393d35988 100644 (file)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -44,17 +44,17 @@ void VGAmodeX(sword vq)
        { // deinit the video
                // change to the video mode we were in before we switched to mode 13h
                modexLeave();
-               //in.h.ah = 0x00;
-               //in.h.al = old_mode;
-               //int86(0x10, &in, &out);
+               in.h.ah = 0x00;
+               in.h.al = old_mode;
+               int86(0x10, &in, &out);
 
        }
        else if(vq==1)
        { // init the video
                // get old video mode
-               //in.h.ah = 0xf;
-               //int86(0x10, &in, &out);
-               //old_mode = out.h.al;
+               in.h.ah = 0xf;
+               int86(0x10, &in, &out);
+               old_mode = out.h.al;
                // enter mode
                modexEnter();
        }
@@ -984,7 +984,7 @@ void modexputPixel(page_t *page, int x, int y, byte color)
           offset = (width * y + x) / 4, and write the given\r
           color to the plane we selected above.  Heed the active\r
           page start selection. */\r
-       VGA[(unsigned)((SCREEN_WIDTH/4) * y) + (x / 4) + pageOff] = color;\r
+       VGA[(unsigned)((page->width/4) * y) + (x / 4) + pageOff] = color;\r
 \r
 }\r
 \r
@@ -995,7 +995,7 @@ byte modexgetPixel(page_t *page, int x, int y)
        outpw(GC_INDEX, 0x04);\r
        outpw(GC_INDEX+1, x & 3);\r
 \r
-       return VGA[(unsigned)((SCREEN_WIDTH/4) * y) + (x / 4) + pageOff];\r
+       return VGA[(unsigned)((page->width/4) * y) + (x / 4) + pageOff];\r
 \r
 }