scroll.exe test....

	modified:   maptest.exe
	modified:   scroll.exe
	new file:   scroll.out
	modified:   src/lib/mapread.c
	modified:   src/lib/mapread.h
	modified:   src/scroll.c

diff --git a/maptest.exe b/maptest.exe
index 9a11242130eccf6314bbfa5c4a71222c627343fe..d7b3cc80e6b3842e243c9df3979b947c149e9f6c 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 98ca00f7d058814540435a3f9cc864459d178e08..1d3e92e7904b2cd65724ad164d3bc5f2c6de47ca 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/scroll.out b/scroll.out
new file mode 100644 (file)
index 0000000..1868af8
--- /dev/null
+++ b/scroll.out
@@ -0,0 +1,132 @@
+{ "backgroundcolor":"#000000",\r
+ "height":30,\r
+ "layers":[\r
+        {\r
+         "data":[1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10],\r
+         "height":30,\r
+         "name":"bg",\r
+         "opacity":1,\r
+         "type":"tilelayer",\r
+         "visible":true,\r
+         "width":40,\r
+         "x":0,\r
+         "y":0\r
+        }],\r
+ "orientation":"orthogonal",\r
+ "properties":\r
+    {\r
+\r
+    },\r
+ "renderorder":"right-down",\r
+ "tileheight":16,\r
+ "tilesets":[\r
+        {\r
+         "firstgid":1,\r
+         "image":"ed.png",\r
+         "imageheight":64,\r
+         "imagewidth":64,\r
+         "margin":0,\r
+         "name":"wwww",\r
+         "properties":\r
+            {\r
+\r
+            },\r
+         "spacing":0,\r
+         "tileheight":16,\r
+         "tilewidth":16\r
+        }],\r
+ "tilewidth":16,\r
+ "version":1,\r
+ "width":40\r
+}\90l\8c\86\ 4\10\r
+\r
+indent= [0]    js_sv= []\r
+indent= [1]    js_sv= []\r
+indent= [1]    js_sv= []\r
+indent= [1]    js_sv= []\r
+indent= [1]    js_sv= [height]\r
+indent= [1]    h:[30]\r
+indent= [1]    js_sv= [height]\r
+indent= [1]    js_sv= []\r
+indent= [2]    js_sv= []\r
+indent= [3]    js_sv= []\r
+indent= [3]    js_sv= [data]\r
+indent= [4]    js_sv= [data]\r
+0[1]indent= [4]        js_sv= [data]\r
+1[2]indent= [4]        js_sv= [data]\r
+2[3]indent= [4]        js_sv= [data]\r
+3[4]indent= [4]        js_sv= [data]\r
+4[0]indent= [4]        js_sv= [data]\r
+5[3]indent= [4]        js_sv= [data]\r
+6[3]indent= [4]        js_sv= [data]\r
+7[3]indent= [4]        js_sv= [data]\r
+8[3]indent= [4]        js_sv= [data]\r
+9[3]indent= [4]        js_sv= [data]\r
+10[3]indent= [4]       js_sv= [data]\r
+11[3]indent= [4]       js_sv= [data]\r
+12[3]indent= [4]       js_sv= [data]\r
+13[4]indent= [4]       js_sv= [data]\r
+14[1]indent= [4]       js_sv= [data]\r
+15[1]indent= [4]       js_sv= [data]\r
+16[1]indent= [4]       js_sv= [data]\r
+17[1]indent= [4]       js_sv= [data]\r
+18[1]indent= [4]       js_sv= [data]\r
+19[1]indent= [4]       js_sv= [data]\r
+20[1]indent= [4]       js_sv= [data]\r
+21[1]indent= [4]       js_sv= [data]\r
+22[1]indent= [4]       js_sv= [data]\r
+23[1]indent= [4]       js_sv= [data]\r
+24[1]indent= [4]       js_sv= [data]\r
+25[1]indent= [4]       js_sv= [data]\r
+26[1]indent= [4]       js_sv= [data]\r
+27[1]indent= [4]       js_sv= [data]\r
+28[1]indent= [4]       js_sv= [data]\r
+29[1]indent= [4]       js_sv= [data]\r
+30[1]indent= [4]       js_sv= [data]\r
+31[1]indent= [4]       js_sv= [data]\r
+32[1]indent= [4]       js_sv= [data]\r
+33[1]indent= [4]       js_sv= [data]\r
+34[1]indent= [4]       js_sv= [data]\r
+35[1]indent= [4]       js_sv= [data]\r
+36[1]indent= [4]       js_sv= [data]\r
+37[1]indent= [4]       js_sv= [data]\r
+38[1]indent= [4]       js_sv= [data]\r
+39[1]indent= [4]       js_sv= [data]\r
+40[5]indent= [4]       js_sv= [data]\r
+41[6]indent= [4]       js_sv= [data]\r
+42[7]indent= [4]       js_sv= [data]\r
+43[8]indent= [4]       js_sv= [data]\r
+44[0]indent= [4]       js_sv= [data]\r
+45[1]indent= [4]       js_sv= [data]\r
+46[0]indent= [4]       js_sv= [data]\r
+47[1]indent= [4]       js_sv= [data]\r
+48[0]indent= [4]       js_sv= [data]\r
+49[0]indent= [4]       js_sv= [data]\r
+50[1]indent= [4]       js_sv= [data]\r
+51[1]indent= [4]       js_sv= [data]\r
+52[1]indent= [4]       js_sv= [data]\r
+53[1]indent= [4]       js_sv= [data]\r
+54[1]indent= [4]       js_sv= [data]\r
+55[1]indent= [4]       js_sv= [data]\r
+56[1]indent= [4]       js_sv= [data]\r
+57[1]indent= [4]       js_sv= [data]\r
+58[1]indent= [4]       js_sv= [data]\r
+59[1]indent= [4]       js_sv= [data]\r
+60[1]indent= [4]       js_sv= [data]\r
+61[1]indent= [4]       js_sv= [data]\r
+62[1]indent= [4]       js_sv= [data]\r
+63[1]indent= [4]       js_sv= [data]\r
+64[1]indent= [4]       js_sv= [data]\r
+65[1]indent= [4]       js_sv= [data]\r
+66[1]indent= [4]       js_sv= [data]\r
+67[1]indent= [4]       js_sv= [data]\r
+68[1]indent= [4]       js_sv= [data]\r
+69[1]indent= [4]       js_sv= [data]\r
+70[1]indent= [4]       js_sv= [data]\r
+71[1]indent= [4]       js_sv= [data]\r
+72[1]indent= [4]       js_sv= [data]\r
+73[1]indent= [4]       js_sv= [data]\r
+74[1]indent= [4]       js_sv= [data]\r
+75[1]indent= [4]       js_sv= [data]\r
+76[1]indent= [4]       js_sv= [data]\r
+77[1]indent= [4]       js_sv
\ No newline at end of file

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index f1e7c571dae2b4198ec9d028081412365221a0df..ee054dbd37920f40ee71bd3a8e626f0b42b712ec 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -72,8 +72,8 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
                        //map->data = malloc(sizeof(byte) * (t+1)->size);
                        map->tiles = /*_f*/malloc(sizeof(tiles_t));
                        //map->tiles->data = malloc(sizeof(bitmap_t));
-                       //fix this
-                       bp = bitmapLoadPcx("data/ed.pcx");
+                       //fix this to be far~
+//0000                 bp = bitmapLoadPcx("data/ed.pcx");
                        map->tiles->data = &bp;
                        //map->tiles->data->data = malloc((16/**2*/)*16);
                        //map->tiles->data->width = (16/**2*/);\r

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index fbc8e2137f537686fe25cfe7d6aa53ff63fe80e8..58769d5d01ae66e457e6f1a6290bb0c7853422af 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -10,10 +10,10 @@
 #include "src/lib/modex16.h"
 #include "src/lib/lib_head.h"
 
-//#define DEBUG_MAPDATA
-//#define DEBUG_MAPVAR
-//#define DEBUG_DUMPVARS
-//#define DEBUG_JS
+#define DEBUG_MAPDATA
+#define DEBUG_MAPVAR
+#define DEBUG_DUMPVARS
+#define DEBUG_JS
 
 typedef struct {\r
        bitmap_t *data;

diff --git a/src/scroll.c b/src/scroll.c
index 0b5fc6b1fc86d786f2a3d5d1420457fc19228e36..872afeab783e86d69554bce8447f94b939e50cca 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -126,11 +126,11 @@ void main() {
 \r
        /* create the map */\r
 //0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
+//0000 #ifdef LOADDATA
        fprintf(stderr, "testing~\n");
-//#ifdef LOADDATA
        loadmap("data/test.map", &map);
-//#endif
-       fprintf(stderr, "yay map loaded~~\n");\r
+       fprintf(stderr, "yay map loaded~~\n");
+//0000 #endif\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
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r