From 1d95a4956ac181ff21f699ba6aed019d002d3c67 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 14 Apr 2017 15:59:58 -0500 Subject: [PATCH] p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] MM_ShowMemory is quite buggy on real machines. i need to debug it and fix added a struct printer[gvar.mm is FUCKING HUGE 14402 bytes FAT\!]16_rf now compiles BT UNKNOWN ON WHAT IT DOSE\! text box creates a ghost because page 1 do not have bg info thus it is stored and saved.... wwww fizzfade being worked on and no idea how to make it work...[xcroll is fixed resuming fizzfade testings] --- src/bakapi.h | 2 +- src/lib/16_vl.c | 16 ++++++++++------ src/lib/16_vl.h | 3 ++- src/palbomb.c | 2 +- src/palettec.c | 2 +- src/palettel.c | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/bakapi.h b/src/bakapi.h index 484646d7..ec7091cd 100755 --- a/src/bakapi.h +++ b/src/bakapi.h @@ -35,7 +35,7 @@ #define DOFSS BDOFSCONV (gvar.video.DOFS)//gvar.video.ofs.displayofs #define SETUPPAGEBAKAPI \ -gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]); \ +gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video); \ gvar.video.page[1] = modexNextPage(&gvar.video.page[0]); #ifdef BAKAFIZZUNSIGNED diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c index 882dd3d2..bc5ee4dd 100755 --- a/src/lib/16_vl.c +++ b/src/lib/16_vl.c @@ -354,7 +354,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) //-- VL_SetLineWidth (cm.offset, gv); //gv->video.ofs.displayofs = 0; //gv->video.ofs.bufferofs = gv->video.page[0].width*gv->video.page[0].height;//gvar->video.page[0].pagesize; -// gv->video.curr_mode=vq; + gv->video.curr_mode=vq; gv->video.VL_Started=1; } @@ -364,11 +364,11 @@ void modexLeave(void) VL_vgaSetMode(TEXT_MODE); } +#if 0 page_t modexDefaultPage(page_t *p) { page_t page; - /* default page values */ //page.data = VGA; //page.data = (byte far *)(vga_state.vga_graphics_ram); @@ -389,10 +389,14 @@ modexDefaultPage(page_t *p) page.pagesize = (word)(page.stridew)*page.height; page.pi=page.width*4; page.id = 0; - + if(ggvv->video.curr_mode = 1) + { + page.width += TILEWHD; + page.height += TILEWHD; + } return page; } -#if 0 +#endif page_t modexDefaultPage(page_t *p, video_t *v) { @@ -424,7 +428,7 @@ modexDefaultPage(page_t *p, video_t *v) return page; } -#endif + /* returns the next page in contiguous memory * the next page will be the same size as p, by default */ @@ -513,7 +517,7 @@ void modexHiganbanaPageSetup(video_t *video) { video->vmem_remain=65535U; video->num_of_pages=0; - (video->page[0]) = modexDefaultPage(&(video->page[0])/*, video*/); video->num_of_pages++; //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD); + (video->page[0]) = modexDefaultPage(&(video->page[0]), video); 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++; //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++; diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h index 6437e1b9..535b36aa 100755 --- a/src/lib/16_vl.h +++ b/src/lib/16_vl.h @@ -158,6 +158,7 @@ void VGAWRITEMODE(byte x), #define VW_Hlin(x,z,y,c,q) VL_Hlin(x,y,(z)-(x)+1,c,q) #define VW_Vlin(y,z,x,c,q) VL_Vlin(x,y,(z)-(y)+1,c,q) +#define PALPROGRAMSNEWPAGE gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video);// modexFadeOn(4, &gvar.video.palette); /* -============================ Functions =============================- */ /* mode switching, page, and plane functions */ @@ -173,7 +174,7 @@ byte VL_vgaGetMode(void); extern void TL_VidInit(global_game_variables_t *gvar); void modexLeave(void); void modexsetBaseXMode(); -page_t modexDefaultPage(page_t *p/*, video_t *v*/); +page_t modexDefaultPage(page_t *p, video_t *v); page_t modexNextPage(page_t *p); page_t modexNextPageFlexibleSize(page_t *p, word x, word y); void modexCalcVmemRemain(video_t *video); diff --git a/src/palbomb.c b/src/palbomb.c index 643d7148..fbfa7251 100755 --- a/src/palbomb.c +++ b/src/palbomb.c @@ -26,7 +26,7 @@ void main(int argc, char *argv[]) { TL_VidInit(&gvar); VGAmodeX(1, 0, &gvar); - gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/); + PALPROGRAMSNEWPAGE VL_ShowPage(&gvar.video.page[0], 1, 0); modexpdump(&gvar.video.page[0]); while(!kbhit()){ VL_modexPalScramble(&gvar.video.palette); } diff --git a/src/palettec.c b/src/palettec.c index 6607aebb..1e55aca5 100755 --- a/src/palettec.c +++ b/src/palettec.c @@ -26,7 +26,7 @@ void main(int argc, char *argv[]) { TL_VidInit(&gvar); VGAmodeX(1, 0, &gvar); modexSavePalFile(bakapee, &gvar.video.palette); - gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/);// modexFadeOn(4, &gvar.video.palette); + PALPROGRAMSNEWPAGE VL_ShowPage(&gvar.video.page[0], 1, 0); modexpdump(&gvar.video.page[0]); while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ } diff --git a/src/palettel.c b/src/palettel.c index 7ef2c526..7f548934 100755 --- a/src/palettel.c +++ b/src/palettel.c @@ -27,7 +27,7 @@ void main(int argc, char *argv[]) TL_VidInit(&gvar); VGAmodeX(1, 0, &gvar); VL_LoadPalFile(bakapee, &gvar.video.palette, &gvar); //modexLoadPalFile(bakapee, &(gvar.video.palette)); - gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/);// modexFadeOn(4, &gvar.video.palette); + PALPROGRAMSNEWPAGE VL_ShowPage(&gvar.video.page[0], 1, 0); modexpdump(&gvar.video.page[0]); while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ } -- 2.39.2