From e2fca6aa7cef49728cf36768f90b46726c705bbf Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 31 Mar 2015 12:10:51 -0500 Subject: [PATCH] modified: data/g.pal modified: scroll.exe modified: src/lib/mapread.c modified: test2.exe --- data/g.pal | Bin 768 -> 768 bytes scroll.exe | Bin 67248 -> 67118 bytes src/lib/mapread.c | 10 +++++----- test2.exe | Bin 44044 -> 44060 bytes 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/g.pal b/data/g.pal index c5950c49f86dcbbb71004a797d6435601f25ef7f..cf668e3509805fa4ec96876045fe2f979a02ab37 100644 GIT binary patch delta 13 UcmZo*YharYzOk^MX<~yE03mh+(f|Me delta 35 pcmZo*YharYE@5nJ%)r1PDG5Z9_L7onYHG&DlJ@qJ8xtoo0RVLl2EYIS diff --git a/scroll.exe b/scroll.exe index a77f82a99be7ce42d33ce01f840955a7b829ef3c..71026c78ccd6dd0b5bd536bf03aa4ea07cf1c629 100644 GIT binary patch delta 14394 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 NHZzQbpIAf4{{SxQBcA{O delta 14410 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[q] = (byte)strtol(js+t->start, &(char *)t->end, 10); +//++++ map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10); // printf("%d[%d]", q, map->data[q]); } else @@ -46,11 +46,11 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * if(jsoneq(js, t, "data") == 0 ) { // printf("[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size); -// printf("\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size); - map->data = malloc(sizeof(byte) * (t+1)->size); - map->tiles = malloc(sizeof(tiles_t)); +//++++ printf("\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size); +//++++ map->data = malloc(sizeof(byte) * (t+1)->size); +//++++ map->tiles = malloc(sizeof(tiles_t)); //map->tiles->data = malloc(sizeof(bitmap_t)); - bp = bitmapLoadPcx("data/ed.pcx"); +//++++ bp = bitmapLoadPcx("data/ed.pcx"); map->tiles->data = &bp; //map->tiles->data->data = malloc((16/**2*/)*16); //map->tiles->data->width = (16/**2*/); diff --git a/test2.exe b/test2.exe index beffe31254218d62ec9ba8c1dca27eba05f777d6..0592dc62f8b9b9bdc57181d035c7c3909d0b8137 100644 GIT binary patch delta 1016 zcmY+DeQZ-z7{z#Q2;}Nj%B@o#&kA zJ@0$&IrsMDbzfee`np;6;hW}asm9gjT3yr#SGY#*ArP*W+juctTlDN!rCd1NwB+Hi zQcC#z*Ba?~jDv5(o}y-s;$}2{J)Eraj4n`0t9LY6JVuS5M#{$DPp%dj#o3*q;ycVF zi}3f()f+<6={Rp~ODNq?HD{79mS|hz&DK~Xp)w5fhzXvMsM3dHvRyOhWf3LI;@c8k z@eU>1BlMjwkk}QiIzjhw?}uLJIK>+84zDvp;ZPK|yfdoFT_&3`!JrP@ zOxxOJV@a=HhOw&GmcQWiT5=E{k=HQHnI=q9Cox0z!*k4%S=5mm(L|m@?ASBXf-&k( zagqEH)8xx|pwE&Iu#7y3E#xJ1kaIXh+886-aFP5C(|xu)fzpg6-=TrLffn*fB+0Ev zkw$USHwPasKNLW-QlX|f9WetXZ+<>tMkE6hy{8{BW@ zR9bys@Jm8wI&j}JV&1=A@Ph^a!T00dcVMw>LC=6) z@@^sWLI{6kOC^t~0ZV?x-2uz}P`ydfgEP4@89`{!k{P@-XiGizQnzD}OyLY?s&R{Y z6BcD{_taBn)udTf>3Z7ezyn>P; zOFo95{0bX}g5t$)>UHR&{sEKJcQHc-;K`X2uOmN06L}3WvJ#(=FW^+pmh-rh;|I3} SbGZt6b=>>;wA(esU-TdKG9;M* delta 999 zcmY+DYe-Z<7>4INt*+&dwxn8jZBJ#jy9pt!*?p6WwCIPBO9hd+)uLo+i%XP$MS$XEq{el7920l8Wm7V37@~MfR4>{a3f$# zTf``AMjbB$^%HE-Axdd#yGEubsPW)jcE`SYzep5!b`+++;!2W%fgS#tDpP`0b(<<` z%j;B}X`7g4mjsn|yjC`TVen8y$<*+Mx~<{ON;Z}=6>7%*oxuqPD@<`5aDJ~6sc`SqyQNWA@QN6VWM*yH!{STgt+xYAy!>$$?TZ_R;j-F2JVWgR5=OSnMK1@f!FR)}^?Q)p?2(gL*6fuJ*w(DePMjpW(aB5^ z`lu^UM0GieapYSRk+ZOt?8M&aJSo9V>H~N|Ud8~q6t0*qb?}pMtRZh>H~Ah3G8;F^ zRd_)@#z4#~Iq<}FxquS#5h}^Ch>*oNPaZ@Uc@=Nsy4F7pLlZ7>!jmxV60!!Bq=5)| z8|TTl=pskrO~Sk9V1fDC!Rh8roHg;Ubik-88UsV||A`t^x6od-US sEJhJ|2y4l1>?KE_m7I@TZC<&CcWwOK{K#x~NomKF_D@#JUH*~30e7k)-T(jq -- 2.11.0