X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fcli%2Finput.c;h=73e2e2f43e0c9af23c74eaddbdaf556b474e9c09;hp=b946c5bb2df7a9a9a7797364f1e648315146175c;hb=2a6855a31daf79cad83545b1eeee646e10481e5e;hpb=c62d28102c77e19c291c78bf6bf7f0a81abd54b9 diff --git a/drivers/cli/input.c b/drivers/cli/input.c index b946c5b..73e2e2f 100644 --- a/drivers/cli/input.c +++ b/drivers/cli/input.c @@ -30,7 +30,7 @@ static void UpdateFKB(void); /* UsrInputType[] is user-specified. InputType[] is current - (game loading can override user settings) + (game loading can override user settings) */ static int UsrInputType[2]={SI_GAMEPAD,SI_GAMEPAD}; static int InputType[2]; @@ -74,7 +74,7 @@ static int KeyboardUpdate(void) if(keys) return 0; - keys=GetKeyboard(); + keys=GetKeyboard(); if(InputTypeFC==SIFC_FKB) { @@ -86,7 +86,7 @@ static int KeyboardUpdate(void) if(cidisabled) return(1); } #ifdef SVGALIB - keyonly(F3,LockConsole();) + keyonly(F3,LockConsole();) keyonly(F4,UnlockConsole();) #elif SDL keyonly(F4,ToggleFS();) @@ -162,7 +162,7 @@ static uint32 KeyboardDodo(void) { uint32 JS=0; - if(gametype!=GIT_NSF) + //if(gametype!=GIT_NSF) { int x,y; x=y=0; @@ -246,7 +246,7 @@ void FCEUD_UpdateInput(void) case SI_GAMEPAD:t|=1;break; case SI_ARKANOID:t|=2;break; case SI_ZAPPER:t|=2;break; - case SI_POWERPAD:powerpadbuf[x]=UpdatePPadData(x);break; + case SI_POWERPADA:powerpadbuf[x]=UpdatePPadData(x);break; } switch(InputTypeFC) @@ -282,8 +282,8 @@ static void InitOtherInput(void) InputDPtr=0; switch(InputType[x]) { - case SI_POWERPAD:InputDPtr=&powerpadbuf[x];break; - case SI_GAMEPAD:InputDPtr=((uint8 *)&JSreturn)+(x<<1);break; + case SI_POWERPADA:InputDPtr=&powerpadbuf[x];break; + case SI_GAMEPAD:InputDPtr=((uint8 *)&JSreturn)+(x<<1);break; case SI_ARKANOID:InputDPtr=MouseData;t|=1;break; case SI_ZAPPER:InputDPtr=MouseData; t|=1; @@ -305,7 +305,7 @@ static void InitOtherInput(void) FCEUI_SetInputFC(InputTypeFC,InputDPtr,attrib); FCEUI_DisableFourScore(eoptions&EO_NOFOURSCORE); - if(t && !(inited&16)) + if(t && !(inited&16)) { InitMouse(); inited|=16;