hmm something is broke?

	modified:   makefile
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/bitmap.c
	modified:   src/lib/bitmap.h
	modified:   src/lib/modex16.c
	modified:   test.exe
	modified:   test2.exe

diff --git a/makefile b/makefile
index a5c9a375b4bf76fd56e64c85324a4a373eb92c0f..3037233f8732314acbd246a15db485cf54f6bf65 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-FLAGS=-0 -d2 -mh\r
+FLAGS=-0 -d2 \r
 SRC=src\\r
 SRCLIB=$(SRC)lib\\r
 all: test.exe pcxtest.exe test2.exe scroll.exe\r

diff --git a/pcxtest.exe b/pcxtest.exe
index 7855c2e4468899c6361d30750d4c027bd9731087..988abb27a635cd535d95140add2a049c76e0b124 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 66b51f7d22819a2919dbcdc8dbda04f6c47d6e56..43c383fea0ad4937d7ceda9c7d136a499fa15165 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index cc57552a8a3e54678c0cd3d38df048bacf8c27df..a5a439444fed36ba8b01b800f22416b84495e41d 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -89,7 +89,7 @@ bitmapLoadPcx(char *filename) {
 \r
     /* allocate the buffer */\r
     bufSize = result.width * result.height;
-    result.data = _fmalloc(bufSize);   //it breaks right here~
+    result.data = malloc(bufSize);     //it breaks right here~
     if(!result.data) {\r
        printf("Could not allocate memory for bitmap data.");\r
        fclose(file);\r
@@ -147,8 +147,8 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
     ts.palette = result.palette;\r
 \r
     /* allocate the pixel storage for the tiles */\r
-    ts.data = _fmalloc(sizeof(byte*) * ts.ntiles);\r
-    ts.data[0] = _fmalloc(sizeof(byte) * ts.ntiles * twidth * theight);\r
+    ts.data = malloc(sizeof(byte*) * ts.ntiles);\r
+    ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight);\r
     for(i=1; i < ts.ntiles; i++) {\r
        ts.data[i] = ts.data[i-1] + twidth * theight;\r
     }\r

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 21009dcc3f986f78f693881cdbd197714c2d6dec..17bb0d94ae189de14e921d60f83792bb2849ba22 100644 (file)
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -6,7 +6,7 @@
 #include <malloc.h>\r
 #include "src/lib/types.h"\r
 typedef struct {\r
-    byte far *data;
+    byte *data;
     word width;\r
     word height;\r
     byte *palette;
@@ -14,7 +14,7 @@ typedef struct {
 } bitmap_t;\r
 \r
 typedef struct {\r
-    byte far **data;\r
+    byte **data;\r
     word ntiles;   /* the number of tiles */\r
     word twidth;   /* width of the tiles */\r
     word theight;  /* height of the tiles */\r

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index fc1456dbf2ff7be6763dc892240ad09832d9e919..08ab753dbb075cf82d5186614a2bcb7c3659bc60 100644 (file)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -226,7 +226,7 @@ void
 modexDrawBmpRegion(page_t *page, int x, int y,
                    int rx, int ry, int rw, int rh, bitmap_t *bmp) {
     word poffset = (word) page->data  + y*(page->width/4) + x/4;
-    byte far *data = bmp->data;//+bmp->offset;
+    byte *data = bmp->data;//+bmp->offset;
     word bmpOffset = (word) data + ry * bmp->width + rx;
     word width = rw;
     word height = rh;
@@ -307,7 +307,7 @@ void
 modexDrawSpriteRegion(page_t *page, int x, int y,
                      int rx, int ry, int rw, int rh, bitmap_t *bmp) {
     word poffset = (word)page->data + y*(page->width/4) + x/4;
-    byte far *data = bmp->data;//+bmp->offset;
+    byte *data = bmp->data;//+bmp->offset;
     word bmpOffset = (word) data + ry * bmp->width + rx;
     word width = rw;
     word height = rh;

diff --git a/test.exe b/test.exe
index 6ca0d627dff9706994e1677f4ed9815c6d24547a..736b224abfb858bbd8602848b2ae3913d20a821b 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 7f079f4f3be0e028e2782ab6782b41cf3d7895ef..da9ec199b70bc63a261140f707d6490eff8ac7eb 100644 (file)
Binary files a/test2.exe and b/test2.exe differ