From 73c621355ffb4c161f135cdcf0ac38eaa5d804e4 Mon Sep 17 00:00:00 2001 From: dborth Date: Wed, 10 Sep 2008 01:02:12 +0000 Subject: [PATCH] fix four score --- source/ngc/menu.c | 2 +- source/ngc/pad.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/source/ngc/menu.c b/source/ngc/menu.c index 2710f19..c6339a3 100644 --- a/source/ngc/menu.c +++ b/source/ngc/menu.c @@ -672,7 +672,7 @@ ConfigureControllers () while (quit == 0) { sprintf (ctlrmenu[0], "Four Score - %s", - GCSettings.FSDisable == true ? " ON" : "OFF"); + GCSettings.FSDisable == false ? " ON" : "OFF"); if (GCSettings.zapper == 0) sprintf (ctlrmenu[1],"Zapper - Disabled"); else if (GCSettings.zapper == 1) sprintf (ctlrmenu[1],"Zapper - Port 1"); diff --git a/source/ngc/pad.c b/source/ngc/pad.c index 3e4ac5d..74060d5 100644 --- a/source/ngc/pad.c +++ b/source/ngc/pad.c @@ -74,14 +74,11 @@ extern INPUTC *FCEU_InitZapper(int w); ****************************************************************************/ void InitialisePads() { - int attrib = 0; - - FCEUI_DisableFourScore(1); - - InputDPR = &JSReturn; - FCEUI_SetInput(0, SI_GAMEPAD, InputDPR, attrib); - FCEUI_SetInput(1, SI_GAMEPAD, InputDPR, attrib); + InputDPR = &JSReturn; + FCEUI_SetInput(0, SI_GAMEPAD, InputDPR, 0); + FCEUI_SetInput(1, SI_GAMEPAD, InputDPR, 0); + ToggleFourScore(GCSettings.FSDisable); ToggleZapper(GCSettings.zapper); }