X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvrstest.c;h=142d579d7cab164b9ccd2d960e90985ad3356a44;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=69ee777aa07db73990e8dbf0e454509e8d24dc39;hpb=f0c58f5a02b7b815d1e3c8b010ae98e0aa89579e;p=16.git

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