From 58947b239b0c268e8eecf88906e4d742e877956b Mon Sep 17 00:00:00 2001 From: sparky4 Date: Wed, 25 Mar 2015 14:56:05 -0500 Subject: [PATCH] modified: makefile deleted: maptest.exe modified: scroll.exe modified: src/lib/mapread.c modified: src/scroll.c --- makefile | 10 +++++----- maptest.exe | Bin 31379 -> 0 bytes scroll.exe | Bin 60326 -> 60325 bytes src/lib/mapread.c | 7 +++++++ src/scroll.c | 16 ++++++++-------- 5 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 maptest.exe diff --git a/makefile b/makefile index 44cb0d39..f65afd21 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,7 @@ FLAGS=-0 -d2 SRC=src\ SRCLIB=$(SRC)lib\ -all: test.exe pcxtest.exe test2.exe maptest.exe scroll.exe +all: test.exe pcxtest.exe test2.exe scroll.exe scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj 16\lib\x\modex.lib @@ -16,8 +16,8 @@ test2.exe: test2.obj modex16.obj bitmap.obj planar.obj pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj -maptest.exe: maptest.obj mapread.obj jsmn.obj - wcl $(FLAGS) maptest.obj jsmn.obj +#maptest.exe: maptest.obj mapread.obj jsmn.obj +# wcl $(FLAGS) maptest.obj jsmn.obj test.obj: $(SRC)test.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)test.c @@ -28,8 +28,8 @@ test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)pcxtest.c -maptest.obj: $(SRC)maptest.c $(SRCLIB)mapread.h - wcl $(FLAGS) -c $(SRC)maptest.c +#maptest.obj: $(SRC)maptest.c $(SRCLIB)mapread.h +# wcl $(FLAGS) -c $(SRC)maptest.c modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c diff --git a/maptest.exe b/maptest.exe deleted file mode 100644 index fc112955c83d43f73f0d04b000ea35e36daf32d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31379 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 delta 11189 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 diff --git a/src/lib/mapread.c b/src/lib/mapread.c index eee0fd00..86dc10af 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -49,7 +49,14 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * map->data = malloc(sizeof(byte) * (t+1)->size); map->tiles = malloc(sizeof(tiles_t)); map->tiles->data = malloc(sizeof(bitmap_t)); + //map->tiles->data = bitmapLoadPcx("data/chikyuu.pcx"); map->tiles->data->data = malloc((16/**2*/)*16); + map->tiles->data->width = (16/**2*/); + map->tiles->data->height= 16; + map->tiles->tileHeight = 16; + map->tiles->tileWidth = 16; + map->tiles->rows = 1; + map->tiles->cols = 1; js_sv="data";//strdup(js+t->start);//, t->end - t->start); } else diff --git a/src/scroll.c b/src/scroll.c index 315ea9f0..dd66f556 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -121,7 +121,7 @@ void main() { 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 //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); - initMap(&map); +// initMap(&map); mv.map = ↦ mv2.map = ↦ mv3.map = ↦ @@ -129,7 +129,7 @@ void main() { /* draw the tiles */ ptr = map.data; /* data */ - ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite + ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite /* create the planar buffer */ p = planar_buf_from_bitmap(&ptmp); @@ -616,16 +616,16 @@ initMap(map_t *map) { // map->tiles->data = malloc(sizeof(bitmap_t)); //else // map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t)); - map->tiles->data->width = (TILEWH/**2*/); - map->tiles->data->height= TILEWH; +// map->tiles->data->width = (TILEWH/**2*/); +// map->tiles->data->height= TILEWH; //if(!isEMS() || !checkEMS()) // map->tiles->data->data = malloc((TILEWH*2)*TILEWH); //else // map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH); - map->tiles->tileHeight = TILEWH; - map->tiles->tileWidth =TILEWH; - map->tiles->rows = 1; - map->tiles->cols = 1;//2; +// map->tiles->tileHeight = TILEWH; +// map->tiles->tileWidth =TILEWH; +// map->tiles->rows = 1; +// map->tiles->cols = 1;//2; /*q=0; //for(y=0; yheight; y++) { -- 2.39.5