From: sparky4 <sparky4@cock.li>
Date: Wed, 29 Mar 2017 19:36:24 +0000 (-0500)
Subject: [16_ca needs huge amounts of work and I should remember what needs to be done soon...
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b8607c188acbd40fc54f6a145e6db0e8e732ec2d;p=16.git
[16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]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]
---
diff --git a/src/0.c b/src/0.c
index 96d8e7aa..051bb332 100755
--- a/src/0.c
+++ b/src/0.c
@@ -138,18 +138,18 @@ int main(int argc,char **argv)
/* do it */
omemptr = vga_state.vga_graphics_ram; // save original mem ptr
- while(!IN_KeyDown(sc_Escape))
+ while(!gvar.in.inst->Keyboard[sc_Escape])
{
IN_ReadControl(&gvar.player[0], &gvar);
- if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10
+ if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10
TAIL_PANKEYFUN;
- if(IN_KeyDown(sc_Space) || zerostoppause) //space
+ if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause) //space
{
anim=!anim;
DRAWCORNERBOXES;
if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;
}
- if(IN_KeyDown(sc_R)){
+ if(gvar.in.inst->Keyboard[sc_R]){
gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;
gvar.mv[0].tx = gvar.mv[0].ty = gvar.mv[1].tx = gvar.mv[1].ty = INITTNUM;
VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);
diff --git a/src/16.c b/src/16.c
index 9d05514f..7f22e1b6 100755
--- a/src/16.c
+++ b/src/16.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
while(1)
{
IN_ReadControl(&gvar.player[0], &gvar);
- if(IN_KeyDown(sc_Escape)) break;
+ if(gvar.in.inst->Keyboard[sc_Escape]) break;
shinku(&gvar);
_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
}
diff --git a/src/inputest.c b/src/inputest.c
index 56370b74..65fafd87 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -49,7 +49,7 @@ ctrl_Keyboard1);
//0000 nibbletest();
//0000 booleantest();
//printf("dbg_testkeyin=%u dbg_testcontrolnoisy=%u dbg_nogvar.playerinpu=%u\nloop if this is not responsive then please KILL or reset machine sorry!!\n", dbg_testkeyin, dbg_testcontrolnoisy, dbg_nogvar.playerinpu);
- while(!IN_KeyDown(sc_Escape))
+ while(!gvar.in.inst->Keyboard[sc_Escape])
{
//0000 shinkutxt(&gvar);
IN_ReadControl(&gvar.player[0], &gvar);
@@ -87,10 +87,9 @@ ctrl_Keyboard1);
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
break;
}
- //printf("%u\n", IN_KeyDown(sc_Escape));
+ //printf("%u\n", gvar.in.inst->Keyboard[sc_Escape]);
//if(
- IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));
- if(IN_KeyDown(88)) //speed
+ if(gvar.in.inst->Keyboard[88]) //speed
{
switch(gvar.kurokku.fpscap)
{
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 97a560d0..14c88c05 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -250,8 +250,8 @@ void IN_StopDemo(void);
void IN_FreeDemoBuffer(void);
#endif
-boolean IN_KeyDown(byte code),
- IN_qb(byte kee);
+//boolean IN_KeyDown(byte code),
+// IN_qb(byte kee);
void IN_ClearKey(byte code),
IN_KbdLED();
ScanCode IN_GetLastScan(),
diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 81c5e1a0..d31cac10 100755
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -34,34 +34,34 @@
#include "src/lib/testpatt.h"
#define TAIL_FUNCTIONKEYFUNCTIONS \
- if(IN_KeyDown(88)){ panswitch=!panswitch; IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[88]){ panswitch=!panswitch; IN_UserInput(1, &gvar); } \
TAIL_FUNCTIONKEYFUNCTIONS0EXE
#define RFDEBUGFUNCTIONS
#ifdef __DEBUG_RF__
#undef RFDEBUGFUNCTIONS
#define RFDEBUGFUNCTIONS \
- if(IN_KeyDown(sc_F11)){ dbg_pagedelayrendermap=!dbg_pagedelayrendermap; IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_F9)){ dbg_pagenorendermap=!dbg_pagenorendermap; IN_UserInput(1, &gvar); }
+ if(gvar.in.inst->Keyboard[sc_F11]){ dbg_pagedelayrendermap=!dbg_pagedelayrendermap; IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap; IN_UserInput(1, &gvar); }
#endif
/*#define SPRIDEBUGFUNCTIONS
#ifdef __DEBUG_SPRI__
#undef SPRIDEBUGFUNCTIONS
#define SPRIDEBUGFUNCTIONS \
- if(IN_KeyDown(sc_Y)){ dbg_delayanimation=!dbg_delayanimation; IN_UserInput(1, &gvar); }
-// if(IN_KeyDown(sc_F9)){ dbg_pagenorendermap=!dbg_pagenorendermap; IN_UserInput(1, &gvar); }
+ if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation; IN_UserInput(1, &gvar); }
+// if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap; IN_UserInput(1, &gvar); }
#endif*/
#define TAIL_FUNCTIONKEYFUNCTIONS0EXE \
- if(IN_KeyDown(sc_F4)){ turboXT(12); IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(68/*sc_F10*/)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_F8)){ gvar.video.bgps=!gvar.video.bgps; IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_F7)){ ZC_ShowMV(&gvar.mv, 0, 1); IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_F6)){ ZC_ShowMV(&gvar.mv, 0, 0); IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_T)){ gvar.video.rss=!gvar.video.rss; IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_P)){ modexpdump(&gvar.video.page[0]); IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_Y)){ dbg_delayanimation=!dbg_delayanimation; IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_F4]){ turboXT(12); IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[68/*sc_F10*/]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_F8]){ gvar.video.bgps=!gvar.video.bgps; IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_F7]){ ZC_ShowMV(&gvar.mv, 0, 1); IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_F6]){ ZC_ShowMV(&gvar.mv, 0, 0); IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_T]){ gvar.video.rss=!gvar.video.rss; IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_P]){ modexpdump(&gvar.video.page[0]); IN_UserInput(1, &gvar); } \
+ if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation; IN_UserInput(1, &gvar); } \
RFDEBUGFUNCTIONS
#define TAIL_PANKEYFUN \
@@ -72,28 +72,28 @@
ZC_panPageManual(&gvar.mv, &gvar.player, 0);
#define FUNCTIONKEYSHOWMV \
- if(IN_KeyDown(1+1)){ gvar.video.sp=0; ZC_ShowMV(&gvar.mv, 0, 0); } \
- if(IN_KeyDown(2+1)){ gvar.video.sp=1; ZC_ShowMV(&gvar.mv, 0, 0); } \
- if(IN_KeyDown(3+1)){ gvar.video.sp=2; ZC_ShowMV(&gvar.mv, 0, 1); } \
- if(IN_KeyDown(4+1)){ gvar.video.sp=3; ZC_ShowMV(&gvar.mv, 0, 1); }
+ if(gvar.in.inst->Keyboard[1+1]){ gvar.video.sp=0; ZC_ShowMV(&gvar.mv, 0, 0); } \
+ if(gvar.in.inst->Keyboard[2+1]){ gvar.video.sp=1; ZC_ShowMV(&gvar.mv, 0, 0); } \
+ if(gvar.in.inst->Keyboard[3+1]){ gvar.video.sp=2; ZC_ShowMV(&gvar.mv, 0, 1); } \
+ if(gvar.in.inst->Keyboard[4+1]){ gvar.video.sp=3; ZC_ShowMV(&gvar.mv, 0, 1); }
#define TAIL_FUNCTIONKEYDRAWJUNK \
FUNCTIONKEYSHOWMV \
TAIL_FUNCTIONKEYDRAWJUNKNOMV
#define TAIL_FUNCTIONKEYDRAWJUNKNOMV \
- if(IN_KeyDown(sc_A)) modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 3); \
- if(IN_KeyDown(sc_S)) modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 4); \
+ if(gvar.in.inst->Keyboard[sc_A]){ modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 3); } \
+ if(gvar.in.inst->Keyboard[sc_S]){ modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 4); } \
\
- if(IN_KeyDown(sc_Z)){ DRAWCORNERBOXES } \
- if(IN_KeyDown(sc_X)){ TESTBG12 } \
- if(IN_KeyDown(sc_C)){ TESTBG34 } \
- if(IN_KeyDown(sc_V)) VL_PatternDraw(&gvar.video, 0, 1, 1); \
- if(IN_KeyDown(sc_I)){ dbg_maptext=!dbg_maptext; IN_UserInput(1, &gvar); }
-/* if(IN_KeyDown(sc_PgDn)){ \
+ if(gvar.in.inst->Keyboard[sc_Z]){ DRAWCORNERBOXES } \
+ if(gvar.in.inst->Keyboard[sc_X]){ TESTBG12 } \
+ if(gvar.in.inst->Keyboard[sc_C]){ TESTBG34 } \
+ if(gvar.in.inst->Keyboard[sc_V]){ VL_PatternDraw(&gvar.video, 0, 1, 1); } \
+ if(gvar.in.inst->Keyboard[sc_I]){ dbg_maptext=!dbg_maptext; IN_UserInput(1, &gvar); }
+/* if(gvar.in.inst->Keyboard[sc_PgDn]){ \
rotateR(gvar.video.palette, sizeof(gvar.video.palette)/sizeof(gvar.video.palette[0])); \
VL_UpdatePaletteWrite(&gvar.video.palette, 0); IN_UserInput(1, &gvar); } \
- if(IN_KeyDown(sc_PgUp)){ \
+ if(gvar.in.inst->Keyboard[sc_PgUp]){ \
rotateL(gvar.video.palette, sizeof(gvar.video.palette)/sizeof(gvar.video.palette[0])); \
VL_UpdatePaletteWrite(&gvar.video.palette, 0); IN_UserInput(1, &gvar); }*/
diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index f9e8a30b..871cf69e 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -310,7 +310,6 @@ typedef struct// inconfig
// Global variables
KeyboardDef KbdDefs[MaxKbds];
JoystickDef JoyDefs[MaxJoys];
- //struct instat *inst;
inst_t *inst;
} in_info_t;
diff --git a/src/vidtest.c b/src/vidtest.c
index 1a98e88b..94f27493 100755
--- a/src/vidtest.c
+++ b/src/vidtest.c
@@ -147,20 +147,20 @@ void main(int argc, char *argv[])
i=0,k=0,j=0;
startclk = *clockw;
- while(!IN_KeyDown(sc_Escape))
+ while(!gvar.in.inst->Keyboard[sc_Escape])
{
IN_ReadControl(&gvar.player[0], &gvar);
ZC_panPageManual(&gvar.mv, &gvar.player, 0);
-// if(IN_KeyDown(sc_5)){ modexClearRegion(&gvar.video.page[1], gvar.video.page[1].sw, 16, 8, 4, 45); }
-// if(IN_KeyDown(sc_4)){
+// if(gvar.in.inst->Keyboard[sc_5)){ modexClearRegion(&gvar.video.page[1], gvar.video.page[1].sw, 16, 8, 4, 45); }
+// if(gvar.in.inst->Keyboard[sc_4)){
// modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
// modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
// modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
// }
TAIL_PANKEYFUN;
- if(IN_KeyDown(12)) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);
- if(IN_KeyDown(13)) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);
-/*==== if(IN_KeyDown(7)){
+ if(gvar.in.inst->Keyboard[12]) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);
+ if(gvar.in.inst->Keyboard[13]) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);
+/*==== if(gvar.in.inst->Keyboard[7)){
for(i=0;i<3;i++)
{
pal2[i] = rand()%64;
@@ -170,9 +170,9 @@ void main(int argc, char *argv[])
}
// if(i>PAL_SIZE) i=0;
}//9*/
- if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//p
- if(IN_KeyDown(sc_I)){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//i
- if(IN_KeyDown(sc_O)){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1, &gvar); }//o
+ if(gvar.in.inst->Keyboard[25]){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//p
+ if(gvar.in.inst->Keyboard[sc_I]){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//i
+ if(gvar.in.inst->Keyboard[sc_O]){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1, &gvar); }//o
//VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);
ZC_ShowMV(&gvar.mv, 0, 0);
}
diff --git a/src/vrstest.c b/src/vrstest.c
index 166a10e0..3a59112d 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -132,7 +132,7 @@ void main()
delay(500);
}
- while(!IN_KeyDown(sc_Escape))
+ while(!gvar.in.inst->Keyboard[sc_Escape])
{
switch(w)
{
@@ -145,9 +145,9 @@ void main()
break;
}
TAIL_FUNCTIONKEYDRAWJUNKNOMV
- if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 1, 1); IN_UserInput(1, &gvar); }
- if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 1, 0); IN_UserInput(1, &gvar); }
- if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[0]); IN_UserInput(1, &gvar); } //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(&gvar.video.page[0]); IN_UserInput(1, &gvar); } //p
}
VGAmodeX(0, 1, &gvar);
MM_ShowMemory(&gvar);
diff --git a/src/xcroll.c b/src/xcroll.c
index 888a0034..38516c99 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -137,7 +137,7 @@ void main(int argc, char *argv[])
#endif
}
-// while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }
+// while(!gvar.in.inst->Keyboard[sc_Escape) && !gvar.in.inst->Keyboard[sc_Space) && !gvar.in.inst->Keyboard[sc_Enter]){ FUNCTIONKEYSHOWMV }
gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
shinku(&gvar);
@@ -145,7 +145,7 @@ void main(int argc, char *argv[])
#ifdef FADE
modexFadeOn(4, &gvar.video.palette);
#endif
- while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)
+ while(!gvar.in.inst->Keyboard[sc_Escape] && gvar.player[0].enti.hp>0)
{
gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
@@ -165,8 +165,8 @@ void main(int argc, char *argv[])
}
//the scripting stuff....
- //if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
- if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
+ //if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && gvar.in.inst->Keyboard[0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
+ if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && gvar.in.inst->Keyboard[0x1C])||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
{
short i;
for(i=800; i>=400; i--)
@@ -178,21 +178,21 @@ void main(int argc, char *argv[])
if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }
//debugging binds!
- if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
- if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u
+ if(gvar.in.inst->Keyboard[24]){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
+ if(gvar.in.inst->Keyboard[22]){ modexPalUpdate0(&gvar.video.palette); } //u
TAIL_FUNCTIONKEYFUNCTIONS
TAIL_FUNCTIONKEYDRAWJUNK
- if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }
- if(IN_KeyDown(sc_J) || IN_KeyDown(sc_K))
+ if(gvar.in.inst->Keyboard[sc_L]){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }
+ if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])
{
- if(IN_KeyDown(sc_J))
+ if(gvar.in.inst->Keyboard[sc_J])
{
bakapee1=FILENAME_1;
bakapee1p=FILENAME_1P;
gvar.player[0].enti.overdraww=0;
}
- if(IN_KeyDown(sc_K))
+ if(gvar.in.inst->Keyboard[sc_K])
{
bakapee1=FILENAME_2;
bakapee1p=FILENAME_2P;
@@ -203,9 +203,9 @@ void main(int argc, char *argv[])
VL_LoadPalFile(bakapee1p, &gvar.video.palette);
}//JK
#ifdef FADE
- if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
+ if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
#endif
- if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
+ if(gvar.in.inst->Keyboard[sc_R]){ modexPalOverscan(rand()%56); } //r
if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break; //incase things go out of sync!
}
@@ -218,7 +218,7 @@ void main(int argc, char *argv[])
modexFadeOff(4, &gvar.video.palette);
#endif
Shutdown16(&gvar);
- printf("\nProject 16 zcroll.exe. This is just a test file!\n");
+ printf("\nProject 16 xcroll.exe. This is just a test file!\n");
printf("version %s\n", VERSION);
SCROLLEXITMESG;
WCPU_cpufpumesg();
diff --git a/vidtest.upx b/vidtest.upx
new file mode 100755
index 00000000..e69de29b