far huge guts! wwww

	modified:   data/g.pal
	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:   src/pcxtest.c
	modified:   test.exe
	modified:   test2.exe

diff --git a/data/g.pal b/data/g.pal
index e10362037e827acf43e675ea3719928b1a6538e0..cf668e3509805fa4ec96876045fe2f979a02ab37 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/makefile b/makefile
index d471bb7127163117d5e692875e1f256cb6000e01..f3f44d92ca98a05585dcf53c855141287fbf7a15 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,5 +1,9 @@
-OFLAGS=-ot -ox -ob -ol -oh -or
-FLAGS=-0 -d2 -wo $(OFLAGS) -mh
+#-zk0u = translate kanji to unicode... wwww
+#-zk0 = kanji support~
+#-zkl = current codepage
+
+OFLAGS=-ot -ox -ob -oh# -or -om -ol -ol+
+FLAGS=-0 -d2 -wo $(OFLAGS) -zkl# -mh# -zdp# -zm# -zp16 -zq
 DIRSEP=\
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)
@@ -11,14 +15,14 @@ scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj li
        wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib\r
 scroll.obj: $(SRC)scroll.c\r
        wcl $(FLAGS) -c $(SRC)scroll.c\r
-test.exe: test.obj modex16.obj bitmap.obj\r
-       wcl $(FLAGS) test.obj modex16.obj bitmap.obj\r
+test.exe: test.obj modex16.obj bitmap.obj lib_head.obj\r
+       wcl $(FLAGS) test.obj modex16.obj bitmap.obj lib_head.obj\r
 \r
-test2.exe: test2.obj modex16.obj bitmap.obj planar.obj\r
-       wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj\r
+test2.exe: test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
+       wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
 \r
-pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj\r
-       wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj\r
+pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj lib_head.obj\r
+       wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj lib_head.obj\r
 \r
 maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
        wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
@@ -49,7 +53,7 @@ bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
        wcl $(FLAGS) -c $(SRCLIB)planar.c\r
 \r
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c# lib_head.obj jsmn.obj\r
+mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c\r
        wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
 \r
 lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
@@ -58,6 +62,6 @@ lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
 jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
        wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
-clean:\r
-       del *.obj\r
-#      del *.exe\r
+clean: .symbolic\r
+       @del *.obj\r
+#      @del *.exe\r

diff --git a/maptest.exe b/maptest.exe
index 36e27fcae516a129854353467c4e58a76f94114a..f97c38a91a17ff89b660b887a983e8c5a3ce1f84 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index c06f93687223ae66694cafce3a650c1e6961bd74..fbde82aead6e312f4d84357b210e4df2ba551d60 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 352c5f92074ab3ba8ce59912b64c45dd0ff3b412..d42d65539bdd2da96db54cbe909803a533dd8d0b 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 ea35c1723286f6db3e715e159bde3bcddf38af22..cdec73bd85a11893ae1fd0cba43f6b6c5abeb086 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -88,14 +88,19 @@ bitmapLoadPcx(char *filename) {
     /* load the first part of the pcx file */\r
     loadPcxStage1(file, &result);
 \r
-    /* allocate the buffer */\r
-       bufSize = (result.width * result.height);
-       result.data = malloc((bufSize));
-       printf("Size of block is %u bytes\n", _msize(result.data));
-       printf("Size of bufSize is %lu bytes\n", bufSize);
-       printf("Size of result.width is %d \n", result.width);
-       printf("Size of result.height is %d \n", result.height);
-       printf("Dimensions of result is %lu\n", result.width*result.height);
+       /* allocate the buffer */
+       //printf("%zu\n", _memmax());\r
+       bufSize = (/*(dword)*/result.width * result.height);
+//     result.data = 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 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);
        //exit(0);
        if(!result.data) {
                fprintf(stderr, "Could not allocate memory for bitmap data.");\r
@@ -115,7 +120,7 @@ bitmapLoadPcx(char *filename) {
                val = count;\r
                count = 1;\r
        }\r
-\r
+
        /* write the pixel the specified number of times */\r
        for(; count && index < bufSize; count--,index++)  {\r
                result.data[index] = val;\r

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

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 08ab753dbb075cf82d5186614a2bcb7c3659bc60..fc1456dbf2ff7be6763dc892240ad09832d9e919 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 *data = bmp->data;//+bmp->offset;
+    byte far *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 *data = bmp->data;//+bmp->offset;
+    byte far *data = bmp->data;//+bmp->offset;
     word bmpOffset = (word) data + ry * bmp->width + rx;
     word width = rw;
     word height = rh;

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 26aea719d45d658b2be76ca20f128b2e525b3eeb..ea1d296c6f06221f0c76723cf00cccec74471caf 100644 (file)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -64,8 +64,8 @@ void main() {
        page=modexDefaultPage();\r
 \r
 //0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");
-       bmp = bitmapLoadPcx("data/chikyuu.pcx");
-//     bmp = bitmapLoadPcx("data/koishi^^.pcx");
+//     bmp = bitmapLoadPcx("data/chikyuu.pcx");
+       bmp = bitmapLoadPcx("data/koishi^^.pcx");
 //     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
 //0000 p = planar_buf_from_bitmap(&bmp);\r
        modexEnter();\r

diff --git a/test.exe b/test.exe
index ee37f8b60860d56fe60e9282e45d8ccb7175b188..f6db9fe43d1144fa2ced0c607ae96bfa41f057fb 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 9b4249c73bfb73fb4daaa8e9c313a8e03924b856..81fa588593e431d659534cbc05365ed301bcda8e 100644 (file)
Binary files a/test2.exe and b/test2.exe differ