From: sparky4 Date: Mon, 4 Apr 2016 18:34:28 +0000 (-0500) Subject: =error= ww src/lib/modex16.h(86): Error! E1024: Declared symbol 'modexEnter' is not... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=2a9ec1a325590c2bc55ecb8e36e376c51c0d3c53;p=16.git =error= ww src/lib/modex16.h(86): Error! E1024: Declared symbol 'modexEnter' is not in parameter list --- diff --git a/builq.sh b/builq.sh index f518246b..e60e695a 100755 --- a/builq.sh +++ b/builq.sh @@ -1,4 +1,5 @@ #! /bin/bash -wmake -h clean -wmake -h -wmake -h comq +. ./dld.sh +./cleanup.sh +./buildall.sh +#cd ../../../ diff --git a/src/16.c b/src/16.c index 10aad071..bfe777e2 100755 --- a/src/16.c +++ b/src/16.c @@ -45,7 +45,7 @@ main(int argc, char *argv[]) /*modexPalSave(gpal); modexSavePalFile("data/g.pal", gpal);*/ printf("wwww loop wwww\n"); - VGAmodeX(1, &gvar); + VGAmodeX(1, 1, &gvar); modexPalBlack(); //so player will not see loadings~ IN_Startup(); IN_Default(0,&player,ctrl_Joystick); @@ -62,7 +62,7 @@ main(int argc, char *argv[]) case 2: cpus = "386 or newer"; break; default: cpus = "internal error"; break; } - VGAmodeX(0, &gvar); + VGAmodeX(0, 1, &gvar); printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n"); printf("version %s\n", VERSION); printf("detected CPU type: %s\n", cpus); diff --git a/src/bakapi.c b/src/bakapi.c index 410524d0..6c357276 100755 --- a/src/bakapi.c +++ b/src/bakapi.c @@ -93,12 +93,10 @@ main(int argc, char *argvar[]) xdir=1; ydir=1; -#ifdef MXLIB - VGAmodeX(vgamodex_mode, &gvar); // TODO: Suggestion: Instead of magic numbers for the first param, might I suggest defining an enum or some #define constants that are easier to remember? --J.C. -#else -# error REMOVED // this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in. + VGAmodeX(vgamodex_mode, 1, &gvar); // TODO: Suggestion: Instead of magic numbers for the first param, might I suggest defining an enum or some #define constants that are easier to remember? --J.C. + // 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. -#endif + bakapee.xx = rand()&0%gvar.video.page[0].width; bakapee.yy = rand()&0%gvar.video.page[0].height; bakapee.gq = 0; @@ -138,15 +136,22 @@ main(int argc, char *argvar[]) { int c; -# ifndef MXLIB -# error REMOVED // this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in. + // 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. -# else - VGAmodeX(0, &gvar); -# endif + VGAmodeX(0, 0, &gvar); // user imput switch - fprintf(stderr, "xx=%d yy=%d tile=%d\n", bakapee.xx, bakapee.yy, bakapee.tile); - printf("Enter 1, 2, 3, 4, or 6 to run a screensaver, or enter 0 to quit.\n"); + //fprintf(stderr, "xx=%d yy=%d tile=%d\n", bakapee.xx, bakapee.yy, bakapee.tile); + printf("Tiled mode is "); + switch (bakapee.tile) + { + case 0: + printf("off.\n"); + break; + case 1: + printf("on.\n"); + break; + } + printf("Enter 1, 2, 3, 4, 5, 6, 8, or 9 to run a screensaver, or enter 0 to quit.\n"); c = getch(); switch (c) { @@ -174,16 +179,14 @@ main(int argc, char *argvar[]) case '4': case '5': case '6': + case '9': key = c - '0'; -# ifdef MXLIB gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]); gvar.video.page[0].width += (TILEWH*2); gvar.video.page[0].height += (TILEWH*2); - VGAmodeX(vgamodex_mode, &gvar); -# else -# error REMOVED // this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in. + VGAmodeX(vgamodex_mode, 0, &gvar); + // 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. -# endif modexShowPage(&gvar.video.page[0]); break; default: @@ -194,6 +197,7 @@ main(int argc, char *argvar[]) } #else // !defined(BOINK) // FIXME: Does not compile. Do you want to remove this? +// TODO: This is a testing sextion for textrendering and panning for project 16 --sparky4 while(1) { // conditions of screen saver while(!kbhit()) @@ -268,6 +272,7 @@ main(int argc, char *argvar[]) } // VGAmodeX(0, &gvar); #endif // defined(BOINK) - printf("bakapi ver. 1.04.13.04\nis made by sparky4i†ƒÖ…j feel free to use it ^^\nLicence: GPL v3\n"); + printf("bakapi ver. 1.04.16.04\nis made by sparky4i†ƒÖ…j feel free to use it ^^\nLicence: GPL v3\n"); + printf("compiled on %s\n", VERSION); } //pee! diff --git a/src/fontgfx.c b/src/fontgfx.c index 3edf22d5..2abb13ff 100755 --- a/src/fontgfx.c +++ b/src/fontgfx.c @@ -63,7 +63,7 @@ IIIIIII BBBBBBBBB MMMM M MMMM\n\ // static byte *rosa; static word chx, chy, colpee; textInit(); - VGAmodeX(1, &gvar); + VGAmodeX(1, 1, &gvar); /* setup camera and screen~ */ gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]); //gvar.video.page[0].width += (16*2); @@ -96,7 +96,7 @@ IIIIIII BBBBBBBBB MMMM M MMMM\n\ // modexprintbig(&gvar.video.page[0], 0, 0, 1, colpee, 0, "IBM"); // modexprint(0, 0, 1, 0, colpee, ROSE); getch(); - VGAmodeX(0, &gvar); + VGAmodeX(0, 1, &gvar); // rosa=malloc(sizeof(ROSE)); // (*rosa)=(byte)ROSE; printf("\n%s\n", rose); diff --git a/src/lib/modex16.c b/src/lib/modex16.c index ee2f1a86..7d7d7631 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -35,7 +35,7 @@ static byte tmppal[PAL_SIZE]; // setvideo() - This function Manages the video modes // // // ///////////////////////////////////////////////////////////////////////////// -void VGAmodeX(sword vq, global_game_variables_t *gv) +void VGAmodeX(sword vq, byte cm, global_game_variables_t *gv) { union REGS in, out; @@ -54,7 +54,7 @@ void VGAmodeX(sword vq, global_game_variables_t *gv) //int86(0x10, &in, &out); gv->video.old_mode = vgaGetMode();//out.h.al; // enter mode - modexEnter(vq, gv); + modexEnter(vq, cm, gv); break; } } @@ -87,7 +87,7 @@ vgaGetMode() /* -========================= Entry Points ==========================- */ void -modexEnter(sword vq, global_game_variables_t *gv) +modexEnter(sword vq, boolean cm, global_game_variables_t *gv) { word i; dword far*ptr=(dword far*)VGA; /* used for faster screen clearing */ @@ -107,12 +107,6 @@ modexEnter(sword vq, global_game_variables_t *gv) for(i=0; ivideo.page[0].tilesw = gv->video.page[0].sw/TILEWH; diff --git a/src/lib/modex16.h b/src/lib/modex16.h index 3c47ee07..1ba62683 100755 --- a/src/lib/modex16.h +++ b/src/lib/modex16.h @@ -82,8 +82,8 @@ typedef union /* -============================ Functions =============================- */ /* mode switching, page, and plane functions */ -void VGAmodeX(sword vq, global_game_variables_t *gv); -void modexEnter(sword vq, global_game_variables_t *gv); +void VGAmodeX(sword vq, byte cm, global_game_variables_t *gv) +void modexEnter(sword vq, byte cm, global_game_variables_t *gv); long vgaGetMode(); void modexLeave(); void modexsetBaseXMode(page_t *page);