From f9dc639fffc3fa5d53e3431a2d391938ada015ee Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 15 May 2017 15:51:55 -0500 Subject: [PATCH] xcroll.exe needs through testing on real hardware\!\!\!\! ass\! 16_ca needs huge amounts of work and I should remember what needs to be done soon[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] added 1st scroll back [i work on CA] palette debug show values added wwww and i need to know how to see vrs/vrl imaage data palette index numbers [i am trying to find out how the hell you get the index number values of VRL/VRS] boom has been fixed ^^[CA_CacheMap added seems to be used in start a new game] what is mapsegs? --- makefile | 2 +- src/lib/16_t.h | 11 +++++++---- src/lib/doslib | 2 +- src/maptest.c | 11 +++++++---- src/xcroll.c | 40 ++++++---------------------------------- 5 files changed, 22 insertions(+), 44 deletions(-) diff --git a/makefile b/makefile index 19d47e52..bb06aa42 100755 --- a/makefile +++ b/makefile @@ -119,7 +119,7 @@ UPXQ=-qqq # # compile flags # -S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k40960#32768#24576 +S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576 Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536 diff --git a/src/lib/16_t.h b/src/lib/16_t.h index db1871f7..ff738657 100755 --- a/src/lib/16_t.h +++ b/src/lib/16_t.h @@ -49,16 +49,19 @@ typedef enum {ichi,ni,san,yon,go,roku,shichi,hachi,kyu,ju,juichi,juni,jusan,juyo /*typedef unsigned memseg; memptr should be replaced by memseg in code. + on usage where you need pointer convert memseg type (segment) to far pointer by MK_FP(segment value, 0)*/ - #ifdef __WATCOMC__ +#ifdef __WATCOMC__ //typedef void __based( void ) * memptr; ////old //----typedef void __based(__self) * memptr; //typedef unsigned short _seg; // it will contains segment value (as Borland _seg) #define _seg __based( void ) - #endif - #ifdef __BORLANDC__ +// #define __SEGA __segment +#endif +#ifdef __BORLANDC__ #define _memavl() coreleft() - #endif +// #define __SEGA _seg +#endif typedef void _seg * memptr; diff --git a/src/lib/doslib b/src/lib/doslib index da8765d3..eac2278e 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit da8765d3e9a400fd02106d23b05462fdf38b777b +Subproject commit eac2278e502cd56fa9d17b13bea567bd5c96a16a diff --git a/src/maptest.c b/src/maptest.c index fd966fff..7b53667c 100755 --- a/src/maptest.c +++ b/src/maptest.c @@ -23,7 +23,7 @@ #include #define DUMP -#define DUMP_MAP +//#define DUMP_MAP void main(int argc, char *argv[]) @@ -42,13 +42,15 @@ main(int argc, char *argv[]) MM_Startup(&gvar); PM_Startup(&gvar); + //printf("pmstarted ok\n"); PM_CheckMainMem(&gvar); PM_UnlockMainMem(&gvar); CA_Startup(&gvar); fprintf(stderr, fmt, _memavl()); fprintf(stderr, fmt0, _memmax()); - fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.MAPSEGPTR))); + fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.mapsegs))); + //getch(); CA_loadmap("data/test.map", &map, &gvar); #ifdef DUMP @@ -56,6 +58,7 @@ main(int argc, char *argv[]) fprintf(stdout, "map.height= %d\n", map.height); getch(); #ifdef DUMP_MAP + //if(map.width*map.height != 1200) for(k=0;k= 2) { if(argv[1]){ strcpy(bakapee, argv[1]); @@ -78,40 +74,22 @@ void main(int argc, char *argv[]) //----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container)); // create the map - #ifdef VERBOSESCROLL - fprintf(stderr, "testing map load~ "); - #endif +// fprintf(stderr, "testing map load~ "); CA_loadmap("data/test.map", &map, &gvar); #ifndef NOMAPLOAD chkmap(&map, 0); // initMap(&map); +// printf("chkmap ok "); +// fprintf(stderr, "yay map loaded~~\n"); #else chkmap(&map, 1); //initMap(&map); #endif - #ifdef VERBOSESCROLL - fprintf(stderr, "chkmap ok "); - fprintf(stderr, "yay map loaded~~\n"); - #endif - - #ifdef VERBOSESCROLL - fprintf(stderr, "press a key wwww\n"); - IN_StartAck (&gvar); while (!IN_CheckAck (&gvar)){} - #endif - // data - #ifdef VERBOSESCROLL - fprintf(stderr, "VRS_LoadVRS "); - #endif VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar); - #ifdef VERBOSESCROLL - fprintf(stderr, "ok~\n"); - #endif - #ifdef VERBOSESCROLL - fprintf(stderr, "press a key wwww\n"); - IN_StartAck (&gvar); while (!IN_CheckAck (&gvar)){} - #endif + // input! + IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar); // save the palette #ifdef FADE @@ -131,9 +109,6 @@ void main(int argc, char *argv[]) //printf("1: %d\n", paloffset); map.tiles->data->offset=(paloffset/3); modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/ - #ifdef VERBOSESCROLL - fprintf(stderr, "VL_LoadPalFile "); - #endif VL_LoadPalFile(bakapeep, &gvar.video.palette, &gvar); //VL_LoadPalFile("data/default.pal", &gvar.video.palette); @@ -142,9 +117,6 @@ void main(int argc, char *argv[]) modexSavePalFile("data/g.pal", &gvar.video.palette); modexPalBlack(); //so player will not see loadings~ #endif - #ifdef VERBOSESCROLL - fprintf(stderr, "ok\n"); - #endif // setup camera and screen~ modexHiganbanaPageSetup(&gvar); -- 2.39.2