EMS system needs to be worked on

	modified:   scroll.exe
	modified:   src/scroll.c

diff --git a/scroll.exe b/scroll.exe
index 1bb70ab2bc7804dfdc70ec7ee5f31fb602632f81..ef36b5ca68134e6df468088bac40f888f48eef0d 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index 4e13f5d7e64d1f759e2356af151e23f8843a5547..94ad618369966ce322d41e17a4d3ae6f96c7f311 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -96,6 +96,8 @@ void main() {
        /* data */\r
        ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
+
+       if(isEMS()) printf("%d\n", coretotalEMS());
 \r
        /* save the palette */\r
        pal  = modexNewPal();\r
@@ -501,9 +503,10 @@ allocMap(int w, int h) {
 \r
        result.width =w;\r
        result.height=h;\r
-       if(!isEMS())\r
-       result.data = malloc(sizeof(byte) * w * h);\r
-       else result.data = (byte *)alloc_emem(sizeof(byte) * w * h);\r
+       //if(!isEMS() || !checkEMS())\r
+               result.data = malloc(sizeof(byte) * w * h);\r
+       //else
+       //      result.data = (byte *)alloc_emem(sizeof(byte) * w * h);
 \r
        return result;\r
 }\r
@@ -515,19 +518,22 @@ initMap(map_t *map) {
        int x, y;\r
        int i;\r
        int tile = 1;\r
-       if(!isEMS())\r
-       map->tiles = malloc(sizeof(tiles_t));\r
-       else map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
+       //if(!isEMS() || !checkEMS())\r
+               map->tiles = malloc(sizeof(tiles_t));\r
+       //else
+       //      map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
 \r
        /* create the tile set */\r
-       if(!isEMS())\r
-       map->tiles->data = malloc(sizeof(bitmap_t));\r
-       else map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
+       //if(!isEMS() || !checkEMS())\r
+               map->tiles->data = malloc(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(!isEMS())\r
-       map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
-       else map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
+       //if(!isEMS() || !checkEMS())\r
+               map->tiles->data->data = malloc((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