From 160bb0a359c6aee73b6738f3e5f97766fb367836 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 26 Mar 2015 10:17:02 -0500 Subject: [PATCH] oops forgot to remove debug stuff~ modified: scroll.exe modified: src/lib/mapread.c modified: src/scroll.c --- scroll.exe | Bin 60398 -> 60340 bytes src/lib/mapread.c | 2 -- src/scroll.c | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scroll.exe b/scroll.exe index 369e5afeb6f0b12edac53a9086a608324a18630d..3417aed02f113d926beaac8d44a2b889ab296097 100644 GIT binary patch delta 15404 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 delta 15210 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 bhFJ*FH`Xy4*ni^@^V#-YHw8ZF6+-?WR}~ZK diff --git a/src/lib/mapread.c b/src/lib/mapread.c index f0e8ac0e..a55f21a0 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -50,9 +50,7 @@ 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)); - printf("ed.pcx\n"); bp = bitmapLoadPcx("data/ed.pcx"); - printf("ed.pcx\n"); 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 1b96a6d2..a6ee75cc 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -521,8 +521,8 @@ void main() { } if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; } //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; } - modexDrawBmp(bg->page, 0, 0, map.tiles->data); - modexDrawBmp(spri->page, 0, 0, map.tiles->data); +// modexDrawBmp(bg->page, 0, 0, map.tiles->data); +// modexDrawBmp(spri->page, 0, 0, map.tiles->data); if(keyp(87)) { modexLeave(); -- 2.39.5