modified: makefile

	deleted:    maptest.exe
	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   src/scroll.c

diff --git a/makefile b/makefile
index 44cb0d39f1a9cbe30255b41e81b38a69e42b3c40..f65afd211bac224b79e4d1a3f56dc8e4b10a20cf 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 FLAGS=-0 -d2 \r
 SRC=src\\r
 SRCLIB=$(SRC)lib\\r
-all: test.exe pcxtest.exe test2.exe maptest.exe scroll.exe\r
+all: test.exe pcxtest.exe test2.exe scroll.exe\r
 \r
 scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj\r
        wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj 16\lib\x\modex.lib\r
@@ -16,8 +16,8 @@ test2.exe: test2.obj modex16.obj bitmap.obj planar.obj
 pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj\r
        wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj\r
 \r
-maptest.exe: maptest.obj mapread.obj jsmn.obj\r
-        wcl $(FLAGS) maptest.obj jsmn.obj\r
+#maptest.exe: maptest.obj mapread.obj jsmn.obj\r
+#        wcl $(FLAGS) maptest.obj jsmn.obj\r
 \r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r
@@ -28,8 +28,8 @@ test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
 pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 \r
-maptest.obj: $(SRC)maptest.c $(SRCLIB)mapread.h\r
-        wcl $(FLAGS) -c $(SRC)maptest.c\r
+#maptest.obj: $(SRC)maptest.c $(SRCLIB)mapread.h\r
+#        wcl $(FLAGS) -c $(SRC)maptest.c\r
 \r
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r

diff --git a/maptest.exe b/maptest.exe
deleted file mode 100644 (file)
index fc11295..0000000
Binary files a/maptest.exe and /dev/null differ

diff --git a/scroll.exe b/scroll.exe
index df07e17a482150c12545123224f138239ecc9516..e44f8420e286ee027de8062c918fbeb546d766c0 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index eee0fd008c46dc3c64f8239815bf1651a0ce2047..86dc10af59ea5564afd18af90de41fec3e5fba85 100644 (file)
--- 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*/);\r
+                       map->tiles->data->height= 16;\r
+                       map->tiles->tileHeight = 16;\r
+                       map->tiles->tileWidth = 16;\r
+                       map->tiles->rows = 1;\r
+                       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 315ea9f015179ecdae5fa738d7a993d5ef21709d..dd66f556781431be8bce4e868b259d713f8934c9 100644 (file)
--- 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());\r
-       initMap(&map);\r
+//     initMap(&map);\r
        mv.map = ↦\r
        mv2.map = ↦\r
        mv3.map = ↦\r
@@ -129,7 +129,7 @@ void main() {
        /* draw the tiles */\r
        ptr = map.data;\r
        /* data */\r
-       ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
+       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite\r
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
        /* create the planar buffer */\r
        p = planar_buf_from_bitmap(&ptmp);\r
@@ -616,16 +616,16 @@ initMap(map_t *map) {
 //             map->tiles->data = malloc(sizeof(bitmap_t));\r
        //else\r
        //      map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
-       map->tiles->data->width = (TILEWH/**2*/);\r
-       map->tiles->data->height= TILEWH;\r
+//     map->tiles->data->width = (TILEWH/**2*/);\r
+//     map->tiles->data->height= TILEWH;\r
        //if(!isEMS() || !checkEMS())\r
 //             map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
        //else\r
        //      map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
-       map->tiles->tileHeight = TILEWH;\r
-       map->tiles->tileWidth =TILEWH;\r
-       map->tiles->rows = 1;\r
-       map->tiles->cols = 1;//2;\r
+//     map->tiles->tileHeight = TILEWH;\r
+//     map->tiles->tileWidth =TILEWH;\r
+//     map->tiles->rows = 1;\r
+//     map->tiles->cols = 1;//2;\r
 \r
        /*q=0;
        //for(y=0; y<map->height; y++) {\r