huge memory model fucks up everything! wwww

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

diff --git a/makefile b/makefile
index cba89784a48b0595e99a55070de2237f1e61f222..c108e7088f5346d99d996cfb58e9903ca9b9ca69 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 OFLAGS=-ot -ox -ob -ol -oh -or
-FLAGS=-0 -d2 -mh -wo $(OFLAGS)
+FLAGS=-0 -d2 -wo $(OFLAGS)# -mh
 DIRSEP=\
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)
@@ -20,8 +20,8 @@ test2.exe: test2.obj modex16.obj bitmap.obj planar.obj
 pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj\r
        wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj\r
 \r
-maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj\r
-       wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj\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
 \r
 \r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
@@ -49,15 +49,15 @@ 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# lib_head.obj jsmn.obj\r
        wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
 \r
 lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
 \r
 jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
-       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
-\r
+       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
+
 clean:\r
        del *.obj\r
 #      del *.exe\r

diff --git a/maptest.exe b/maptest.exe
index e08e7d4ed32f8159f90bf1214ccb6bb5b9741eda..8c75a739cf5450d3e141f369504eea0c718669c4 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 2b66334ae95bfb17c34246be84587712f13ec2ad..2c9959a3121dbc0182e5e7825a5f4023da82c079 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index f6d853d7088efc705896407a1130ebaac64fc456..74b3f6c531f7edd31b610fb1e8cf77bd33eab5e1 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 a5a439444fed36ba8b01b800f22416b84495e41d..3777c3d125b54ead3bb82498682b399db3715c2a 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,5 +1,6 @@
 #include <stdio.h>\r
-#include <stdlib.h>\r
+#include <stdlib.h>
+#include <malloc.h>
 #include "src/lib/bitmap.h"\r
 #include "src/lib/modex16.h"\r
 \r
@@ -39,9 +40,9 @@ static void loadPcxStage1(FILE *file, bitmap_t *result) {
 \r
     /* make sure this  is 8bpp */\r
     if(head.bpp != 8) {\r
-       printf("I only know how to handle 8bpp pcx files!\n");\r
-       fclose(file);\r
-       exit(-2);\r
+               printf("I only know how to handle 8bpp pcx files!\n");\r
+               fclose(file);\r
+               exit(-2);\r
     }\r
 }\r
 \r
@@ -73,28 +74,34 @@ bitmap_t
 bitmapLoadPcx(char *filename) {\r
     FILE *file;\r
     bitmap_t result;\r
-    long bufSize;\r
+    dword bufSize;\r
     int index;\r
     byte count, val;
 \r
     /* open the PCX file for reading */\r
     file = fopen(filename, "rb");\r
     if(!file) {\r
-       printf("Could not open %s for reading.\n", filename);\r
-       exit(-2);\r
+               printf("Could not open %s for reading.\n", filename);\r
+               exit(-2);\r
     }\r
 \r
     /* 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);     //it breaks right here~
-    if(!result.data) {\r
-       printf("Could not allocate memory for bitmap data.");\r
-       fclose(file);\r
-       exit(-1);\r
-    }\r
+       bufSize = ((dword)result.width * result.height);
+       result.data = malloc((bufSize));
+       /*0000printf("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 %lu \n", result.width);
+       printf("Size of result.height is %lu \n", result.height);
+       printf("Dimensions of result is %lu\n", result.width*result.height);*/
+       //exit(0);
+       if(!result.data) {
+               fprintf(stderr, "Could not allocate memory for bitmap data.");\r
+               fclose(file);\r
+               exit(-1);\r
+       }\r
 \r
     /*  read the buffer in */\r
     index = 0;\r
@@ -102,16 +109,16 @@ bitmapLoadPcx(char *filename) {
        /* get the run length and the value */\r
        count = fgetc(file);\r
        if(0xC0 ==  (count & 0xC0)) { /* this is the run count */\r
-           count &= 0x3f;\r
-           val = fgetc(file);\r
+               count &= 0x3f;\r
+               val = fgetc(file);\r
        } else {\r
-           val = count;\r
-           count = 1;\r
+               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
+               result.data[index] = val;\r
        }\r
     } while(index < bufSize);\r
 \r
@@ -122,7 +129,7 @@ bitmapLoadPcx(char *filename) {
     return result;\r
 }\r
 \r
-\r
+//update!!\r
 tileset_t\r
 bitmapLoadPcxTiles(char *filename, word twidth, word theight) {\r
     tileset_t ts;\r
@@ -132,10 +139,10 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
 \r
     /* open the PCX file for reading */\r
     file = fopen(filename, "rb");\r
-    if(!file) {\r
-       printf("Could not open %s for reading.\n", filename);\r
-       exit(-2);\r
-    }\r
+       if(!file) {\r
+               printf("Could not open %s for reading.\n", filename);\r
+               exit(-2);\r
+       }\r
 \r
     /* load the first part of the pcx file */\r
     loadPcxStage1(file, &result);\r
@@ -146,12 +153,12 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
     ts.ntiles = (result.width/twidth) * (result.height/theight);\r
     ts.palette = result.palette;\r
 \r
-    /* allocate the pixel storage for the tiles */\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
+       /* allocate the pixel storage for the tiles */\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
 \r
     /* finish off the file */\r
     loadPcxPalette(file, &result);\r

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 19ae2f04ebdae05f0d9e20a1cb5bf4d961ad53e9..f1b126e5f28b9be9f8b67cba978fe3cd270359d6 100644 (file)
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -3,22 +3,23 @@
  */\r
 #ifndef BITMAP_H\r
 #define BITMAP_H
-//#include <malloc.h>\r
-#include "src/lib/types.h"\r
+#include "src/lib/types.h"
+#include "src/lib/lib_head.h"
+\r
 typedef struct {\r
-    byte *data;
-    word width;\r
-    word height;\r
-    byte *palette;
-    word offset;
+       byte *data;
+       word width;\r
+       word height;\r
+       byte *palette;
+       word offset;
 } bitmap_t;\r
 \r
 typedef struct {\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
-    byte *palette; /* palette for the tile set */\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
+       byte *palette; /* palette for the tile set */\r
 } tileset_t;\r
 \r
 bitmap_t bitmapLoadPcx(char *filename);\r

diff --git a/src/lib/lib_head.c b/src/lib/lib_head.c
index e9004d5e508d27a7a120a122f0e44a9132dff239..0053446f965d4a2accf812e15c89a37b0c75e3f6 100644 (file)
--- a/src/lib/lib_head.c
+++ b/src/lib/lib_head.c
@@ -3,7 +3,8 @@
 /* local function */\r
 void wait(clock_t wait);
 void* AllocateLargestFreeBlock(size_t* Size);
-size_t GetFreeSize(void);\r
+size_t GetFreeSize(void);
+long int filesize(FILE *fp);\r
 \r
 /* Function: Wait **********************************************************\r
 *\r
@@ -93,3 +94,15 @@ size_t GetFreeSize(void)
 
   return total;
 }
+
+long int
+filesize(FILE *fp)\r
+{\r
+       long int save_pos, size_of_file;\r
+\r
+       save_pos = ftell(fp);\r
+       fseek(fp, 0L, SEEK_END);\r
+       size_of_file = ftell(fp);\r
+       fseek(fp, save_pos, SEEK_SET);\r
+       return(size_of_file);\r
+}

diff --git a/src/lib/lib_head.h b/src/lib/lib_head.h
index 34fcb3a0fbd2ef7271e8d0786a7b18ccabe6b147..5bc441af5d276d0366c66a9c7f297b9cf4e7ce0c 100644 (file)
--- a/src/lib/lib_head.h
+++ b/src/lib/lib_head.h
@@ -106,6 +106,7 @@
 void wait(clock_t wait);
 void* AllocateLargestFreeBlock(size_t* Size);
 size_t GetFreeSize(void);
+long int filesize(FILE *fp);
 
 /* THIS FUNCTION CONVERTS A POINTER TO AN INTEL LONG              */\r
 //int long ptr2long(char *p);

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 1ce7b01ef98de4552ce9a3243683be752d62ed5d..eaca2566bc242e049775479ee896062238e4b2aa 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -9,6 +9,7 @@
 #include "src/lib/modex16.h"
 #include "src/lib/lib_head.h"
 
+//---- temp!
 static char *js_sv;
 
 typedef struct {\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index fa9e54e05799e564cf4c00c98a453486804a8399..755a11c8a693055a9fc1fbba89735ec2c99e1d2f 100644 (file)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -3,7 +3,7 @@
  */
 #ifndef MODEX16_H
 #define MODEX16_H
-#include <conio.h>
+//#include <conio.h>
 #include "src/lib/types.h"
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"

diff --git a/src/maptest.c b/src/maptest.c
index dfcd300db194e4dff9f7002c8b49bcda10511044..48c022d1c9b0c83d6fe9987925206709a73fa219 100644 (file)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -4,6 +4,6 @@ void
 main(int argc, char *argv[])\r
 {\r
        map_t map;
-       //loadmap("data/test.map", &map);
+       loadmap("data/test.map", &map);
        fprintf(stderr, "%d\n", map.data[0]);
 }\r

diff --git a/src/pcxtest.c b/src/pcxtest.c
index be8dcc7ab7ed14d933d53ea9c3ca90228c667afd..3901c23849aca6a9f5fb659b75df7f15291faebb 100644 (file)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -5,7 +5,7 @@
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.c"\r
 \r
-word far* clock= (word far*) 0x046C; /* 18.2hz clock */\r
+word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 void\r
 oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite) {\r
@@ -55,7 +55,8 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 void main() {\r
        bitmap_t bmp;
        planar_buf_t *p;\r
-       int i;\r
+       //int i;
+       dword i;\r
        page_t page;\r
        word start;
        int plane;\r
@@ -65,6 +66,8 @@ void main() {
 \r
 //0000 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
 \r
@@ -75,47 +78,53 @@ void main() {
        modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);\r
 \r
        /* non sprite comparison */
-       /*0000start = *clock;\r
+       /*0000start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
                oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
        }\r
 \r
-       start = *clock;\r
+       start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
 //0000         modexDrawBmp(&page, 20, 20, &bmp);
                modexDrawBmp(&page, 0, 0, &bmp);\r
        }\r
-       t1 = (*clock-start) /18.2;\r
+       t1 = (*clockw-start) /18.2;\r
 \r
-       start = *clock;\r
+       start = *clockw;\r
        for(i=0; i<100; i++) {\r
 //0000         modexCopyPageRegion(&page, &page, 20, 20, 128, 20, 64, 64);
                modexCopyPageRegion(&page, &page, 0, 0, 0, 0, 320, 240);\r
        }\r
-       t2 = (*clock-start)/18.2;\r
+       t2 = (*clockw-start)/18.2;\r
 \r
 \r
-       start = *clock;\r
+       start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
                oldDrawBmp(VGA, 20, 20, &bmp, 1);\r
        }\r
 \r
 \r
-       start = *clock;\r
+       start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
 //0000         modexDrawSprite(&page, 20, 20, &bmp);
                modexDrawSprite(&page, 0, 0, &bmp);\r
        }*/
        //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));
+       modexDrawBmp(&page, 0, 0, &bmp);
        while(!kbhit())
        {
                //DrawPBuf(&page, 0, 0, p, 0);
-               modexDrawBmp(&page, 0, 0, &bmp);
        }
        modexLeave();\r
 
        printf("\n%d\n", sizeof(p->plane));
-       printf("%d\n", sizeof(bmp));\r
+       printf("%d\n", sizeof(bmp));
+
+       /*for(i=0; i<(320*240); i++)
+       {
+               fprintf(stdout, "%d", bmp.data[i]);
+               if(i%320==0) fprintf(stdout, "\n");
+       }*/\r
 //0000 printf("CPU to VGA: %f\n", t1);\r
 //0000 printf("VGA to VGA: %f\n", t2);\r
        return;\r

diff --git a/src/test.c b/src/test.c
index 24520a53b41addd3c26bf02ac35b884abc8e0e82..3e2b1e6f31b729d1cf43cf1cc2fe0cdaef74d002 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1,7 +1,7 @@
 #include "src/lib/modex16.h"\r
 #include <stdio.h>\r
 \r
-word far* clock= (word far*) 0x046C; /* 18.2hz clock */\r
+word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 void main() {\r
     int i, j;\r
@@ -39,7 +39,7 @@ void main() {
     modexFadeOn(1, pal2);\r
 \r
 \r
-    start = *clock;\r
+    start = *clockw;\r
     for(i=0; i<5; i++) {\r
        /* go right */\r
        for(j=0; j<32; j++) {\r
@@ -64,7 +64,7 @@ void main() {
        }\r
     }\r
 \r
-    end = *clock;\r
+    end = *clockw;\r
 \r
     /* fade back to text mode */\r
     modexFadeOff(1, pal2);\r

diff --git a/src/test2.c b/src/test2.c
index 8926372d1e6275277d2dfee568996951c775f7e4..2f76a02e48a57f46b8193bc1e5cb1434594c6731 100644 (file)
--- a/src/test2.c
+++ b/src/test2.c
@@ -2,9 +2,9 @@
 #include <conio.h>
 #include "src/lib/modex16.h"\r
 #include "src/lib/planar.h"\r
-#include "src/lib/bitmap.h"\r
+//#include "src/lib/bitmap.h"\r
 \r
-word far* clock= (word far*) 0x046C; /* 18.2hz clock */\r
+word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 void main() {
        FILE *file;\r

diff --git a/test.exe b/test.exe
index 38fef807ed00d61818ba8f08db98d8386006f5fc..f79cea4eb1a0ae53de4395125abc6df6e0b26e9d 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index d1a35e55d889b78a117164ed969cf0c06e6c0a35..a289dfd085447adf4f520cb89c4497491b3f025f 100644 (file)
Binary files a/test2.exe and b/test2.exe differ