From 48c235e3b3dd14caad47396c044f0c7c10ebf770 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 17 May 2016 13:34:39 -0500 Subject: [PATCH] joncampbell what is going on? ^^ --- src/lib/modex16.c | 11 ++++++----- src/lib/scroll16.c | 4 ++++ src/lib/typdefst.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 602e07e2..25399014 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -267,6 +267,7 @@ void modexHiganbanaPageSetup(video_t *video) // (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), 72, 128); video->num_of_pages++; modexCalcVmemRemain(video); video->p=0; + video->r=0; } void @@ -1116,13 +1117,13 @@ void modexcls(page_t *page, byte color, byte *Where) void modexWaitBorder() { - while(inp(INPUT_STATUS_1) & 8) { + while(inp(INPUT_STATUS_1) & 8) { // spin - } + } -// while(!(inp(INPUT_STATUS_1) & 8)) { -// // spin -// } + while(!(inp(INPUT_STATUS_1) & 8)) { + //spin + } } void bios_cls() { diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index c78c8e68..312a76e6 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -781,9 +781,12 @@ void shinku(global_game_variables_t *gv) break; } if(pageflipflop){ + if(gv->video.r){ modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height); modexShowPage(&(gv->video.page[gv->video.p])); //this is slow as fack too!! gv->video.p=!gv->video.p; + gv->video.r=!gv->video.r; + } } } @@ -854,6 +857,7 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll if(3>ls && ls>=2) { FRAME2 }else if(4>ls && ls>=3) { FRAME3 }else if(5>ls && ls>=4) { FRAME4 } + pip->video->r=1; //TODO: mask copy //modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40); //modexClearRegion(top->page, 66, 66, 2, 40, 0); //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40); diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h index a82a8bd0..0f47b2b1 100755 --- a/src/lib/typdefst.h +++ b/src/lib/typdefst.h @@ -115,6 +115,7 @@ typedef struct word vmem_remain; //remaining video memory byte num_of_pages; //number of actual pages boolean __near p; //render page number + boolean __near r; //page flip if true word pr[MAXPAGE][4]; //render sections of pages } video_t; -- 2.39.5