added EMS support from arachne

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 0f6284b2987bca768a63727c08ee2cc147916d0c..4e13f5d7e64d1f759e2356af151e23f8843a5547 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>\r
 #include "src\lib\dos_kb.h"\r
 #include "src\lib\wtest\wtest.c"\r
-#include "src\lib\xms.c"\r
+#include "src\lib\ems.c"\r
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
@@ -477,11 +477,11 @@ void main() {
        printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
        printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
        printf("\n");
-       xmsfree(&map);
-       xmsfree(bg);
-       xmsfree(spri);
-       xmsfree(mask);
-       xmsreport();\r
+       //xmsfree(&map);
+       //xmsfree(bg);
+       //xmsfree(spri);
+       //xmsfree(mask);
+       //xmsreport();\r
        switch(detectcpu())\r
        {\r
                case 0: cpus = "8086/8088 or 186/88"; break;\r
@@ -501,9 +501,9 @@ allocMap(int w, int h) {
 \r
        result.width =w;\r
        result.height=h;\r
-       if(initxms()>0)\r
+       if(!isEMS())\r
        result.data = malloc(sizeof(byte) * w * h);\r
-       else result.data = (byte *)xmsmalloc(sizeof(byte) * w * h);\r
+       else result.data = (byte *)alloc_emem(sizeof(byte) * w * h);\r
 \r
        return result;\r
 }\r
@@ -515,19 +515,19 @@ initMap(map_t *map) {
        int x, y;\r
        int i;\r
        int tile = 1;\r
-       if(initxms()>0)\r
+       if(!isEMS())\r
        map->tiles = malloc(sizeof(tiles_t));\r
-       else map->tiles = (tiles_t *)xmsmalloc(sizeof(tiles_t));\r
+       else map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
 \r
        /* create the tile set */\r
-       if(initxms()>0)\r
+       if(!isEMS())\r
        map->tiles->data = malloc(sizeof(bitmap_t));\r
-       else map->tiles->data = (bitmap_t *)xmsmalloc(sizeof(bitmap_t));\r
+       else map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
        map->tiles->data->width = (TILEWH*2);\r
        map->tiles->data->height= TILEWH;\r
-       if(initxms()>0)\r
+       if(!isEMS())\r
        map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
-       else map->tiles->data->data = (byte *)xmsmalloc((TILEWH*2)*TILEWH);\r
+       else map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
        map->tiles->tileHeight = TILEWH;\r
        map->tiles->tileWidth =TILEWH;\r
        map->tiles->rows = 1;\r