modified: scroll.exe

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 0d7d021db3e6131d1a5163fccb40c565cbb9ea2b..506288dbab1828610b1ce3722e2115f049206525 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -118,9 +118,10 @@ void main() {
        }*/\r
 \r
        /* create the map */
-       loadmap("data/test.map", &map);\r
-       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\r
+       loadmap("data/test.map", &map/*, 0*/);\r
+       //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
        mv.map = ↦\r
        mv2.map = ↦\r
@@ -129,11 +130,11 @@ void main() {
        /* draw the tiles */\r
        ptr = map.data;\r
        /* data */\r
-       ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
+//++++ ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
-\r
+printf("\nwwww\n");\r
        /* create the planar buffer */\r
-       p = planar_buf_from_bitmap(&ptmp);\r
+//++++ p = planar_buf_from_bitmap(&ptmp);\r
 \r
        /*if(isEMS())\r
        {\r
@@ -607,19 +608,19 @@ initMap(map_t *map) {
        int i;\r
        int tile = 1;\r
        //if(!isEMS() || !checkEMS())\r
-               map->tiles = malloc(sizeof(tiles_t));\r
+//             map->tiles = malloc(sizeof(tiles_t));\r
        //else\r
        //      map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
 \r
        /* create the tile set */\r
        //if(!isEMS() || !checkEMS())\r
-               map->tiles->data = malloc(sizeof(bitmap_t));\r
+//             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
+//             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
@@ -627,7 +628,7 @@ initMap(map_t *map) {
        map->tiles->rows = 1;\r
        map->tiles->cols = 2;\r
 \r
-       i=0;\r
+       /*i=0;\r
        for(y=0; y<TILEWH; y++) {\r
        for(x=0; x<(TILEWH*2); x++) {\r
                if(x<TILEWH)\r
@@ -636,7 +637,7 @@ initMap(map_t *map) {
                  map->tiles->data->data[i] = 0;//0x34;\r
                i++;\r
        }\r
-       }\r
+       }*/\r
 \r
        i=0;\r
        for(y=0; y<map->height; y++) {\r