From: sparky4 Date: Thu, 13 Apr 2017 23:51:09 +0000 (-0500) Subject: p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I... X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=9305b6a1120ac43866481377387b14daaccb6c38 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...[exmmtest.exe fixed stack was just too small] --- diff --git a/src/bakapi.c b/src/bakapi.c index 034649c4..fa03d403 100755 --- a/src/bakapi.c +++ b/src/bakapi.c @@ -32,7 +32,7 @@ void TL_VidInit(global_game_variables_t *gvar){} //int ch=0x0; #define SETUPPAGEBAKAPI \ -gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video); \ +gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/); \ gvar.video.page[1] = modexNextPage(&gvar.video.page[0]); @@ -45,7 +45,6 @@ main(int argc, char *argvar[]) int i; word panq=1, pand=0; boolean panswitch=0; - word showpage=0; ggvv=&gvar; @@ -141,21 +140,19 @@ main(int argc, char *argvar[]) //getch(); //____ //VL_SetLineWidth (40, &gvar); - VL_ShowPage(&gvar.video.page[showpage], 0, 0); + VL_ShowPage(&gvar.video.page[0], 1, 0); { word w; for(w=0;w<64000;w++) { - ding(&gvar.video.page[showpage], &bakapee, 2); + ding(&gvar.video.page[0], &bakapee, 2); ding(&gvar.video.page[1], &bakapee, 2); } #ifdef BAKAFIZZUNSIGNED - baka_FizzleFade (gvar.video.ofs.bufferofs, gvar.video.ofs.displayofs, vga_state.vga_width, vga_state.vga_height, 70, true, &gvar); + baka_FizzleFade (gvar.video.ofs.bufferofs, gvar.video.ofs.displayofs, gvar.video.page[0].width, gvar.video.page[0].height, 70, true, &gvar); #else baka_FizzleFade (&gvar.video.page[1], &gvar.video.page[0], vga_state.vga_width, vga_state.vga_height, 70, true, &gvar); #endif - //ding(&gvar.video.page[showpage], &bakapee, 9); -// modexprint(&gvar.video.page[0], gvar.video.page[0].sw/2, gvar.video.page[0].sh/2, 1, 0, 47, 0, 1, "bakapi ok"); } while(!kbhit()){} @@ -277,7 +274,6 @@ main(int argc, char *argvar[]) printf("on."); break; } - printf(" Showing page %u", showpage); printf("\n"); printf("Incrementation of color happens at every %uth plot.\n", bakapee.bonk); printf("Enter 1, 2, 3, 4, 5, 6, 8, or 9 to run a screensaver, or enter 0 to quit.\n"); @@ -312,18 +308,6 @@ pee: } key=0; break; - case 'q': - switch (showpage) - { - case 0: - showpage=1; - break; - case 1: - showpage=0; - break; - } - key=0; - break; case '8': c+=8; case '1': @@ -335,12 +319,11 @@ pee: case '9': key = c - '0'; VGAmodeX(vgamodex_mode, 0, &gvar); - VL_ShowPage(&gvar.video.page[showpage], 0, 0); SETUPPAGEBAKAPI // this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in. // we'll integrate DOSLIB vga into that part of the code instead for less disruption. -- J.C. - VL_ShowPage(&gvar.video.page[showpage], 0, 0); - break; + VL_ShowPage(&gvar.video.page[0], 0, 0); + break; case '-': if(bakapee.bonk>0) bakapee.bonk-=100; @@ -352,11 +335,12 @@ pee: break; default: key=0; + clrscr(); //added to clear screen wwww break; } - clrscr(); //added to clear screen wwww } } + clrscr(); //added to clear screen wwww #if 0 //#else // !defined(BOINK) // FIXME: Does not compile. Do you want to remove this? diff --git a/src/exmmtest.c b/src/exmmtest.c index 9fb1730b..fd849790 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -69,7 +69,7 @@ //////////////////////////////////////////////////////////////////////////// #ifdef NOVID -//void VL_Startup (global_game_variables_t *gvar){} +void VL_Startup (global_game_variables_t *gvar){} void VL_Shutdown (global_game_variables_t *gvar){} void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv) { diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h index 7c6cf37f..bd762016 100755 --- a/src/lib/16_ca.h +++ b/src/lib/16_ca.h @@ -27,7 +27,7 @@ //=========================================================================== -#define NOMAPS +//#define NOMAPS #define NOGRAPHICS #define NOAUDIO diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h index e545bdcd..ede5c359 100755 --- a/src/lib/16_dbg.h +++ b/src/lib/16_dbg.h @@ -10,7 +10,7 @@ #define __DEBUG_InputMgr__ #define __DEBUG_MAP__ //#define __DEBUG_2__ -#define __DEBUG_CA__ +//#define __DEBUG_CA__ //#define __DEBUG_PM__ //#define __DEBUG_MM__ //#define __DEBUG_RF__ diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c index 7d8a0b25..88a153cb 100755 --- a/src/lib/16_vl.c +++ b/src/lib/16_vl.c @@ -282,7 +282,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) switch(vq) { case 1: - case 8: //320x240 no buffer +// case 8: //320x240 no buffer //CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]); /*for(i=0; ivideo.page[0].sw = vga_state.vga_width = 300; // VGA lib currently does not update this - gv->video.page[0].sh = vga_state.vga_height = 200; // VGA lib currently does not update this - // virtual width and height. match screen, at first // - gv->video.page[0].height = gv->video.page[0].sh; - gv->video.page[0].width = gv->video.page[0].sw; - - cm.offset = (vga_state.vga_width / (4 * 2)); // 320 wide (40 x 4 pixel groups x 2) - //return; - break; + return; case 4: // TODO: 160x120 according to ModeX_192x144regs return; case 5: // TODO: 160x120 according to ModeX_256x192regs @@ -362,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; } @@ -372,7 +364,6 @@ void modexLeave(void) VL_vgaSetMode(TEXT_MODE); } -#if 0 page_t modexDefaultPage(page_t *p) { @@ -399,15 +390,9 @@ modexDefaultPage(page_t *p) page.pi=page.width*4; page.id = 0; - if(ggvv->video.curr_mode = 1) - { - page.width += TILEWHD; - page.height += TILEWHD; - } - return page; } -#endif +#if 0 page_t modexDefaultPage(page_t *p, video_t *v) { @@ -439,7 +424,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 */ @@ -528,7 +513,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 85a3bd71..a4337fea 100755 --- a/src/lib/16_vl.h +++ b/src/lib/16_vl.h @@ -168,12 +168,12 @@ void VL_Startup (global_game_variables_t *gvar), VL_DePlaneVGA (), VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv), modexEnter(sword vq, boolean cmem, global_game_variables_t *gv); -void VL_vgaSetMode(byte mode); +//void VL_vgaSetMode(byte mode); 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/lib/bakapee.c b/src/lib/bakapee.c index 39eb569e..d9fd1e5c 100755 --- a/src/lib/bakapee.c +++ b/src/lib/bakapee.c @@ -69,7 +69,7 @@ boolean baka_FizzleFade (unsigned source, unsigned dest, unsigned width, unsigne pagedelta = dest-source; rndval = 1; esorig = 0; q = 16; x = y = 0; - pixperframe = 64000/(dword)frames; + pixperframe = /*64000*/76800/(dword)frames; // IN_StartAck (); @@ -87,8 +87,6 @@ boolean baka_FizzleFade (unsigned source, unsigned dest, unsigned width, unsigne frame=0; do // while (1) { -sprintf(global_temp_status_text, "%u", frame); -modexprint(&(gvar->video.page[0]), PIXPOSX, PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); if (abortable && kbhit())//IN_CheckAck () ) return true; @@ -135,6 +133,7 @@ noxor: if ((x>width || y>height) && (xvideo.ofs.ylookup[y]) + (x>>2); + //drawofs = source+((y+1)*gvar->video.page[0].stridew) + (x>>2); drawofs = source+(y*gvar->video.page[0].stridew) + (x>>2); /* sprintf(global_temp_status_text, "draw - %Fp", drawofs); @@ -150,14 +149,10 @@ modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_te // // copy one pixel // -//* mask = x&3; VGAREADMAP(mask); mask = maskb[mask]; VGAMAPMASK(mask); -//*/ -// modexputPixel(&(gvar->video.page[0]), x, y, rand()); -// VL_Plot (x, y, 15, &(gvar->video.ofs)); __asm { mov di,[drawofs] diff --git a/src/palbomb.c b/src/palbomb.c index 61f55918..643d7148 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); + gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/); 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 9e6bc2b6..6607aebb 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); + gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/);// modexFadeOn(4, &gvar.video.palette); 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 303dbf9d..7ef2c526 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); + gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/);// modexFadeOn(4, &gvar.video.palette); VL_ShowPage(&gvar.video.page[0], 1, 0); modexpdump(&gvar.video.page[0]); while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ }