broke.... again....

	modified:   makefile
	modified:   maptest.exe
	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 f3f44d92ca98a05585dcf53c855141287fbf7a15..b0e0ff527e8d5b166336284e3bdda7d1248dad4c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 #-zkl = current codepage
 
 OFLAGS=-ot -ox -ob -oh# -or -om -ol -ol+
-FLAGS=-0 -d2 -wo $(OFLAGS) -zkl# -mh# -zdp# -zm# -zp16 -zq
+FLAGS=-0 -d2 -wo $(OFLAGS) -zkl -mh# -zdp# -zm# -zp16 -zq
 DIRSEP=\
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)

diff --git a/maptest.exe b/maptest.exe
index 820f3f4c7a49d892b8ad9bac25105068a564effd..d497b69be90b9856502df674d60d47c83c212eab 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 4a55771059103762cb193ebda3095d395a00457c..e49a00e6f13c29c54d2e40aa1b0faff1f9a718ff 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index f4e5cd81ce3b338cf1b3cd95bca3f586fc0113ed..99dea667a4897a997d0aa5eb85393b6eb21f5acb 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 82a8525d104a13a777477a153518e2e45bfd70b7..8d73860762a01ac6cb9ff2a41dbea8ab37de9edb 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -91,12 +91,12 @@ bitmapLoadPcx(char *filename) {
        /* allocate the buffer */
        //printf("%zu\n", _memmax());\r
        bufSize = (/*(dword)*/result.width * result.height);
-       result.data = malloc(bufSize);
+       result.data = (byte __near *)malloc(bufSize);
 //     result.data = (byte far *)_fmalloc(bufSize);
 //     result.data = (byte __huge *)halloc(bufSize, sizeof(byte));
        printf("&bufSize=%p\n", &bufSize);
        printf("&result.data=%p\n", result.data);
-       printf("Size of block is %zu bytes\n", _fmsize(result.data));
+       printf("Size of block is %zu bytes\n", _msize(result.data));
        printf("Size of bufSize is %zu bytes\n", bufSize);
        printf("Size of result.width is %zu \n", result.width);
        printf("Size of result.height is %zu \n", result.height);

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 31b944380a9002c4b097af62c1ff6eb73338910d..63a0031111f343afa1929e8cc3207bf4c4239a0e 100644 (file)
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -7,7 +7,7 @@
 #include "src/lib/lib_head.h"
 \r
 typedef struct {\r
-       byte far *data;
+       byte near *data;
        word width;\r
        word height;\r
        byte *palette;

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 c15159df89aed7ea162f33fe64508d18a34615bb..ef7876848b5b853d55fa388196321da3e11bde96 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 964f5fe8d9e43a911728ea4e7bc4f6fc38185998..6febdf23fa349f6b9e81e158f21c43820ab2539b 100644 (file)
Binary files a/test2.exe and b/test2.exe differ