fack!!!! wwww

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

diff --git a/makefile b/makefile
index 433caf816f858cc4bde11f7f7c3ab5e65b1048bd..cba89784a48b0595e99a55070de2237f1e61f222 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,7 +1,11 @@
-FLAGS=-0 -d2 \r
-SRC=src\\r
-SRCLIB=$(SRC)lib\\r
-all: test.exe pcxtest.exe test2.exe scroll.exe\r
+OFLAGS=-ot -ox -ob -ol -oh -or
+FLAGS=-0 -d2 -mh -wo $(OFLAGS)
+DIRSEP=\
+SRC=src$(DIRSEP)\r
+SRCLIB=$(SRC)lib$(DIRSEP)
+JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
+\r
+all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe\r
 \r
 scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj\r
        wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib\r
@@ -17,7 +21,7 @@ pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj
        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 jsmn.obj modex16.obj bitmap.obj\r
+       wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj\r
 \r
 \r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
@@ -29,8 +33,9 @@ test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
 pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 \r
-maptest.obj: $(SRC)maptest.c $(SRCLIB)mapread.h\r
+maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)maptest.c\r
+
 \r
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
@@ -44,14 +49,14 @@ 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 jsmn.obj lib_head.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: $(SRCLIB)jsmn\jsmn.h $(SRCLIB)jsmn\jsmn.c\r
-       wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c\r
+jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
+       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
 \r
 clean:\r
        del *.obj\r

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

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

diff --git a/scroll.exe b/scroll.exe
index 38e708591f48bf751f25823254147ea861942ec4..f6d853d7088efc705896407a1130ebaac64fc456 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 73fefcd0c0bb850984a5443f2bb19776631aafe6..8f84071a6cf11411ae4b0a95ac2d96c54db34aee 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -26,7 +26,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 
                                FUCK well i am stuck.... wwww
                        */
-//++++                 map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10);
+                       map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10);
 //                     printf("%d[%d]", q, map->data[q]);
                }
                else
@@ -112,7 +112,7 @@ static int loadmap(char *mn, map_t *map)
 
        /* Prepare parser */
        jsmn_init(&p);
-fprintf(stderr, "b4 malloc\n");
+
        /* Allocate some tokens as a start */
        tok = malloc(sizeof(*tok) * tokcount);
        if (tok == NULL) {
@@ -161,7 +161,6 @@ again:
                        eof_expected = 1;
                }
        }
-fprintf(stderr, "a4 malloc\n");
 
        free(js);
        free(tok);

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

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 60cc85e26c17761392e9ebbe5716a8fcd26e7b0f..be8dcc7ab7ed14d933d53ea9c3ca90228c667afd 100644 (file)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -9,109 +9,114 @@ word far* clock= (word far*) 0x046C; /* 18.2hz clock */
 \r
 void\r
 oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite) {\r
-    byte plane;\r
-    word px, py;\r
-    word offset;\r
+       byte plane;\r
+       word px, py;\r
+       word offset;\r
 \r
-    /* TODO Make this fast.  It's SLOOOOOOW */\r
-    for(plane=0; plane < 4; plane++) {\r
+       /* TODO Make this fast.  It's SLOOOOOOW */\r
+       for(plane=0; plane < 4; plane++) {\r
        modexSelectPlane(PLANE(plane+x));\r
        for(px = plane; px < bmp->width; px+=4) {\r
-           offset=px;\r
-           for(py=0; py<bmp->height; py++) {\r
+               offset=px;\r
+               for(py=0; py<bmp->height; py++) {\r
                if(!sprite || bmp->data[offset])\r
                  page[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];\r
                offset+=bmp->width;\r
-           }\r
+               }\r
+       }\r
        }\r
-    }\r
 }
 \r
 /*
 void\r
 DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 {\r
-    byte plane;\r
-    word px, py;\r
-    word offset;\r
+       byte plane;\r
+       word px, py;\r
+       word offset;\r
 \r
-    // TODO Make this fast.  It's SLOOOOOOW\r
-    for(plane=0; plane < 4; plane++) {\r
+       // TODO Make this fast.  It's SLOOOOOOW\r
+       for(plane=0; plane < 4; plane++) {\r
        modexSelectPlane(PLANE(plane+x));\r
        for(px = plane; px < p->width; px+=4) {\r
-           offset=px;\r
-           for(py=0; py<p->height/2; py++) {
+               offset=px;\r
+               for(py=0; py<p->height/2; py++) {
                SELECT_ALL_PLANES();\r
                if(!sprite || p->plane[offset])\r
                        page->data = p->plane;\r
                //offset+=p->width;
                //offset++;\r
-           }\r
+               }\r
+       }\r
        }\r
-    }\r
 }\r
 */
 \r
 void main() {\r
-    bitmap_t bmp;
-    planar_buf_t *p;\r
-    int i;\r
-    page_t page;\r
-    word start;
-    int plane;\r
-    float t1, t2;\r
-\r
-    page=modexDefaultPage();\r
-\r
-    bmp = bitmapLoadPcx("data/koishi~~.pcx");
-    p = planar_buf_from_bitmap(&bmp);\r
-    modexEnter();\r
-\r
-    /* fix up the palette and everything */\r
-    modexPalUpdate(&bmp, 0, 0, 0);\r
-\r
-    /* clear and draw one sprite and one bitmap */\r
-    modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);\r
-\r
-    /* non sprite comparison */
-    start = *clock;\r
-    for(i=0; i<100 ;i++) {\r
-      oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
-    }\r
-\r
-    start = *clock;\r
-    for(i=0; i<100 ;i++) {\r
-      modexDrawBmp(&page, 20, 20, &bmp);\r
-    }\r
-    t1 = (*clock-start) /18.2;\r
-\r
-    start = *clock;\r
-    for(i=0; i<100; i++) {\r
-       modexCopyPageRegion(&page, &page, 20, 20, 128, 20, 64, 64);\r
-    }\r
-    t2 = (*clock-start)/18.2;\r
-\r
-\r
-    start = *clock;\r
-    for(i=0; i<100 ;i++) {\r
-      oldDrawBmp(VGA, 20, 20, &bmp, 1);\r
-    }\r
-\r
-\r
-    start = *clock;\r
-    for(i=0; i<100 ;i++) {\r
-      modexDrawSprite(&page, 20, 20, &bmp);\r
-    }
-    //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));
+       bitmap_t bmp;
+       planar_buf_t *p;\r
+       int i;\r
+       page_t page;\r
+       word start;
+       int plane;\r
+       float t1, t2;\r
+\r
+       page=modexDefaultPage();\r
+\r
+//0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");
+       bmp = bitmapLoadPcx("data/chikyuu.pcx");
+//0000 p = planar_buf_from_bitmap(&bmp);\r
+       modexEnter();\r
+\r
+       /* fix up the palette and everything */\r
+//++++ modexPalUpdate(&bmp, 0, 0, 0);\r
+\r
+       /* clear and draw one sprite and one bitmap */\r
+       modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);\r
+\r
+       /* non sprite comparison */
+       /*0000start = *clock;\r
+       for(i=0; i<100 ;i++) {\r
+               oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
+       }\r
+\r
+       start = *clock;\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
+\r
+       start = *clock;\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
+\r
+\r
+       start = *clock;\r
+       for(i=0; i<100 ;i++) {\r
+               oldDrawBmp(VGA, 20, 20, &bmp, 1);\r
+       }\r
+\r
+\r
+       start = *clock;\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));
        while(!kbhit())
        {
                //DrawPBuf(&page, 0, 0, p, 0);
+               modexDrawBmp(&page, 0, 0, &bmp);
        }
-    modexLeave();\r
+       modexLeave();\r
 
        printf("\n%d\n", sizeof(p->plane));
        printf("%d\n", sizeof(bmp));\r
-    printf("CPU to VGA: %f\n", t1);\r
-    printf("VGA to VGA: %f\n", t2);\r
-    return;\r
+//0000 printf("CPU to VGA: %f\n", t1);\r
+//0000 printf("VGA to VGA: %f\n", t2);\r
+       return;\r
 }\r

diff --git a/src/scroll.c b/src/scroll.c
index 32fdeb67b8bc1027f7675418e239e38e5d869171..dc6459c28b1fb37b75c262ff9e2f70ed3b99413d 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -100,7 +100,7 @@ void main() {
                printf("Expanded memory is not present\n");\r
                exit(0);\r
        }\r
-     \r
+\r
        if(!emmok())\r
        {\r
                printf("Expanded memory manager is not present\n");\r
@@ -124,7 +124,7 @@ void main() {
        /* create the map */\r
 //0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
        fprintf(stderr, "testing~\n");\r
-//testqqqq     loadmap("data/test.map", &map);\r
+       loadmap("data/test.map", &map);\r
 //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r

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

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