X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=2d4c00242676ffd4401578c3fb6f024599199c21;hb=e3b220f5349f8282bd426fdca00c64c8c7e831cd;hp=e135d534469c642ace75cdef4a71a3dcdfc1c993;hpb=253ecc161398a657d7393476d374f8304365af3c;p=16.git diff --git a/src/lib/modex16.c b/src/lib/modex16.c index e135d534..2d4c0024 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -92,6 +92,9 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) { case 1: //CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]); + /*for(i=0; ivideo.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this @@ -148,11 +151,13 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) } break; } - gv->video.page[0].tilesw = gv->video.page[0].sw/TILEWH; - gv->video.page[0].tilesh = gv->video.page[0].sh/TILEWH; + +// gv->video.page[0].tw = gv->video.page[0].sw/TILEWH; +// gv->video.page[0].th = gv->video.page[0].sh/TILEWH; + //TODO MAKE FLEXIBLE~ - gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw; - gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1; +// gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw; +// gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1; } void @@ -167,20 +172,22 @@ modexDefaultPage(page_t *p) page_t page; /* default page values */ - page.data = vga_state.vga_graphics_ram;//VGA; + //page.data = VGA; + //page.data = (byte far *)(vga_state.vga_graphics_ram); + page.data = (vga_state.vga_graphics_ram); page.dx = 0; page.dy = 0; page.sw = p->sw; page.sh = p->sh; - page.width = p->sw; - page.height = p->sh; + page.width = p->sw+TILEWHD; + page.height = p->sh+TILEWHD; page.tw = page.sw/TILEWH; page.th = page.sh/TILEWH; + page.tilesw=page.width/TILEWH; + page.tilesh=page.height/TILEWH; page.tilemidposscreenx = page.tw/2; page.tilemidposscreeny = (page.th/2)+1; - page.tilesw=p->tilesw; - page.tilesh=p->tilesh; - page.pagesize = page.width*page.height; + page.pagesize = (sdiword)(page.width/4)*page.height; page.id = 0; return page; @@ -193,13 +200,15 @@ page_t modexNextPage(page_t *p) { page_t result; - result.data = p->data + (p->width/4)*p->height; + result.data = p->data + (p->pagesize); result.dx = 0; result.dy = 0; result.width = p->width; result.height = p->height; - result.tw = p->width/TILEWH; - result.th = p->height/TILEWH; + result.tw = p->tw; + result.th = p->th; + result.tilesw = p->tilesw; + result.tilesh = p->tilesh; result.id = p->id+1; result.pagesize = p->pagesize; @@ -212,15 +221,17 @@ modexNextPageFlexibleSize(page_t *p, word x, word y) { page_t result; - result.data = p->data + (p->width/4)*p->height; /* compute the offset */ + result.data = p->data + (p->pagesize); /* compute the offset */ result.dx = 0; result.dy = 0; result.width = x; result.height = y; - result.tw = p->width/TILEWH; - result.th = p->height/TILEWH; + result.tw = result.sw/TILEWH; + result.th = result.sh/TILEWH; + result.tilesw=result.width/TILEWH; + result.tilesh=result.height/TILEWH; result.id = p->id+1; - result.pagesize = result.width*result.height; + result.pagesize = (sdiword)(result.width/4)*result.height; return result; } @@ -228,25 +239,28 @@ modexNextPageFlexibleSize(page_t *p, word x, word y) void modexCalcVmemRemain(video_t *video) { byte i; - video->vmem_remain=262144; - for(i=0; i<=video->num_of_pages; i++) + //printf("\n\n 1st vmem_remain=%ld\n", video->vmem_remain); + for(i=0; i<=video->num_of_pages-1; i++) { video->vmem_remain-=video->page[i].pagesize; + //printf(" [%u], video->page[i].pagesize=%ld\n", i, video->page[i].pagesize); + //printf(" [%u], vmem_remain=%ld\n", i, video->vmem_remain); } } void modexHiganbanaPageSetup(video_t *video) { + video->vmem_remain=262144L; + video->num_of_pages=0; (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++; - video->page[0].width += (TILEWH*2); video->page[0].height += (TILEWH*2); + //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD); (video->page[1]) = modexNextPage(&(video->page[0])); video->num_of_pages++; - (video->page[2]) = modexNextPage(&(video->page[1])); video->num_of_pages++; - //(352*176)+1024 is the remaining amount of memory left wwww - modexCalcVmemRemain(video); - (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 92); video->num_of_pages++; + //(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40); video->num_of_pages++; + //(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH); video->num_of_pages++; modexCalcVmemRemain(video); - //gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww + video->p=0; } + void modexShowPage(page_t *page) { word high_address; @@ -280,21 +294,18 @@ modexShowPage(page_t *page) { outp(AC_INDEX, (page->dx & 0x03) << 1); } - void modexPanPage(page_t *page, int dx, int dy) { page->dx = dx; page->dy = dy; } - void modexSelectPlane(byte plane) { outp(SC_INDEX, MAP_MASK); /* select plane */ outp(SC_DATA, plane); } - void modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { word pageOff = (word) page->data; @@ -313,6 +324,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { } __asm { + PUSHF + PUSH ES + PUSH AX + PUSH BX + PUSH CX + PUSH DX + PUSH SI + PUSH DI MOV AX, SCREEN_SEG ; go to the VGA memory MOV ES, AX MOV DI, poffset ; go to the first pixel @@ -346,6 +365,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { ADD DI, nextRow ; go to the next row DEC h JNZ SCAN_START + POP DI + POP SI + POP DX + POP CX + POP BX + POP AX + POP ES + POPF } } @@ -363,7 +390,7 @@ modexCopyPageRegion(page_t *dest, page_t *src, { word doffset = (word)dest->data + dy*(dest->width/4) + dx/4; word soffset = (word)src->data + sy*(src->width/4) + sx/4; - word scans = width/4; + word scans = vga_state.vga_stride; word nextSrcRow = src->width/4 - scans - 1; word nextDestRow = dest->width/4 - scans - 1; byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08}; /* clips for rectangles not on 4s */ @@ -372,6 +399,15 @@ modexCopyPageRegion(page_t *dest, page_t *src, byte right = rclip[(sx+width)&0x03]; __asm { + PUSHF + PUSH ES + PUSH AX + PUSH BX + PUSH CX + PUSH DX + PUSH SI + PUSH DI + MOV AX, SCREEN_SEG ; work in the vga space MOV ES, AX ; MOV DI, doffset ; @@ -420,6 +456,15 @@ modexCopyPageRegion(page_t *dest, page_t *src, MOV DX, GC_INDEX+1 ; go back to CPU data MOV AL, 0ffh ; none from latches OUT DX, AL ; + + POP DI + POP SI + POP DX + POP CX + POP BX + POP AX + POP ES + POPF } } @@ -981,6 +1026,15 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c } //load the letter 'A' __asm { + PUSHF + PUSH ES + PUSH AX + PUSH BX + PUSH CX + PUSH DX + PUSH SI + PUSH DI + MOV DI, addr MOV SI, o MOV ES, s @@ -995,6 +1049,15 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c INC DI DEC CX JNZ L1 + + POP DI + POP SI + POP DX + POP CX + POP BX + POP AX + POP ES + POPF } for(i=0; i