modified: makefile

	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   src/lib/mapread.h
	modified:   src/scroll.c

diff --git a/makefile b/makefile
index 61708a587748d45cfb6dd019b9c07093733949fe..d7b11d7e629f664addc48f0f31f40c4845f8802a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -29,19 +29,19 @@ modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
 dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
-       wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
-
+       wcl $(FLAGS) -c $(SRCLIB)dos_kb.c\r
+\r
 bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
        wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
 \r
 planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
-       wcl $(FLAGS) -c $(SRCLIB)planar.c
-       
+       wcl $(FLAGS) -c $(SRCLIB)planar.c\r
+       \r
 mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c jsmn.obj\r
        wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
-
+\r
 jsmn.obj: $(SRCLIB)jsmn\jsmn.h $(SRCLIB)jsmn\jsmn.c\r
-       wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c
+       wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c\r
 \r
 clean: \r
        del *.obj\r

diff --git a/scroll.exe b/scroll.exe
index 6442f4df2175ad56f35961eaaae2300249702911..cae51f8da4b89f522f1cd26c4b91185b93c53057 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 32d06c014ea1b3444fd141c6be57056d3bad7e98..54a33e52212b4aefd604cd3395b38fdb58f650fb 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,5 +1,54 @@
 #include "src/lib/mapread.h"
 
+/*static void\r
+initMap(map_t *map, int maps) {\r
+       // just a place holder to fill out an alternating pattern\r
+       int x, y;\r
+       int i;\r
+       int tile = 1;\r
+       //if(!isEMS() || !checkEMS())\r
+               map->tiles = malloc(sizeof(tiles_t));\r
+       //else\r
+       //      map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
+\r
+       // create the tile set\r
+       //if(!isEMS() || !checkEMS())\r
+               map->tiles->data = malloc(sizeof(bitmap_t));\r
+       //else\r
+       //      map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
+       map->tiles->data->width = (16*2);\r
+       map->tiles->data->height= 16;\r
+       //if(!isEMS() || !checkEMS())\r
+               map->tiles->data->data = malloc((16*2)*16);\r
+       //else\r
+       //      map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
+       map->tiles->tileHeight = 16;\r
+       map->tiles->tileWidth =16;\r
+       map->tiles->rows = 1;\r
+       map->tiles->cols = 2;\r
+\r
+       //i=0;\r
+       //for(y=0; y<TILEWH; y++) {\r
+       //for(x=0; x<(TILEWH*2); x++) {\r
+       //      if(x<TILEWH)\r
+       //        map->tiles->data->data[i] = 28;//0x24;\r
+       //      else\r
+       //        map->tiles->data->data[i] = 0;//0x34;\r
+       //      i++;\r
+       //}\r
+       //}\r
+\r
+       i=0;\r
+       for(y=0; y<map->height; y++) {\r
+               for(x=0; x<map->width; x++) {\r
+                       map->data[i] = tile;\r
+                       tile = tile ? 0 : 1;\r
+                       i++;\r
+               }\r
+               tile = tile ? 0 : 1;\r
+       }\r
+}*/
+
 static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
        if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
                        strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
@@ -9,7 +58,7 @@ static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
 }
 
 //this function is quite messy ^^; sorry! it is a quick and dirty fix~
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, word w*/) {
+static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, int w*/) {
        int i, j, k;
        if (count == 0) {
                return 0;
@@ -19,8 +68,17 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
                //if(w)
                if(js_sv == "data")
                {
-                       //bgdata[q] = (byte)strtol(js+t->start, (char **)js+t->end, 10);
-                       if(strtol(js+t->start, (char **)js+t->end, 10)==0){ fprintf(stderr, "FACK! %d\n", errno); exit(-1); }
+                       /*
+                               here we should recursivly call dump again here to skip over the array until we get the facking width of the map.
+                               so we can initiate the map which allocates the facking map->tiles->data->data properly and THEN we can return
+                               here to read the data.... That is my design for this... wwww
+
+                               FUCK well i am stuck.... wwww
+                       */
+                       //dump(js, t+1, count, indent, map, i);
+                       
+                       //bgdata[q] = strtol(js+t->start, (char **)js+t->end, 10);
+                       if(strtol(js+t->start, (char **)js+t->end, 10)==0){ /*printf("%d\n", sizeof(map->tiles->data->data));*/ /*fprintf(stderr, "\nFACK! %d\n", errno);*/ return 1; /*exit(-1); */}
                        map->tiles->data->data[q] = (byte)strtol(js+t->start, (char **)js+t->end, 10);
                        printf("%d[%d]", q, map->tiles->data->data[q]);
                        //printf("%d[%d]", q, bgdata[q]);
@@ -42,6 +100,8 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
                //if(w)
                if(jsoneq(js, t, "data") == 0 )
                {
+                       //initMap(&map);
+                       //map->tiles->data->data = malloc((16*2)*16);
                        js_sv="data";//strdup(js+t->start);//, t->end - t->start);
                        //printf("%s\n", js_sv);
                }
@@ -71,10 +131,11 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
                j = 0;
                //printf("==\n");
                for (i = 0; i < t->size; i++) {
+                       //printf("[[[[%d]]]]\n", t->size);
                        //if(bgdata==NULL) bgdata=malloc(sizeof(char)*t->size);
                        //for (k = 0; k < indent-1; k++) printf("\t");
                        //printf("\t-");
-                       j += dump(js, t+1+j, count-j, indent+1, map, i/*, w*/);
+                       j += dump(js, t+1+j, count-j, indent+1, map, i/*, t->size*/);
                        //printf("==\n");
                }
                return j+1;

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index dbb4bfa34b1be7571e0c96b601ab13aada647c84..91ab7b7ab3073c6f789861c7a529e2eadc6f5c85 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -8,7 +8,7 @@
 #include "src/lib/modex16.h"
 
 static char *js_sv;
-//byte bgdata[4096];
+//static long int bgdata[4096];
 
 typedef struct {\r
        bitmap_t *data;
@@ -25,8 +25,9 @@ typedef struct {
        int height;\r
 } map_t;
 
+//static void initMap(map_t *map, int maps);
 static int jsoneq(const char *json, jsmntok_t *tok, const char *s);
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, word w*/);
+static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, int w*/);
 static int loadmap(char *mn, map_t *map/*, word w*/);
 
 #endif/*_LIBMAPREAD_H_*/

diff --git a/src/scroll.c b/src/scroll.c
index 239883f678332a467dd92647881c71e3454df139..024b21fa162bc65f0497ede984731207d2d567cc 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -120,8 +120,8 @@ void main() {
        /* create the map */
        loadmap("data/test.map", &map/*, 0*/);\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
-       //loadmap(NULL, &map, 1);\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
+       //++++
        initMap(&map);\r
        mv.map = ↦\r
        mv2.map = ↦\r