From 105c6eafc6100077fabc6cec72d124a615ae2f18 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 23 Mar 2015 18:25:44 -0500 Subject: [PATCH] modified: makefile modified: scroll.exe modified: src/lib/mapread.c modified: src/lib/mapread.h modified: src/scroll.c --- makefile | 12 ++++---- scroll.exe | Bin 60641 -> 60608 bytes src/lib/mapread.c | 69 +++++++++++++++++++++++++++++++++++++++++++--- src/lib/mapread.h | 5 ++-- src/scroll.c | 2 +- 5 files changed, 75 insertions(+), 13 deletions(-) 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 6442f4df2175ad56f35961eaaae2300249702911..cae51f8da4b89f522f1cd26c4b91185b93c53057 100644 GIT binary patch delta 16410 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 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 = ↦ -- 2.39.5