From: sparky4 Date: Sun, 21 Aug 2016 21:52:50 +0000 (-0500) Subject: branch is in the master swap branch code added to swap the files out ^^; vrstest... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=40fd3f869bd0d1e36b1eb5679da11c914ebf00f3;hp=9603f9511aceaee61cf873f6ac2b9876a6892fc1;p=16.git branch is in the master swap branch code added to swap the files out ^^; vrstest.c is added for actual testing~ --- diff --git a/makefile b/makefile index 520042e1..3e7cfb26 100755 --- a/makefile +++ b/makefile @@ -184,8 +184,8 @@ inputest.exe: inputest.$(OBJ) $(16LIB) pcxtest.exe: pcxtest.$(OBJ) gfx.lib wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.mah -vrstest.exe: vrstest.$(OBJ) gfx.lib - wcl $(FLAGS) vrstest.$(OBJ) gfx.lib -fm=vrstest.mah +vrstest.exe: vrstest.$(OBJ) gfx.lib $(16LIB) + wcl $(FLAGS) vrstest.$(OBJ) gfx.lib $(16LIB) -fm=vrstest.mah palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIB) wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.mah #$(16LIB) diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h index fb3943d1..18e57009 100755 --- a/src/lib/typdefst.h +++ b/src/lib/typdefst.h @@ -185,7 +185,6 @@ typedef struct handle_t handle; //handles for file logging kurokku_t kurokku; //clock struct mminfo_t mm; mminfotype mmi; - void *bigbuffer; } global_game_variables_t; #endif /* _TYPEDEFSTRUCT_H_ */ diff --git a/src/vrstest.c b/src/vrstest.c index d27889d9..75469b0d 100755 --- a/src/vrstest.c +++ b/src/vrstest.c @@ -32,6 +32,8 @@ global_game_variables_t gvar; void main() { + __segment sega; + void __based(sega)* bigbuffer; int i; word start; int plane; @@ -47,6 +49,11 @@ void main() { // the CPU to carry out tasks. --J.C. cpu_probe(); + gvar.mm.mmstarted=0; + + MM_Startup(&gvar.mm, &gvar.mmi); + CA_Startup(&gvar); + // DOSLIB: check for VGA if (!probe_vga()) { printf("VGA probe failed\n"); @@ -107,6 +114,9 @@ void main() { { //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0); } + MM_FreePtr(&bigbuffer, &gvar.mm); + CA_Shutdown(&gvar); + MM_Shutdown(&gvar.mm); VGAmodeX(0, 1, &gvar); /*printf("\nmain=%Fp\n\n", &i); printf("bmp.data=%Fp\n", bmp.data);