From ceea2d86f2e2e613ca9165eecda3619b7ae3a1f6 Mon Sep 17 00:00:00 2001 From: pagefault <> Date: Wed, 29 Mar 2006 19:32:55 +0000 Subject: [PATCH] Fixed sliders --- zsnes/src/gui/guimouse.inc | 5 ++++- zsnes/src/video/procvidc.c | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index aa60afae..264e329c 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2665,9 +2665,12 @@ DisplayGUIVideoClick: add eax,100 mov [GUIHoldXlimR],eax .nomovebar - .notntsctab +EXTSYm NTSCFilterInit xor al,al + pushad + call NTSCFilterInit + popad ret SECTION .bss diff --git a/zsnes/src/video/procvidc.c b/zsnes/src/video/procvidc.c index b53acfe1..5323e124 100644 --- a/zsnes/src/video/procvidc.c +++ b/zsnes/src/video/procvidc.c @@ -90,13 +90,13 @@ extern unsigned char NTSCBlend,NTSCHue,NTSCSat,NTSCCont,NTSCBright,NTSCSharp,NTS void NTSCFilterInit() { // Set GUI options - ntsc_setup.merge_fields = NTSCBlend; - ntsc_setup.hue = NTSCHue / 100; - ntsc_setup.saturation = NTSCSat / 100; - ntsc_setup.contrast = NTSCCont / 100; - ntsc_setup.brightness = NTSCBright / 100; - ntsc_setup.brightness = NTSCSharp / 100; - ntsc_setup.hue_warping = NTSCWarp / 100; + ntsc_setup.merge_fields = (float) NTSCBlend; + ntsc_setup.hue = (float) NTSCHue / 100; + ntsc_setup.saturation = (float) NTSCSat / 100; + ntsc_setup.contrast = (float) NTSCCont / 100; + ntsc_setup.brightness = (float) NTSCBright / 100; + ntsc_setup.sharpness = (float) NTSCSharp / 100; + ntsc_setup.hue_warping = (float) NTSCWarp / 100; snes_ntsc_init(&ntsc_snes, &ntsc_setup); }