updating copy left. i am super fuckin busy with school, and trying to get life back...

[16.git] / src / vrstest.c

diff --git a/src/vrstest.c b/src/vrstest.c
index 0e3378e6482016edcd0c3778de0775e0730c53b6..142d579d7cab164b9ccd2d960e90985ad3356a44 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -28,7 +28,9 @@
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
 \r
+#ifdef __DEBUG_InputMgr__\r
 extern boolean dbg_nointest;\r
+#endif\r
 boolean panswitch;\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
@@ -53,7 +55,9 @@ void main()
        int size=0;\r
 */\r
 \r
+#ifdef __DEBUG_InputMgr__\r
        dbg_nointest=0;\r
+#endif\r
        Startup16(&gvar);\r
 \r
 /*     CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar);\r
@@ -107,7 +111,7 @@ void main()
        if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/\r
 \r
        VGAmodeX(1, 1, &gvar);\r
-       modexHiganbanaPageSetup(&gvar.video);\r
+       modexHiganbanaPageSetup(&gvar);\r
        VL_ShowPage(&gvar.video.page[0], 1, 0);\r
 \r
        /* non sprite comparison */\r
@@ -122,7 +126,7 @@ void main()
        /*modexLoadPalFile("data/spri/chikyuu.pal", &pal);\r
        modexPalUpdate(pal);*/\r
        //modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 2);\r
-       VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette);\r
+       VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette, &gvar);\r
        for (i = 0; i < 10; i++){\r
                enti.spri.delay = 1;\r
 \r
@@ -132,7 +136,7 @@ void main()
                delay(500);\r
        }\r
 \r
-       while(!IN_KeyDown(sc_Escape))\r
+       while(!gvar.in.inst->Keyboard[sc_Escape])\r
        {\r
                switch(w)\r
                {\r
@@ -145,19 +149,15 @@ void main()
                        break;\r
                }\r
                TAIL_FUNCTIONKEYDRAWJUNKNOMV\r
-               if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 1, 1);                                                  IN_UserInput(1); }\r
-               if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 1, 0);                                                  IN_UserInput(1); }\r
-               if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[0]);  IN_UserInput(1); } //p\r
+               if(gvar.in.inst->Keyboard[sc_F7]){ VL_ShowPage(&gvar.video.page[0], 1, 1);                                                      IN_UserInput(1, &gvar); }\r
+               if(gvar.in.inst->Keyboard[sc_F6]){ VL_ShowPage(&gvar.video.page[0], 1, 0);                                                      IN_UserInput(1, &gvar); }\r
+               if(gvar.in.inst->Keyboard[25]){ modexpdump(0, &gvar);  IN_UserInput(1, &gvar); } //p\r
        }\r
        VGAmodeX(0, 1, &gvar);\r
        MM_ShowMemory(&gvar);\r
        MM_DumpData(&gvar);\r
        MM_Report_(&gvar);\r
        Shutdown16(&gvar);\r
-#ifndef VRSVRLNONPTR\r
-       free(enti.spri.sprite_vrl_cont);\r
-       free(enti.spri.spritesheet->vrl_line_offsets);\r
-#endif\r
        MM_FreePtr(&bigbuffer, &gvar);\r
        //MM_FreePtr(&((void __based(sega)*)enti.spri.spritesheet->buffer), &mm);\r
        //printf("CPU to VGA: %f\n", t1);\r