fack!

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

diff --git a/makefile b/makefile
index b0e0ff527e8d5b166336284e3bdda7d1248dad4c..6f049e2062476dad338c95e79a7a9ef7ac2ac28c 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 -zm# -mh# -zdp# -zm# -zp16 -zq
 DIRSEP=\
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)

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

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

diff --git a/scroll.exe b/scroll.exe
index 99dea667a4897a997d0aa5eb85393b6eb21f5acb..b7545fb147155273a2b631c3e2ba4ef423398a4d 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 8d73860762a01ac6cb9ff2a41dbea8ab37de9edb..864878d8b3776016d3d6d62ee9713534d16f85b7 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -91,16 +91,16 @@ bitmapLoadPcx(char *filename) {
        /* allocate the buffer */
        //printf("%zu\n", _memmax());\r
        bufSize = (/*(dword)*/result.width * result.height);
-       result.data = (byte __near *)malloc(bufSize);
+       result.data = malloc(bufSize);
 //     result.data = (byte far *)_fmalloc(bufSize);
 //     result.data = (byte __huge *)halloc(bufSize, sizeof(byte));
-       printf("&bufSize=%p\n", &bufSize);
+       /*printf("&bufSize=%p\n", &bufSize);
        printf("&result.data=%p\n", 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);
-       printf("Dimensions of result is %lu\n", (dword)result.width*result.height);
+       printf("Dimensions of result is %lu\n", (dword)result.width*result.height);*/
        //exit(0);
        if(!result.data) {
                fprintf(stderr, "Could not allocate memory for bitmap data.");\r

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 63a0031111f343afa1929e8cc3207bf4c4239a0e..f1b126e5f28b9be9f8b67cba978fe3cd270359d6 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 near *data;
+       byte *data;
        word width;\r
        word height;\r
        byte *palette;

diff --git a/test.exe b/test.exe
index ef7876848b5b853d55fa388196321da3e11bde96..4faa1ec2eb6b185ed0f0242b9bd4e27e891e5873 100644 (file)
Binary files a/test.exe and b/test.exe differ

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