From: sparky4 Date: Mon, 23 Mar 2015 23:25:44 +0000 (-0500) Subject: modified: makefile X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=105c6eafc6100077fabc6cec72d124a615ae2f18;p=16.git 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 61708a58..d7b11d7e 100644 --- a/makefile +++ b/makefile @@ -29,19 +29,19 @@ modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c - wcl $(FLAGS) -c $(SRCLIB)dos_kb.c - + wcl $(FLAGS) -c $(SRCLIB)dos_kb.c + bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c wcl $(FLAGS) -c $(SRCLIB)bitmap.c planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c - wcl $(FLAGS) -c $(SRCLIB)planar.c - + wcl $(FLAGS) -c $(SRCLIB)planar.c + mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c jsmn.obj wcl $(FLAGS) -c $(SRCLIB)mapread.c - + jsmn.obj: $(SRCLIB)jsmn\jsmn.h $(SRCLIB)jsmn\jsmn.c - wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c + wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c clean: del *.obj diff --git a/scroll.exe b/scroll.exe index 6442f4df..cae51f8d 100644 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 32d06c01..54a33e52 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -1,5 +1,54 @@ #include "src/lib/mapread.h" +/*static void +initMap(map_t *map, int maps) { + // just a place holder to fill out an alternating pattern + int x, y; + int i; + int tile = 1; + //if(!isEMS() || !checkEMS()) + map->tiles = malloc(sizeof(tiles_t)); + //else + // map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t)); + + // create the tile set + //if(!isEMS() || !checkEMS()) + map->tiles->data = malloc(sizeof(bitmap_t)); + //else + // map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t)); + map->tiles->data->width = (16*2); + map->tiles->data->height= 16; + //if(!isEMS() || !checkEMS()) + map->tiles->data->data = malloc((16*2)*16); + //else + // map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH); + map->tiles->tileHeight = 16; + map->tiles->tileWidth =16; + map->tiles->rows = 1; + map->tiles->cols = 2; + + //i=0; + //for(y=0; ytiles->data->data[i] = 28;//0x24; + // else + // map->tiles->data->data[i] = 0;//0x34; + // i++; + //} + //} + + i=0; + for(y=0; yheight; y++) { + for(x=0; xwidth; x++) { + map->data[i] = tile; + tile = tile ? 0 : 1; + i++; + } + tile = tile ? 0 : 1; + } +}*/ + 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 dbb4bfa3..91ab7b7a 100644 --- 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 { bitmap_t *data; @@ -25,8 +25,9 @@ typedef struct { int height; } 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 239883f6..024b21fa 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -120,8 +120,8 @@ void main() { /* create the map */ loadmap("data/test.map", &map/*, 0*/); 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); //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); + //++++ initMap(&map); mv.map = ↦ mv2.map = ↦