From: sparky4 <sparky4@cock.li>
Date: Sun, 24 May 2015 21:45:26 +0000 (-0500)
Subject: fack!
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=8da96ee8a6833a51c46cf334a5d382a993cb90fd;p=16.git

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 b0e0ff52..6f049e20 100644
--- 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)
 SRCLIB=$(SRC)lib$(DIRSEP)
diff --git a/maptest.exe b/maptest.exe
index d497b69b..4b25c028 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index e49a00e6..6378e10c 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 99dea667..b7545fb1 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 8d738607..864878d8 100644
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -91,16 +91,16 @@ bitmapLoadPcx(char *filename) {
 	/* allocate the buffer */
 	//printf("%zu\n", _memmax());
 	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.");
diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 63a00311..f1b126e5 100644
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -7,7 +7,7 @@
 #include "src/lib/lib_head.h"
 
 typedef struct {
-	byte near *data;
+	byte *data;
 	word width;
 	word height;
 	byte *palette;
diff --git a/test.exe b/test.exe
index ef787684..4faa1ec2 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 6febdf23..05bb1367 100644
Binary files a/test2.exe and b/test2.exe differ