From 3c3e5dcb0b7f062dce2115736da20dc2ec60e129 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 13 Jun 2016 11:34:05 -0500 Subject: [PATCH] hmmm --- src/lib/modex16.c | 8 ++++---- src/lib/scroll16.c | 2 +- src/scroll.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 149283a5..271a84ef 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -271,11 +271,11 @@ void modexHiganbanaPageSetup(video_t *video) video->num_of_pages=0; (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++; //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD); (video->page[1]) = modexNextPage(&(video->page[0])); video->num_of_pages++; - (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), (video->page[0]).width, TILEWH*4); video->num_of_pages++; - (video->page[3]) = (video->page[2]); video->num_of_pages++; -//++++ (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), TILEWH*4, TILEWH*4); video->num_of_pages++; +//0000 (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), (video->page[0]).width, TILEWH*4); video->num_of_pages++; +//0000 (video->page[3]) = (video->page[2]); video->num_of_pages++; + (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), TILEWH*4, TILEWH*4); video->num_of_pages++; // (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].width, 176); video->num_of_pages++; -//++++ (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 208); video->num_of_pages++; + (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 208); video->num_of_pages++; // (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, 172); video->num_of_pages++; // (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), 72, 128); video->num_of_pages++; modexCalcVmemRemain(video); diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 2103a8a6..06b9bca1 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -526,7 +526,7 @@ void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid) mv[0].video->page[id].dy += player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dy >= mv[id].dxThresh ) + if(mv[0].video->page[id].dy >= mv[0].dxThresh ) { /* Snap the origin forward */ mv[0].video->page[id].data += 4; diff --git a/src/scroll.c b/src/scroll.c index 6e2e96da..e21ea54d 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -235,10 +235,10 @@ void main(int argc, char *argv[]) } if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; } //debugging binds! - if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; IN_UserInput(1,1); } - if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; IN_UserInput(1,1); } - if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; IN_UserInput(1,1); } - if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; IN_UserInput(1,1); } + if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; } + if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; } + if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; } + if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; } if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page); IN_UserInput(1,1); } //p -- 2.39.5