From 45657b1dabbedfa7c186957a02e0944341b54217 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 31 Mar 2015 20:02:06 -0500 Subject: [PATCH] remove debugging of memory wwww modified: data/g.pal modified: data/test.map modified: data/test.tmx modified: scroll.exe modified: src/lib/mapread.c modified: src/scroll.c --- data/g.pal | Bin 768 -> 768 bytes data/test.map | 2 +- data/test.tmx | 16 ++++++++-------- scroll.exe | Bin 67118 -> 66974 bytes src/lib/mapread.c | 10 +++++----- src/scroll.c | 10 ++++------ 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/data/g.pal b/data/g.pal index cf668e3509805fa4ec96876045fe2f979a02ab37..c5950c49f86dcbbb71004a797d6435601f25ef7f 100644 GIT binary patch delta 35 pcmZo*YharYE@5nJ%)r1PDG5Z9_L7onYHG&DlJ@qJ8xtoo0RVLl2EYIS delta 13 UcmZo*YharYzOk^MX<~yE03mh+(f|Me diff --git a/data/test.map b/data/test.map index c1459201..477bcf45 100644 --- a/data/test.map +++ b/data/test.map @@ -2,7 +2,7 @@ "height":30, "layers":[ { - "data":[1, 2, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 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, 1, 1, 9, 10, 11, 12, 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, 13, 14, 15, 16, 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, 6, 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, 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, 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, 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, 12, 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, 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, 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, 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, 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, 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, 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, 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, 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], + "data":[1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 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, 5, 6, 7, 8, 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, 9, 10, 11, 12, 0, 1, 5, 1, 1, 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, 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, 0, 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, 12, 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, 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, 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, 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, 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, 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, 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, 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, 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], "height":30, "name":"bg", "opacity":1, diff --git a/data/test.tmx b/data/test.tmx index b1e03d99..4c5c441b 100644 --- a/data/test.tmx +++ b/data/test.tmx @@ -5,14 +5,14 @@ -1,2,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,1,1,1,1,1,1,1,1,1,1, -5,6,7,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,1,1, -9,10,11,12,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, -13,14,15,16,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,6,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,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,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,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,2,3,4,0,3,3,3,3,3,3,3,3,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, +5,6,7,8,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, +9,10,11,12,0,1,5,1,1,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, +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,0,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,12,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, diff --git a/scroll.exe b/scroll.exe index 71026c78ccd6dd0b5bd536bf03aa4ea07cf1c629..36d2d5544ee893c05946d9aacc5f8c0a898d6de3 100644 GIT binary patch delta 15596 zcmbVz30M?I^LNk8vdbbY_kAPxC6|bz9EuBGh=8bQSh+?~IRd*LZxX&4H7l*RnIP9^8NqM^F81C%uMyKs=KSItE;SdP0r)$c%tO)y-ymwNUZp{RONHPglMuJ*BljT=04WQJGdlPdpS|vtUjxmYpjXl z=9(;Z(M@ag6QrRZ<7B_7hpV0@)`c{N>f7-KGsdB6ULQ|{oigNJDikXZ_;|JaMNQ=kqH@))9IkHe9&}(h$v9wRoS{_@uQ?`0=WyiSFh-Nwb%3z@ z8B(|8?%&$w*wCYz%17iKPi?kPOOx{`<3N_7=6I}0#}eJjF;py7yx6JL(d z$R9ECXJ|&6CiR6T=b0v}o!T}sdQFdV@z{5_YET>h3eC-Wb^ew{{z99HE$c0I(Js@s z{HdYk8YmHYgm(=nt!hOAPKdPa~ zGfmDFjk_jUj5DjTiPY^i?bc2NPl;_+o&2;`)TNedwNiJr93%U&cCQox{CsXK5oosB7(9FG}5o!B- zXuop9D5LJm#2&gDPZMnp+>nHbwrS+sz`{6o(6PFlE$W;Xbvf&C?$^nW;&6rk5`K<4 zAwj06+O^R#P0kBVvdGAUsF%#@#sa)+Jj1$OgY!PyQIpfINoKVnw%7x_G9K^rqNYkj z-WKX8L^aJeu{l@YW_9MYTA?&0J=&-yF4{;`iPI(82!mLDI!&`=Zg*ODbhMFX$;@sn z@!e_r7@}D}zk3Wu5>@6ci~S-T>=)X#CIZo}ec!~;v7Zg(${gUZi5Of>{=4MyDm=&^rVv&xJ%(Plcn*BU=FgEdcWC@b4c zutwZ7QsSCs^Vpp0JtNg(_Wx;(qp87~CW*nC?=a=I!&KQU)7RYtZ8B@`*GK%H`YZZj zB^p<*FkR*je&&I_hD7-AR}gCRY`(rNzxX^2*8Fhpu(FoYP<{%S3X zl3q6iW4H#x_LV_j8?*nX@$r>Hn5hFyunh0DOKs_|54ZO%Xg>!mv(29j(k!{vRfAWz z?yhz&cw0qDUTEKuU^WDWm0MC5O&U2?+GQr;P1+ya8!wYIZU2~>W4LO+=$>nF2Q2{pd9SzAK5Og z@dIRxp>o>U!J4ejfTQZOX^mea7%hNV!D)^Au;fomjXxsgh7{Wv%%*8=1Zp`_CX~XQ zx69fs;MGc2XWb%y^#!Xl#mCpI&IliSSh{L89z)?{(bU|m$Ixj#jNKpFFvzAzY+vp4 zzS9>@d!1@3JGgminw*Zd+o9cG&20G2DV|{+?m?&XWSbZxO!D;A>r&P_4GVYb)A4?{J`?XZ>$4i}xepN8Ocof~0%MxM$T4aN_TJ4zwn{ZQ zoz;h1rB!n=+jSm)uT@HP81w=bk9#dW7LU(vd8ck)W2+Rbedk*hxM13^sq7*ui^i*H znWHy+>O0Q)FSNBo`zfvouWBk^5tR)V(;8o)z)mpo%W!eUjYx-f09`YL%6h&Bm!=)w zAC!KBS!{lXpFchtF8hr!Vy7E{Z%6=rObE%xN5kF_OA)gOTEmA%C19;>4(R<3`KxNB z`Ldi>)wip{x{tq?Vn%fKSfq5TDYFc3LTTxHDG(D8BcCqOxaCR0&xJP)ZdOSKx2d>$ zpObn-WqFeQQbKo`+WBrR;^`7XTEuyHzxOV|T@!=5#RWto)7OW+5$+>fO>u|UMSH*p zwvQ=MSmS?bloG9<8*NJMHeIqYPtqdquqU{oNFc{@I()1BR;=qr#y&z0yai5?@m48j zCfLeSc~`IEFgr3PwAD;|$g2LVS&;ZAY`Y^toy^vs!_sL(NmLzo(#%+C*Ek%#aR=HW zC$lHaASf!2y<`R}qJo`^(c_)kpDb{{fSXNWL^{(N%TW3TT!`|sYBy8MuhvvvB`Ukd zm56?23+4kKy3lH`v>NlC-4hNJ#xSk6-Ub|^M_Dd6Rm<<=HuE|E>^a}5tuk#WkG^Ki ze#XIs_;9wEgGKS)Y%&L1;?KGjNSb4hRagfddwwZa>?@sTTzfWFTp&?0&9dyq8L%ed zTPCt$OrkeqI$bijd7iP#B(^R`0&fkU5ATf(cIuGK9j1wXCRyB}3|icw8d{BEr_5D% zYA3^~k?!do5>0fwM0Ya0i9R=WNOVn_u_kJ)F!-->^V%!wrzq-Zp+1TmZqHa*hh(0S zMk&&*RU@hU6M4_A7B?wBJTC8I?kT&~XLak~$?*P63fPVq!34mR5v7a;oEYK7E|tN< z5$)&>!z*5QkLJ}0W)Lwl!?SU;thsTltT`hc&q_59@DO2Im(!)mG7+{` z#@b&&AwR`zfso_?=0lj2e9(5JjrzFyl6IU8N}yRj>Q?QE7vP@~YWeXC-4ksz32)Nf zSGS`G12a+vGU@PXN~{TWp~{we32vo~_KoVNj!u`wqN6ILnk180F}g-3sA|Ks4?a5Y zif%1>6VgWwG23NBr>oLflVq&D1|N^|4$YLQd-uhMySuT|pKa7Fx^)@qX6=G*^-=74 zgSqGnER_kQg5sIMjtdsD|HV3*?IQYDx8 z^ozizEj!7U@w>xLdHR0tCG}nE+aFxU7FH!mYsGS@=Bnn0&qJjizGJ0oth+DY{P1yU z(3zd&>6V(fFjUH+Q95p8n6y?FA>9~-k7((}7<>$oMm}sb9=CBQ(s9zpZld+H(VnnQ zqiS4vRToFd@}v7KNF&2M-7#4itGU$pY;^692XC8aq@~xMS$<dJ&RY))OlFuP%J zT0Ub8pQcS@zJ;f0H<)v9e!{hM2dU$Q!NniSrg;wep+qJXp} z&JEU1akg-i#=5ylE4Tw)-58ojP2u}69~wTSMQeGhWASF|aex|5h>S_IwI&26`Laq27QZyoNG1YE(*J?5DQ*{+c% zA0?`v>TV2vS>CzuWt?%vgYa`Yt-943$ke&*gJp0 zj%l-KEIGfSqYvYpAm$E4<-~_yGWuBej4G=>qHf+DcgoZ8TzJRgb5*QLrfv;Cr+v#v z{aBv@MdVO-w{{JDk+X;SFJvpcq=%p4n*vO?yJ4|nv}m-nnZP;4Sy_&(ewwUBoF*k6 z+SE<3b9#o^e(8aAQgzqT)`c(kOTi-7iN!~7?%;sq(gXV`L%Zn$Y6uqcE8Y}jP;zIi>n!Wqgo(&RvNSS6KQPVW-+=S88uig!7xk+ivYYT6wn;W~k zTO>H>k0z+w)JK;c**)x(XF02uXqzl>eCZS~7lk+B`s`LIZM(_fI*s#3fN_HLfNFbT zQekT(>69n@nD5um>5qjk2~#n+I?fATZRfwteP+J0p&PI8khyNM!OQDlok zZHGO%WlD8l)K^M}Wl2>`vo_{-eKtlCRb^wQ6t%-xug{bYZZ5Y_9~s7w$`Bk1rZqvE z+#QQmE43(n6SNNrr z{ZIc0ha0Nu@l1j?@eg!NJLNIw5%549<3!tv z`#9}i(4`!Suj-Oi(=G4Q^igyT**NEyZOE6w9@R(48#ng|-p%LbdgjRjj_hO-lhJYL zFa?g_q_<0n#BH80V4x{Sdy0T!;zi({wDz-fMp-6zuUCjFQhUXcqA zcyqoxte9`xuOL^MJD{*2v@Cxan70S@!+%h7R%9O=rl;3c3fsBRvw{04j zxBH8^)^V-i_iij_K^Vw=H;BoCx_9kEc@?k19y}5f=shT#-uI{DoqJzF=_LZUo#Hn3 zg>d2B`?zW!sp-$Gf!}KUL=Eo}0&iB@fcGK`qy1QLfwp(7VeBFc=0d|8i&#ds2v0n- zDijrS3CA6mHWV)&&#<0c!=WYT8P<^lSejCGkfbua3e)osL`w*dZ{x^QV$Tp>jg%K7 zXAt}r$tg@Q%YTYQ5pxx}Um?}Oyh3UhQg*Bhi*m=29K`Nn`5%xN%YH$zD@cCNT5|kl zB+jvfLu1HNW*ln9EJgjZ)%KhxcL|j0AzT!9wqck0ONOuDR&s4Ovq;L zM}!;@I?Fxdcrzp}aMuyCN9sC4*q0ZQCL%u(;S-R`7JVe*T(>GvK2DBn~Zf?;W1PkEQa)0Mpw3qV?!8gY8Ww`o3{(c;O0Zn@ zyy}{9f)(FxMu&I_JqMy`KO865<6-a-R@`sR^Ej@!!D^hI;q4R!6(#fRGgujY} zr^!4M!rw(|0Yb=qg5(O5zbQFZM##W^@n*ac5<~k9???FlNUiQ?Z^}C$QMIlgF~tZ% zk~OtQ#rZ@eN1Glp<)e|9VEPqu6Oh`B5OT*L*<>1u9q^lw1DZslKrveA1xnR3IkC@xWTJ#y;DrX(Thf&?v2zFz#>;#F=P~yJrOglj$8x=FRn+ZRC=p!n#TW$|S z*Mu7Le<1p<-Fp!9Q3RJ^|0YcTD1cjT9|^S|rEweVgW$$T-e$Y(ci9tuy*0WG5sNkc zT%^MVh+UJ&B{`ghsx@AwOC0t)@Ub?8)H>{jZ`K5eE;v*=Vh3Sh^05W?yTg2N{n*Pi zz%kE}zl>4?94En;k9{mE9qS#1IW4orbmq7Qsz3H}uXprwGGvHCI)BTV*>tw>`%z|( zqZ=Ig_zly`j&@FbBLa6FWf1sDFz4rV2Bv(ngNt!$fqrX!gQ}g5I}!dTJ3@?{{hTol zkcx56M(QR~vz#?Z-A8Jz^Y<`qZ5R^`b!*!KXcoXliq1WbYn496LAPLk>&p=g$x2Q{ zRt&tiE?jiR*~kSBu5;vWJHKkUv@V{pFmk!%!y;&cEi-q7IELZJ%L-FMRRA|?t^oE2=~M-0LIiib4KnSP=w_G_i*^QKA#)n z9su3-2f5qszr&%=1G#Vy73elMQ#n(-d}Wir}oghQpmr zHC%tMAq}&>vS+yA{Yzod*R@ zi&N%%?<=rmO8|Gv+ZoKa2AI8z*q`3kK2*<}P`kz9{jH{)v(H3ihH#-i;~;*kKR40m zDa_iM&G9}Dp=GOgK&8(TAHwg&DPQZO^Wpa(vBu}D55EP8-987Aw;QQepR-`IEqKUN zpJBd+Xv>{bs8rI3!&RvfBY}6uIVJIp@--v^OviOJ4LBj}<{J$E*%mN#m~XXEor*A_ z<%LRBc?mI8uSU7?zVr0e%ar9bp9}3)AtT4P1a52#6;=C+{lM~@Xbyb4VDvXv?CX6u z`x3qlr)9J6MWlW~O6%JJvD-sAv0om{*&fL``enoC+kLojzmf3c_8_}Fzgj;b?!Lr1 zs`RVz(>ttfyDfO^Ft@1n+pA~aK=yjSZy@sl`a;`F|Y9FG8Zke^nsA014xOz(9UJ5|#m;f&4rq_yGGr z>ZBT^0|QqH^bw@D2ObXQn~>Na_+2o+2Z_ueRWQFBi8q3ZgZTy|z75I`rgab75(}aV z{!S>w;VeBJd9@XI z%77Gz_%@B3G9UpKf9n&g9uOYRFSSRXQbK`*Zong~^Bz(pEHIp3f`m0C-a=w&m?jMU zh}501K=|$3@ct>`Z-ooPb_K!g@bYl}3=#$51>uChj8s{884PY1fNw*K8ruA5a++O8 zhp5%`5A499nz@6I-rdOT!Uf1nf!y7J!sZsYMzizifJ)%w-Tf`z3U`cP>HcXuZebwY z1b*6`$T>!Ig2f&O?~sT;BKllVO9ug8HIe9uSrLQ}L~3rtA24>$Fs?Hq1#0&Ma;A~- zuy0QymBc+QPKaf9x#NSaS0||c~Dbs;=NL@o};J^gf zc3=ayY2Xe>JvfQ`Zs2D4`e3rz&jatFL)0VfkB%FxySI?Xy}tcPX`gc04d8D_ZV!d6v>d7m>9w@ zKx$mfRCwp;0In)#HS9P#ms=TA2mZ~0xj)3r9U^Fvk2;i%rGxi2T6-nNdoced5;tRh z#}?i~>Qzj?!N~m<$(X^0N_6)*X9caa3*pZY=652|HhA(7eg_gGhh#uQb1=7h$V9l+ zJeS)vWE@OACg;u%c?n+}^Qp>@eL0M8!&69UYMKW zBQa!X;!xTdJ)~3&tslypBJm*-hz&$?#IUc1@li-*3|l{pk3`~4N<<(5NMKc3n;w6x z<6`6Z(PE?q#>GPF54aM<)xv@wT)3jR8d&o~7!w93ez?ii#yx>;$3wUcarfZr@v+>K zxGx~6C4n=FUkfEI5vC*J3*vc89JGn?xv;GzkozJ&9xk`Ia(m;W;jflq+z;{QFu2uU z_TTth@!0n*6tzzXg3?x>z>x`>k$em_&K>VDzNjc zB!jsMMM0^+A)M979$CJ^08Q$Fga)ym0s+BI`EyDu3Ke|O9O|X-5cL%tkEcIdh5-durCMD*lC0T^)7qpI^Yvx`deh{ys@Q3mhu z#ia#>M3mawfI=}It;gM5K-D|j1g4Pf?n3=*a{sQ3Hmsp!sw zjPBDX?HL)|J?Y1Ug6t=MyJN{c-YLOe3}bi<#{Lw*M8Mpi`~s(@^a{{3FuJ7|(U(Q( zJ@&Qy6k_Kxsz)40K<`b$eF`S0T=KT}uy_M5%6!eB^y19oGC4Y4UV?M&H7{3`s!9r| zm(TXp7Z6k=f3%^ml2Sbc<4-x5SN5QI<}Fe3u;Wx@74=JrYR;Tow2^T1PcVgHRpeJF zbIX<3R0aO^r5;KxRVqf7l&WUTRE#SuE-hbx-1V65^jt;Z{30sx4ko=dD(J*fQ)VJ}#Natt;IENm(w zvd5egJxqgnzxR|40wODnC9EyPS6@vcvUv?hi@@%zcj)up%5);lQRJz3zOWosSdrT6 z0%RbJ*fyAX)|Ux_6=wsO3$X9(0OmH_I~(lsD6LmkRfaG23j3M~gzz>;W;l##^RF6_ z-fLA+Ua=ytsI)>cqfn_(7Uj>T2_YN#2Cw(Ph;Hwxg@Kqq8v*@0KNFf^^$;c`9A;4# z2B>~o2|zKLQ&dryUs_Ut)A4I5F%r1&yv>Vg0jG1`xTMFQb7HPS_PK#oZhgMVSC!|L z&n6<@J}4tIal{x*+eGC5FEDd_8W9Edf%$n0@W3DnehryfG^c=wLi>=C(wIR+G_(&; z$g42G^slEdrF!&n$|}l;2tSYZj3@O=>D)QE66EHiicx)>a(uB`T3+}%H>QuPpTx8# zO_xNJ(8n5EHlnydF}A1#;iT8$v>C;z^c9xKs}C*3fS*;0I`;nuR#ZYU{5sL2C&~%w z(Z>M6gY#ZY2bljiz&HX|2O6D_@L%s7QATe_;9E9@kc4rFt^Ns*Od3B9QMZ4g>4~Yy zBM}e$7d|RAD{(C1gW>3Z1Ko!AaYsdsBiw7{iBaPq_<|FgodGEq{MhLk@a6@3HZT*G zT?j0AZ(?sWqH|_XEK4n%H;yiR*z!~48RqBM+zO>!pKEQidTS&W%u-b-6N@n&(hQW1 z9E1GG`DOSTGATKI{KPZ`nEdSI88xYwNqvxCT1ob765|H%Hbc1dAXffuRlEPe?B3J(l<^{A7QA0!WQRv5X zWl06$4no-#8+-fQKAs$v)bpHS?Ug{|u|1=G>WT+b4Uew)GYi4~7heV-?w3IOt$kJb zIjV}8df#7#s$cw>U*T(%>wq&zkA==(e3*7{yXuX96+hyt?}Xs|-cCoBC=1K=pBvF9 z_z{w7D)?klk|GULNMVVRkN~u{ClYdt^XAOPk-|t2;kQ>o9{g|gcTeeUmF^M?OLFt* zHcXV>BQxuU@8HZHnF>s(=&;E>Wracji2rLn(I74;t)L;d4Zgh^Sk=@gom{9KHGZ6a zmA%*pXY|4)r8CM)=VAYuui2C;$56!FpY<9hM20>$RlW|FDg==9@6`yVUhBs^fEm~P z_^tnul>Ub}Gc&D=d6q&;Y!z``VZE z)}XVL4|9fIoO z?g=*$Ty8qs?C<3jE2Cx>Qjb}~n42#4PiGk_p{Ch|<)vx41<3P&%9}2X64u@f#P@o~ zZ~C&#oABtSuk$ptp(jWciRCje4s#3;4EWV^i!Rem8BXG_s^X@h?a( zHwER68!E%=$bpB#-<{Dhp_LC zHy)&~-*Jo?h2nyL@=>*NML`}0hf<#jxPsoM6vcT$_z}@3J(dpm%}IRN8NWUl!>U@x zhMB+liYyO1dyz$weQcD`B8i9`mo9=0_iU@qpwu?otL!34K8ZmN{To?)x5Qz``18e! zB_~7i&f=Rha*9dd7D-q#T|(PvHAP8$0YiTtc(LRSlwsMFNQ`K1I7%)ct@uu-8hP}G z-yu+DIlgB>8GK`g$9jmoZ|S%rnviRF7NkGDOh6))sf9Q0+dC&DP<#+xQCQ(3t%V=Q z2yrzQ!>)(cW^W|XEEbUE0ul!GPp$2D2#D|kfV@PFqlK1g1zs4QY(*?R zs^fn=!|SNP6WShlT;S0YHhwLo9ryn9p2?Kcx?;TJn_0Y;;TU?rY@M@rtI&!Q_GN`Q z>WX(i|J2%c7NR1S9zyXoJYF9N%C$YSHM=Ho=ou1U6ALc0 zLt4br<03WS@Pq#G^k7KH9D~t|Bp$Sgza_!|P)h%Q_$a0Sx!{8(MOaV7ntqxVec+?WHErPg}VANg#xhx>A0wPYOGLM9Y0tKXIJViPL z8JU25BOui7770s-!0eKM(7iMvae~YYJduf5y46Kx1Z0hXWDAH8JClwJ$aDem`$z2P z9VMPX+Yq+FFyQ3iQwgcregF9y`2zv!k(4f6Lhph3q-g#rP4lv zOss&=Z7O~-7Lfl42;H3$vPuY%O#&kPtp_PZbRBwT3DiG!#trHBkKLIUa1HOD!QXh_ z3$9Px87~-y_i%Uv?-F{-b>*7C+^Pp;thWz@N&{?irM z&nI4el4hR>Ji5OkWU}D9GXk)+%vK>1cYu@=s31@Si5f*5V}Pn8{wbC)Z_+X+lz09q7O$gq^qJ@EpJG<@CS3Z{O;U-A zD|$hYvgi;?mI>u}p&W+g6GB;-Ly*=XX74KD&|?QELzWy@KtYWT?65=Z$O~nvB>ssE zW(zN*cKbt=nlw)W>OK^9FuF-(|b9ZJV#N*u# z6wloy4}?~I=@9s4Os6toxDw(M!)F%lr#C-Ql#mDxZvO2E7oSgYh~cCIIPN1GjvMgl zV2)cG62pncBn^8ThIeXh!uoTf0p8vm*B`GzoDqIj9RLY`MKa+HbN~8|Va_y!zRY2n hx1jFtI{YJk=dNeWjs}Zv2ZpKL6TmQH(c~IJ{tq~^P1*ne delta 16054 zcma)j30zZ07w_DKY)DvS-$4lbCdeYnq7d9rDvFAH#DKYqvK11S)&iDljX|p&Yqhmn zYFBM-6>FomilX9D7qnHxeW{JaQbbFwT6kw}0@%Lq_udzOx%bTfoHKLg%*>fH6Wpw0 zchs@5nYpcK6cQj7T|vFQZ-|fxq4nbs@qW`d z=0s3|YnS^{?rXpB8ZASHZ<43yOq;6xW$6P~q?LDTb2_#8UD}C{Ypc4DM${~Sg3x_2 zt;_GMNk*D7y)Q}>%#~MCvgTo1g+oV0GTOiWr35;R-a1&=1@8cKzU;J=n6c9OFK)+;B(nHCg<2pKkPVK?B=v?X-Jc0?PUdD5n!0H&J zlRq%LpQ@Gjtdid|j7{9h=;Y5Y+%&|E(#oIKRy{=;55wJ2+NR#P{jn%}{~l4c;o7L$ zBLe6QgYJ){bQ62_BYGc&RxQ8xx8XKub<|dMpx1m1J9sT!enP@-Bl@npWP$kB5gL(`3pk<_hJba31U8 zIw?&j@1W$5!SpQM#HYIa$GV&@(w~j^E!NBZ^U-~MaW`Ct0fD}(HCJ#6pJaWbVxBk4 zJHe>79@5^U(K`84!*B5HF$_-!gAh3BiT1&N6!|k|HtFqW{z5A3O69A_C3VD8hSLezFHJU2J#Wh3 zk)V}#8k`bfIs_fop3BmIin0tbqroGqa$5DLkiq}?DtW6`ewcr5=AYYi1bM8>Z_|0{ zG6XPv4Hx74E4VxtYIsC^s;8+{dj|Cys>ABet!`XZbp~Fo1o?z~3|j|uY^W?lBT-o; zKVvxhw^shduxx;v3fzwf*C6%+kCIO9@zmu!#Wg~wi5D%R&TCu$e5jRQj5-l@W#2^$ zQb&gOUIytr`Y%AdpN8Kyve&-E`;_!nUWdqgKcf}KT) zabK>=KdjB~S(U$8oBv>yd>c%%s4G$D$pEEDP1FNJtW=lZqsw3|BuKk_UN02zO3|Fb z4|Hj?A=gEh|3H^P8^Ro*e$0v|x%SjnvuFvgqhM>B>=W~^E}@OqM6ERChhD9QpHSl@a#C>}8t7eO%yir(2tk@l+I(Wym9xL4x-V_6%x|W{iWI zawoj^vsn!XU6U#Lh~aJb>Go|FurbtMh36Af_`iMNIxcpbv22v;IlLL$3(d{wdFR&NF&=1`;&H`0b{m=RvG{Qgd*gqwe7TG<4VBb?))q^xP`YPzx{2}-gS*F|j(9>?iT@Tm^ zYO9`;(U*5;={JJ_jjaN*-4F8o1;95coA`%;zs?sg2}q!!`tJe);ni>}V7vuQ3vhT? z5P8iAD}-0WfiPQ^s>SD`M#S6(tsW=veYgC1joNx;{_~nU)sel&-fXu*Mkgo|dY%=v z5*~bM#hdLoWoW#d7U?`$QPlaU#)Kw~Frh`m-2VvG11e=j`^1Q(frdq%%>o)y(q;h* z&-U$PnO3s?vJWqOB}sOx;ch z@{kmCB)?l$6Y$oiUSRA+Xn!U4jZU^}w~|0DE95=>hU3cU`0#mB!vVYc3TcR-6t;%$ z6m14wuZB{&xy05al}JTuNBv#!Ml8M@J)NE}#nCYZ^ea;QZcM0~H4AxM(x5Y(|qYvYrG@Pi-v9JY}#;Pq?NYQ5N(TX(nrv)ws>NC2%Th$Uri4c zbxN0A(bygA!e6KRdnL2lPDOt1%qE>sYoSZ(lxjWUn{2#K!kt8lAEjsGzea_-ZV)XP zsf%4NTGp)&S=Ox?Q3JDFt<*k&j4^ez*Yph{UFM`+GJ>dgu_EJp2f4lWn6}k0(H@oz)ab80ZurmNIC4z5ZP?$&hlW@b z)o5(jc7X_u%f<|&9^+5OBua?&8V6z^ZXYvF7An=oK9(kejg?|unj}#GR!MnR*i&5z zhZnXP--nLi+_A&0cG;6vtrqFhM273Qeym@0w^ZAoI3Miog+?#hYnzRmvb9Zy#l70Y z(DYGD?YWsv*^_nP(PdZE;=~MEEzx-yAL)C0!QpVSFq|Vq_GCDv)jptC$t9~G&&v@( zr}UqT4BoboRuewSrnODANe{$G6FbrlEfgrM^Z9K1YRo=66m`O|97m5EP3iE$aS={L z%5t9)JqW(*_q-#w=^Np`IMk7guZ>$%T`OFDXupLGq#QMOI%QhV<6>Ez=V38()r72W z(cJ;`q*!;MrQP&TR+DrLDjW$59Mv_398YYiu-s1}y?A`xNkhJ{u2I+4a>w*f!|drYm;t6`+~b-HIw@2 zUe1@VY9F{!NcEw_XSOrdZ#L3_kXT6N9t% z)#6(doNXSAt2_DqGMntI$#rK}-`MAd#hIS&UgP)DXm`qKpXph8g!Wk@gSY+k-4jmx zWa(@1=*%B|cZ>J+BE1bVqz>+N+%4{P+#}Yu-v6#=vi7jKjH4zhy$Y?2U+dgg2%FPr z3K{QrrwLiL4LDC{Pv%iX!_J9sQPj6MHLH*k<4>}tQVsZ7)(z?czVgzw$@|1E7ZZ+E zcxwcSNqTXGbN%o8gPz5Wy3vo8wby z(`3V@-mOohTA*`b_WXz?*=v|)K|5YJEzWzFHLM#kY($BIE^*~p*ew|KFer}f?Nx^v zezL}Arlrx6UTi;oh}+9h3fLL<_`o2&=zDeZAW z>zoW*y0k6EJN(ko#e!6~#(w{MqNUGv;ooMsQC(P^>n(>sw~*Dw!i&|mLJ%b9*FkU| z{at$u3~|}VAY-H6742hE47MiBVpZNC?oRsm~w7vt~bQM zM(sk{crd$uod_zi*EZ=Cb~+)|YC*%@Nh2PYGmMUr;H5b};#dg?h-;G?@%9`yn?`XW ztei@+h9GuqvBVd1JV~wHIjQu#4xBJ8u{s;#K#lAN(USx3iE5-jh*({k0K6#L+9l;f zI5GZNJ0Piqdf2XQh6V!bp??}$YoT4jHm9=)X(7n#maxatB?w-%$E3~a0)&hWWL4+0 zb!~=>C&p6{%9_n_r{&I0M%#Ab_Q9CVEEf;5Am&d+IeN^^!}InrfF3=8jLhrBKHmFIX*-aO(I-~SlN%Q`=V zx`Pw*lc`GlYQC4PqlLE9G>j}d(A#Tx7jMu17S@we;VVAy2resN*)`xg#W?1HxCyr@ z&PkDVeUG$R5F@9G*c{bZf7# z%%F_FFYU>b;233s)m+K`JR)sa`V4NRUQxQz@LI3@PfVvY>O5?guDU#W*(8C6)x{V) zN5Q+VtGmp*?4^6?Tu4^*@T61wZ0|0&glCk10r@IIJy*qlV!_1tHWS{9A!9 zwHezK2E{7TvJ=$;joq><3#70DB{e_Rz-H5F*h^`j!mHz{A|Eyk7!kNUIAOT)6y|hI zQYS7ebcugS+oC`_gBKs!XU!IwEE<a96Y1my-qp;?gZ-xD?!7DCA_O5)>Q?kL}{X1SUJEnTJ z&5S0#!QC^>%}ush1MQjivX+}mliVeb#cB_o)LjA{IBr;c2a<#Hns~CfzUnZoMxA4q zSnK#)YWU@*wwdG(>T9s%#RndXTW(FOYhB&ga{tjMgHJsASYbS(O9I);k&PiB(DG|_ z%Ps2CG*98mn;^0sM7Alkj?j{4m)Q7my}M-OW3h&6GHkk2{~U&&n6kA?4A#LctnU&h zG*#GW4~?WyRhXVa)bSKUMsFghR{Cl$x7=EGUhM@#_?ERU)?GrKsX3FPwb!t(Jn;1c(82Yb0oG3VnKP+?_MmAQDCA<*s{J6dfq4|G0CvzrnU)khGwA!GIlf^Qhg$(<0W`*S(O!Sjno}0nuzZ$tQ#Jc zjisFY?t#jEPr+2r$yq~tb*EbHFqfA$DI2n1E@RR{f1hroLmDCF7-@k>I>rzBZR$dI z29=^_AlayyM5P$6b%3k82#>k|fH&Y^w&6G=W`=jLK$A}Gz!NmHZ0kt4D7r>+6m8SW zEf&`J2hF>{o4Vi-Je?LQeOT+DL*G!T888$u1PYiF)AmwSRO3O`dMj6YW{+misiE@sLS1Kx<19}5$auv;W$-=cVUG}sV*uj9d6S9M?*?Z4HD)55BY}7#ZtN<@6}iV z)0o+a-&vYyX^$vG!#@VmIQ2Cz$X$DvIt{e}G+&di0bh8>r;w*#E_v>n3{OUv48%fW^+&5fVa`gB_-V1O?x|j~+PggoF3h+F1Mqr3$`u zyVfYJ6(TgRQc<}8G0a>^!<9ECQS?!|A$0i#ivEGd)QU0Hdr=_8X<%zP4F3=Zw~y#F zdI*#jsOQKVn&Nf=8BLv|xDS9BP1R6{`wXb}s1JeK3DiESk;okb@(MMB=8giZQys7$boS^;z8_zEZHD7^&VUNM|$rPU2y+D|CXiHTtlHy&hS zm}xBc6!y4GrW7D&fYi(ehO+|V73Ot-oPc^AAZW`M$Q{fn08@bKVG>y`83>jIA_)i& zHUW%4+&G{|veR&|F3@iYdyz%-8lUqN1dH$rm0D9#im1XoBKHNzt!7WNc!6#^bCF$* z{py05c6J$lscx2oi-p>P`xTDT;TE$jxO+fMwU~vE)kQL^E&T9bbtz1}g*zUx%9rV~ zu*Aw$!(#jd^8}=+<5W4K*Su8_uncqQ=u}M+pX*RZA8OMa$~Jm_zzGrcbT1yn=MR7*AN^ zWA_S~BD^7Uz)FCZ;OaGhR{t!Dx8u63U`~nzmfUtA7>E{#I{{Rl_?nnI07Rj<8KC1p zod5{D_$!chl4TO^DiAJ`G6~}D0rfIKzH4FPJE zrS%}r8Hnn2mQMil1@b9ippgpXs6l%Maj`&*9kgW-%sQaz0RrxLAoYV}&;a)-koi_~ ztvLk{Dy#Wch3^K)fn#0q%R%Kwbb0 z*q^}TzH}N)1rEXEE$a=o++M)eTW_*P+$ErXw|?1%`w@t4>s%YeT?8u6=4BgD_yfp~ zZJcenb|ALfP_~GB3>0JQYzy38AYE>AXXiRDcf#A=4Ht301Nw?%HQu;>C^O!v2%lLW#4L9T!B5v` zG4DDJ!I|&+S$*O3g%jd74+d8PQuS^i6XJXZfAMZAGs5{e{_S1gK~>JXoVi4Mgx+xe z61!~(V$V1)aDfIQ@uCej%nj#qtlQu_$j2qug}V$=0WOp9-VOdX3tTq3@C#n*0Kw8_ z4er?B>$TCv%hlwwa+L~vRzb}tD~Q_%GGDnk;)sp^8Pwt;b>;K`Tz3)R4I4ulFV|+= zyzy%$()A!-{GKdik?R3h#Qo@q(BH0JZZJ21igcR{)J>oY+-iYp2MW7=i%-56NyXr2 z@3jPxkOA8&S&s}ePtpk!!G`{2AfQkvCnFVDZTOG(qr98l{&q7DZrN;NX%#h}2y<&- zWnXc7+#uhSOxgVH*5c0haU2Z1wfk}W&IcN+*W7jPh#L#Y=kATzX>*`Wi+h(zY$L| z#C4xIGkPCA{_K-5_Lz^v7w3Kyjs>6EGnaf=?D6SPM&dghPyV!)aq}J8(E6zp#S9-Z z2X}o|$BZAMz)L^B%g*up$PfE$3lyG&75R$adw9baLF`9K}?$; zTwZPqV}A3q#97;dnZf>D9ivwN_Aj!o|oV>#Uuijy8^G3i96Z;0R*9UxpzuFPP>KW0=GV2=?ty-RFb81~$pXg!wG61-z_r2L8$fV@+F))m5Gcqu zm|FydILIZKTL?sckaaMb<+VWj25Wix5YV3ne;3L%0rn1nASQ&AgmSxqm>QxA zK>+o3UQM~b+ps}Jbzc3B~;0^=`dI32x?AI{P9tc&~ zqA(4~^!Py29H^Sp0 z%rPIvY!$I-3&4McTSh=W1e8Za1YWpP#-v1~;173ZF)u~L<3~IF6PHE=MR6;fz{`YC z0C6Yc9_YLY)RPF`C~i3rmXScb3Peq0Z6tUWsH>5_ID1#rkd&y(D1IQ@0Gu2(FN!-0 zL|#;06yh!eH8*N5{%ltSwGLm})e=Ag(tH&ew0Ty)gOScP)LnS>rz`VSi-FgU&o%_} zNigI}^9#rji?DF_5Sz*<+o3c`sCGb(ql=>P@ZG75?a)qKwcFXxf9S762V77`Tmbh! zD12zaP{aiTRXX%nyl?kNrgLZte!4rDVWZ=4z_+QCZ$r_yENw+>o2ydJCdNteE8j&k zDbZgveDhrv#b!s>N8^qAe6auC5sWUn9?#wz%6t*6#2DV+N6)~A_Xc`*M-PqR_Cipz ziV2Q^#?Js56Eh=*I}Jo~%u86ZFO*TnY{m)u;u&?!daT}85mOiQVGOKk3xtlxTnFkp zP~m?SUh&!zlGU6>@)oR{%OqD!|Ji)_Ze2Fhus2+ zFz7>CtP;=rK9ahG-~aw7->bf(L_03|A)2ypsQ+OV#e5d)jH3?jcHbLo8^^m%T{fSr z_m$*C@D{l1bnH)&J2;-=v@8&|RaiCY+tJr6tL@Ixx5G_DM~vcTeD62BJ0o2GsB>P>FIkz5O$ zR^}wmON0Oh)LV&Lfcgt4ixHDXa8G~;B*dRU3>}d$f;2`BGxJAm9Kj6&Vl@ze4FfW9 z09B$*j!BkD(MjAm0Z?H{(fIo#fxekZZzP$QxU!;B zMMCfrYW^S?4{jZZDU)8sf}@dCIF37dlX)ZQK6X78#=M(!3y(WCfw`Zw32!`>!u*|t z@zrBP2PG!wC3Ci*o0&WVyEX?io08*jMzaUABRL$;X&%Y^kSxTXH3v$6Om0ht7H)&6 zb;=NYt=T_#WD1=07|5{|itH)l5i{i<2j2(1JrjUK|xVrj0dTvZxg2W;+y$*=2+Y z4ZM`r*DbEn46W~j_zFN~GXT8(g~er+Dg{?mOw8}@7pqY5n%L%qiy}R}ufEa}WpQy? zAxQRPeF(b_I>8^|6beNt1ex*z)f~jGe*w)bDlHlVjLD>Xh}~dj;T0#moyuS6q^hE# zw2XAJCmm;=bfIWG=cI?r1IRZ__49nhc9;SD!AbA5_g-kHsH_07yWosvHis)AxgOiu zUx7j~2|SgphAWnmO2l^cRYaW{?4AZ=Y8nd#oG8mmW1|q8XU1^ksUh%V>y%RglngI9 z6$nA8-!o8`*)`weeW!w`V0`yfKydb$egSeI2FLXyrZP*;IK)mo?8h)i`>}oEFq)>3 zLCiaN(U0ygecH$3%sAWqLVqTgOeras!yw8_5%PP%mvDS7Rdd9d$NMTUK??lCk4`>@ zKCrS(Q#u>Wdv%=Ig3>Y`!XBri;paUVQcZEO5;}<(@`s~fF|3-xO0}{=4O;WzZ$?ef z#4@!ay|hd-XRabsRZ>>57`W>p)|t2p)uJLI|Lp)WyUYYGEK<)^lvK`90Q<=RJ0pEc znnyNVT4kE&tH~0DJS$yMp)N%Xg&&*_b*6!BYNC=%NJSxxI8;RA$TLF+_cOs2@v(~l zUye0r{Hc%e`)B;%Lb36TFQvzK&iJ}D_P0X1YcdR40gXoNebznoP+v3Ve%$CQn>)tt z7V~xxhbf@7q0u}8v3txoe(h{X`0xE%WZe}jOgDbe$eR=UI|&Sc0s9zVJS(Gy;J?oX zQD<<#xd`eCo^~$O{a#kTtfm|;B~=5}_~I?+T&UrA@43M0#L0b*Q4|%FC<=uQ_?!Nx@9wyMRKI*3=a_)#tRs}@)4Cw#nRSasuovkEm81r_rVdwc-Oo{~Cx zJcM7wp8OX$Wl|Pme;fb{3l^(keV=&&nOjsm8?omGkkYdFIK*Bb02K0Sm_l=vrL&7k zFgiTIDX%O?Ed2CKCKMS+;;ym<#Sqbzg<#^v0Zs*61H&cpi`=#Wu4$bTO%h!ZdwYO2 zp?q}7Y{i74Qh@Kh2xrYHnMkg%*dqgI8BFPUWnkmce_%zW1cST&K085LC?KLrmTKENFtlZluY%2T0?Qelep?O%muC2Fo%Ifn$K$=SH(XD1Q4O(dSi zTYmQTp8<85r(@sN)icFxmw7Amn2PWI>`#xHiY+e&I?kEeZ#4<1TsfGvZYmyoF*rg$ zz~VzQ;i2Fcj46ft$x@YSHZf*w4qo?D0G*YCfB4CXcAbVV{uDfM;q-oMV65g(EuW}b zm`QdpXygv?%t38}vQjNKMR$uC{TivW=V>a{sU;9tNyr;F15fQf-~D9SZzvNzLswtpTsG@JA#>gO86Bd3nTU zfg~R#TrYdtzCBRo*qAiLT)|^62T%(9^5vjv%`CHb3c&>sen_$e&8_+u%<O(09q>tMCD+!Np$cFC=X(nHdj$c-)v26^QIQzytY7UF<#atgFlk_ zvMtzY>wpqhtf`!98mpi1Zy8_w6E#J>oO;LcAqDp zQ3d}y7_?xI7hR964(R78=2Vm|R1}pF+kw4(fKfRYa-R7EtRn-g>;eC<&-=G7*r~w@ zecmbPx7m~cCcsfF2qqp0Va_B6SC$kM&xd7142K{1O+E{}I>gIC)n_E*;D$R@jKw#Dsa70wQ%3()j`MEH+@rBUDiHG=juB8D z>|tqTV<%3T4E83!Z0dywVrmimrliE_w*sjJxb#*S^*Y{k%Z1vF_uLACKZdw@%is1o zOj5oAjk-(;+C#A8ZGS2WkGLI_#Q#XjS6*7CsMM5~mqG4Jej8SSU)cBo3l-_|423Dn zM(l7ijW(}7zHJgDd1U6O(b;1wr;yo% z*c_;i50>NZ_zbS?s{xW#lf7eb)g3>(_ZRf_!VGud-FIY8(uI8u@(YVU_#ws>KfDtz z+QFI{!~u8xs6ag7u1kC>i1Tx-5KOC3%r1ZlrZ&xKCa=FLMM(j_d=NXLucsf}brpQ) z2FGj>?$x<8T)Zn|Ro}V!qFP}dbJ3z!$fCKh1Hd_)|H$A;qYk*gqv>YQ`qH6_sTCHY zHjpHLn+$hW%!`tz!igl@$f48JZIFcDv_+)Oc~-SpdEcQrB^vHHn7hDPjOM`&Ta8H> z+4JqJhWi?tZU?-teG~pRta6(EEEb__a0Nj=COinT7n+9q3e-TE@JM*k$U2QI(D)RB z#lbfgs=G<*6e1E=WFow#-5%St3xs7UP)1I8ZTnyx*)D+lgSd7t+dVw`4C;*MHS2Ix zr@av7G)u$D{>ygf2Z=)H8mpgoER0Mh~ zP2;y7c)_XfYk2O!XW^;Gzd!J@VPHJ4 zO@}~uke9Y2wcto7xA0{TzMKW+PQH#{zFZFF4xTUN%WI$v)uD4jnpldzfig+_5lZ6u z=Q;!tBvFU^Y4Yg*ma`csX zEt>cyo5`7#rTM>JL1n;50-Kj%>rOWcJc8_=|yjxi9dYkEPMyL#?oJ79WdPR zc6bKkQ}9IC2+w$I`Oph;+>nP}t|Z4r@SkVF4B`ZSqIpBfw8Dky&?lCD8&`vZ0&jt* z1|NLrWxY@dGKiSz+3!0Q^o^w#nK&lD@W^5w;m6r(7mw(8#F>}5$|EGPgeb!!p3_J@ zmwCj2N78wugGX|Bq?AX}3W(OHJhF~Q+Ib{|Ai{k-;(*1EysSz3Y4WsppS?mE9C27W z1^@8K#c486lT;IaM2D|0?~G7VPuw-0SJPhukuiNtBg4X>h^0v`3HPt?oyhCj6J5(S zJg=a?%>#Uy#xFm1@v(rz4NH@h51|hD+QHWpxi*1(kcbZ&!`AUqcSn&Q*Bd}94ayfHM<@_NoAB&|Tm0luXFrpWR! zk-{%`yTSkFS=H@Dy^p_wrxc&=_Oe(_YR3<|-Mj-A5>1vewfJvuMlv|-Zx@{Y=M1}0 zW>ADZ!$f?Lz%cKJ#WSMuc+Z~($A}@b7&gMsk70)RB>-7FE0Xb5;9XCm8NeIvJ^7BJ pnj1Dh&8Ok-YX5$|3eGROzaLYdHPrMtQ`8#`8+$1Mn^TL>{{dj@!)*Wn diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 319f80fd..d3fdbdae 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -26,7 +26,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * FUCK well i am stuck.... wwww */ -//++++ map->data[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/src/scroll.c b/src/scroll.c index 37df7d48..0044abdc 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -121,7 +121,7 @@ void main() { }*/ /* create the map */ - printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); +//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); loadmap("data/test.map", &map); //---- 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()); @@ -134,14 +134,14 @@ void main() { ptr = map.data; mappalptr = map.tiles->data->palette; /* data */ - printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); +//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite /* create the planar buffer */ - printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); +//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); p = planar_buf_from_bitmap(&ptmp); - printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); +//0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); /*if(isEMS()) { @@ -243,8 +243,6 @@ void main() { //----modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255); //----modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255); modexShowPage(spri->page); - //printf("Total free: %zu\n", GetFreeSize()); - //printf("Total free: %zu\n", GetFreeSize()); // printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize()); modexFadeOn(4, gpal); while(!keyp(1) && player.hp>0) -- 2.39.5