X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.c;h=864d0b160f41a21208a382c44c0f059d10cc4bc2;hb=ba5025039e28bb59e7894b9d4e85a049c4c70373;hp=3bd1dbe1cab35e7c185329b1c231a8fa5b2e04e9;hpb=3a48ef9f29edbcb4fcb66aac25816f048093fa31;p=16.git

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 3bd1dbe1..864d0b16 100755
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -327,29 +327,29 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
 			k = 0;
 			while(t[i].start < inner_end) {
 				if(jsoneq(js, &(t[i]), "image") == 0) {
-					map->MAPTILESPTK = malloc(sizeof(tiles_t));
+					map->tiles = malloc(sizeof(tiles_t));
 					s = remove_ext((char *)js+t[i+1].start, '.', '/');
-					strcpy(map->MAPTILESPTK->imgname, s);
+					strcpy(map->tiles->imgname, s);
 					//And move to vrs, probably
 //					bp = bitmapLoadPcx("data/ed.pcx");
-//					map->MAPTILESPTK->btdata = &bp;
-					//map->MAPTILESPTK->btdata = malloc(sizeof(bitmap_t));
-					map->MAPTILESPTK->rows = 1;
-					map->MAPTILESPTK->cols = 1;
+//					map->tiles->btdata = &bp;
+					//map->tiles->btdata = malloc(sizeof(bitmap_t));
+					map->tiles->rows = 1;
+					map->tiles->cols = 1;
 #ifdef __DEBUG_MAP__
 					dbg_maptext=false;
 #endif
 					i++;
 				}else if(jsoneq(js, &(t[i]), "tileheight") == 0) {
-					map->MAPTILESPTK->tileHeight = atoi(js + t[i+1].start);
+					map->tiles->tileHeight = atoi(js + t[i+1].start);
 #ifdef DEBUG_MAPVAR
-					printf("Tile Height: %d\n", map->MAPTILESPTK->tileHeight);
+					printf("Tile Height: %d\n", map->tiles->tileHeight);
 #endif
 					i++;
 				}else if(jsoneq(js, &(t[i]), "tilewidth") == 0) {
-					map->MAPTILESPTK->tileWidth = atoi(js + t[i+1].start);
+					map->tiles->tileWidth = atoi(js + t[i+1].start);
 #ifdef DEBUG_MAPVAR
-					printf("Tile Width: %d\n", map->MAPTILESPTK->tileWidth);
+					printf("Tile Width: %d\n", map->tiles->tileWidth);
 #endif
 					i++;
 				}