From 1f4198553d40bc380a0859babc0b5ab7315843dc Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 23 Mar 2015 18:33:02 -0500 Subject: [PATCH] modified: scroll.exe modified: src/lib/mapread.c modified: src/lib/mapread.h --- scroll.exe | Bin 60608 -> 60549 bytes src/lib/mapread.c | 51 +-------------------------------------------------- src/lib/mapread.h | 1 - 3 files changed, 1 insertion(+), 51 deletions(-) diff --git a/scroll.exe b/scroll.exe index cae51f8da4b89f522f1cd26c4b91185b93c53057..5d0ed08c4eb28a47c7bec552110769631e7c2be7 100644 GIT binary patch delta 11716 zcmZ{K2V7Lg_W#VimtCYIZI=!L%hE-#JPm>cV+F;M*j5Ct5`jfn6paB(VnnczV`5^* z7B$AGsH|P1Mp21k@-%AVGextB#xzr&G4ek%cX#pS@9%y-clLYgoS8W@ckbLhab0}v zy4ZE-*g>QxQ4xvUByDZ0)x?pI`Mn7VCCa6bCZtkNh-W$>Yw> zM?dIOoB507e)pQpUlvsT!n}to-s`P~0cfH^6Onwkm7vQdZ{7VHO~lNHmI#R~5*DuoC9{ny#dpD6k6#uHZIx$d=@k1QWz`2_pY)4_+9 zg3e(q^?~^gP1*^GFXRj#J!VwRoq6|NNKNL$n$f?T-H4?aMyPVA7PhMN^ekLf>4N{= z6+N_NKDl>?`8(US=Kci3#IY}qJ7rFxmigeL9zUk7Q{CmICze#*!k^EU9Pnt{g4dGF zTb7^xuEDXo7+jP2XKm)6mRZ5IqyIEZ#G(tbd>&$^#8MGvnc;1@98#P4jU_m=cJwz) z`f=cr15%r11e{aH(K`4|eU-{^(NQOi@`V=1Ag9N*CZXnJ%}BiUvT zl6}yF9L^?(vPtcX$F=SoXmrX z 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 diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 54a33e52..432a0cc6 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -1,54 +1,5 @@ #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) { @@ -78,7 +29,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * //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); */} + //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]); diff --git a/src/lib/mapread.h b/src/lib/mapread.h index 91ab7b7a..8fb76797 100644 --- a/src/lib/mapread.h +++ b/src/lib/mapread.h @@ -25,7 +25,6 @@ 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/*, int w*/); static int loadmap(char *mn, map_t *map/*, word w*/); -- 2.11.0