diff --git a/menudef.txt b/menudef.txt index 421c27d..8b393a6 100644 --- a/menudef.txt +++ b/menudef.txt @@ -71,7 +71,7 @@ OptionMenu "MFXOptionsMenu" Slider "Sharpen Radius", "mfx_lsharpradius", 0, 1, 0.01, 2 Slider "Sharpen Threshold", "mfx_lsharpclamp", 0, 1, 0.01, 2 Slider "Sharpen Strength", "mfx_lsharpblend", 0, 8, 0.1, 1 - Command "Reset to Default", "event resetmfxvars 8" + SafeCommand "Reset to Default", "event resetmfxvars 8" StaticText " " StaticText "Film Grain", "Gold" StaticText " " @@ -81,14 +81,14 @@ OptionMenu "MFXOptionsMenu" Slider "Grain Contrast", "mfx_np", 0.5, 4, 0.01, 2 Option "Grain Blend Mode", "mfx_nb", "MFXGrainBlend" Slider "Grain Dark Mask Contrast", "mfx_bnp", 0.5, 8, 0.01, 2 - Command "Reset to Default", "event resetmfxvars 0" + SafeCommand "Reset to Default", "event resetmfxvars 0" StaticText " " StaticText "Screen Dirt", "Gold" StaticText " " Option "Enable", "mfx_dirtenable", "YesNo" Slider "Dirt Scale", "mfx_dirtmc", 1, 8, 1, 0 Slider "Dirt Intensity", "mfx_dirtcfactor", 0, 1, 0.01, 2 - Command "Reset to Default", "event resetmfxvars 1" + SafeCommand "Reset to Default", "event resetmfxvars 1" StaticText " " StaticText "Color Grading", "Gold" StaticText " " @@ -107,7 +107,7 @@ OptionMenu "MFXOptionsMenu" Slider "Saturation Gamma", "mfx_gradesatpow", 0, 2, 0.01, 2 Slider "Value Intensity", "mfx_gradevalmul", 0, 2, 0.01, 2 Slider "Value Gamma", "mfx_gradevalpow", 0, 2, 0.01, 2 - Command "Reset to Default", "event resetmfxvars 2" + SafeCommand "Reset to Default", "event resetmfxvars 2" StaticText " " StaticText "Color Matrix", "Gold" StaticText " " @@ -121,7 +121,7 @@ OptionMenu "MFXOptionsMenu" Slider "Blue->Red", "mfx_cmat_br", -2, 2, 0.01, 2 Slider "Blue->Green", "mfx_cmat_bg", -2, 2, 0.01, 2 Slider "Blue->Blue", "mfx_cmat_bb", -2, 2, 0.01, 2 - Command "Reset to Default", "event resetmfxvars 3" + SafeCommand "Reset to Default", "event resetmfxvars 3" StaticText " " StaticText "Hue-Saturation", "Gold" StaticText " " @@ -148,7 +148,7 @@ OptionMenu "MFXOptionsMenu" Slider "Magenta Hue", "mfx_hshue_m", -1, 1, 0.01, 2 Slider "Magenta Saturation", "mfx_hssat_m", -1, 1, 0.01, 2 Slider "Magenta Value", "mfx_hsval_m", -1, 1, 0.01, 2 - Command "Reset to Default", "event resetmfxvars 4" + SafeCommand "Reset to Default", "event resetmfxvars 4" StaticText " " StaticText "BlurSharpShift", "Gold" StaticText " " @@ -162,7 +162,7 @@ OptionMenu "MFXOptionsMenu" Slider "Sharp Amount", "mfx_bsssharpamount", 0, 8, 0.1, 1 Option "Shift Enable", "mfx_bssshiftenable", "YesNo" Slider "Shift Radius", "mfx_bssshiftradius", 0, 1, 0.05, 2 - Command "Reset to Default", "event resetmfxvars 5" + SafeCommand "Reset to Default", "event resetmfxvars 5" StaticText " " StaticText "Vignette / Border Blur", "Gold" StaticText " " @@ -180,12 +180,12 @@ OptionMenu "MFXOptionsMenu" Slider "Blur Intensity", "mfx_bblurmul", 0, 2, 0.01, 2 Slider "Blur Offset", "mfx_bblurbump", -1, 1, 0.01, 2 Slider "Blur Radius", "mfx_bblurradius", 0, 4, 0.01, 2 - Command "Reset to Default", "event resetmfxvars 6" + SafeCommand "Reset to Default", "event resetmfxvars 6" StaticText " " StaticText "Palette", "Gold" StaticText " " Option "Enable", "mfx_palenable", "YesNo" Option "Palette", "mfx_palnum", "MFXPalette" Slider "Dithering", "mfx_paldither", 0, 1, 0.01, 2 - Command "Reset to Default", "event resetmfxvars 7" + SafeCommand "Reset to Default", "event resetmfxvars 7" } diff --git a/zscript.txt b/zscript.txt index bea78fb..4ec2cc6 100644 --- a/zscript.txt +++ b/zscript.txt @@ -41,20 +41,20 @@ Class MariFXHandler : StaticEventHandler override void RenderOverlay( RenderEvent e ) { PlayerInfo p = players[consoleplayer]; - if ( !mfx_lsharpenable ) mfx_lsharpenable = CVar.GetCVar('mfx_lsharpenable',p); - if ( !mfx_lsharpradius ) mfx_lsharpradius = CVar.GetCVar('mfx_lsharpradius',p); - if ( !mfx_lsharpclamp ) mfx_lsharpclamp = CVar.GetCVar('mfx_lsharpclamp',p); - if ( !mfx_lsharpblend ) mfx_lsharpblend = CVar.GetCVar('mfx_lsharpblend',p); + if ( !mfx_lsharpenable ) mfx_lsharpenable = CVar.FindCVar('mfx_lsharpenable'); + if ( !mfx_lsharpradius ) mfx_lsharpradius = CVar.FindCVar('mfx_lsharpradius'); + if ( !mfx_lsharpclamp ) mfx_lsharpclamp = CVar.FindCVar('mfx_lsharpclamp'); + if ( !mfx_lsharpblend ) mfx_lsharpblend = CVar.FindCVar('mfx_lsharpblend'); Shader.SetEnabled(p,"mfx_lumasharp",mfx_lsharpenable.GetBool()); Shader.SetUniform1f(p,"mfx_lumasharp","sharpradius",mfx_lsharpradius.GetFloat()); Shader.SetUniform1f(p,"mfx_lumasharp","sharpclamp",mfx_lsharpclamp.GetFloat()); Shader.SetUniform1f(p,"mfx_lumasharp","sharpblend",mfx_lsharpblend.GetFloat()); - if ( !mfx_ne ) mfx_ne = CVar.GetCVar('mfx_ne',p); - if ( !mfx_ni ) mfx_ni = CVar.GetCVar('mfx_ni',p); - if ( !mfx_ns ) mfx_ns = CVar.GetCVar('mfx_ns',p); - if ( !mfx_np ) mfx_np = CVar.GetCVar('mfx_np',p); - if ( !mfx_bnp ) mfx_bnp = CVar.GetCVar('mfx_bnp',p); - if ( !mfx_nb ) mfx_nb = CVar.GetCVar('mfx_nb',p); + if ( !mfx_ne ) mfx_ne = CVar.FindCVar('mfx_ne'); + if ( !mfx_ni ) mfx_ni = CVar.FindCVar('mfx_ni'); + if ( !mfx_ns ) mfx_ns = CVar.FindCVar('mfx_ns'); + if ( !mfx_np ) mfx_np = CVar.FindCVar('mfx_np'); + if ( !mfx_bnp ) mfx_bnp = CVar.FindCVar('mfx_bnp'); + if ( !mfx_nb ) mfx_nb = CVar.FindCVar('mfx_nb'); Shader.SetEnabled(p,"mfx_grain",mfx_ne.GetBool()); Shader.SetUniform1f(p,"mfx_grain","ni",mfx_ni.GetFloat()); Shader.SetUniform1f(p,"mfx_grain","ns",mfx_ns.GetFloat()); @@ -62,27 +62,27 @@ Class MariFXHandler : StaticEventHandler Shader.SetUniform1f(p,"mfx_grain","bnp",mfx_bnp.GetFloat()); Shader.SetUniform1i(p,"mfx_grain","nb",mfx_nb.GetInt()); Shader.SetUniform1f(p,"mfx_grain","Timer",(gametic+e.fractic)/35.); - if ( !mfx_dirtenable ) mfx_dirtenable = CVar.GetCVar('mfx_dirtenable',p); - if ( !mfx_dirtmc ) mfx_dirtmc = CVar.GetCVar('mfx_dirtmc',p); - if ( !mfx_dirtcfactor ) mfx_dirtcfactor = CVar.GetCVar('mfx_dirtcfactor',p); + if ( !mfx_dirtenable ) mfx_dirtenable = CVar.FindCVar('mfx_dirtenable'); + if ( !mfx_dirtmc ) mfx_dirtmc = CVar.FindCVar('mfx_dirtmc'); + if ( !mfx_dirtcfactor ) mfx_dirtcfactor = CVar.FindCVar('mfx_dirtcfactor'); Shader.SetEnabled(p,"mfx_dirt",mfx_dirtenable.GetBool()); Shader.SetUniform1f(p,"mfx_dirt","dirtmc",mfx_dirtmc.GetFloat()); Shader.SetUniform1f(p,"mfx_dirt","dirtcfactor",mfx_dirtcfactor.GetFloat()); - if ( !mfx_gradeenable ) mfx_gradeenable = CVar.GetCVar('mfx_gradeenable',p); - if ( !mfx_grademul_r ) mfx_grademul_r = CVar.GetCVar('mfx_grademul_r',p); - if ( !mfx_grademul_g ) mfx_grademul_g = CVar.GetCVar('mfx_grademul_g',p); - if ( !mfx_grademul_b ) mfx_grademul_b = CVar.GetCVar('mfx_grademul_b',p); - if ( !mfx_gradepow_r ) mfx_gradepow_r = CVar.GetCVar('mfx_gradepow_r',p); - if ( !mfx_gradepow_g ) mfx_gradepow_g = CVar.GetCVar('mfx_gradepow_g',p); - if ( !mfx_gradepow_b ) mfx_gradepow_b = CVar.GetCVar('mfx_gradepow_b',p); - if ( !mfx_gradecol_r ) mfx_gradecol_r = CVar.GetCVar('mfx_gradecol_r',p); - if ( !mfx_gradecol_g ) mfx_gradecol_g = CVar.GetCVar('mfx_gradecol_g',p); - if ( !mfx_gradecol_b ) mfx_gradecol_b = CVar.GetCVar('mfx_gradecol_b',p); - if ( !mfx_gradecolfact ) mfx_gradecolfact = CVar.GetCVar('mfx_gradecolfact',p); - if ( !mfx_gradesatmul ) mfx_gradesatmul = CVar.GetCVar('mfx_gradesatmul',p); - if ( !mfx_gradesatpow ) mfx_gradesatpow = CVar.GetCVar('mfx_gradesatpow',p); - if ( !mfx_gradevalmul ) mfx_gradevalmul = CVar.GetCVar('mfx_gradevalmul',p); - if ( !mfx_gradevalpow ) mfx_gradevalpow = CVar.GetCVar('mfx_gradevalpow',p); + if ( !mfx_gradeenable ) mfx_gradeenable = CVar.FindCVar('mfx_gradeenable'); + if ( !mfx_grademul_r ) mfx_grademul_r = CVar.FindCVar('mfx_grademul_r'); + if ( !mfx_grademul_g ) mfx_grademul_g = CVar.FindCVar('mfx_grademul_g'); + if ( !mfx_grademul_b ) mfx_grademul_b = CVar.FindCVar('mfx_grademul_b'); + if ( !mfx_gradepow_r ) mfx_gradepow_r = CVar.FindCVar('mfx_gradepow_r'); + if ( !mfx_gradepow_g ) mfx_gradepow_g = CVar.FindCVar('mfx_gradepow_g'); + if ( !mfx_gradepow_b ) mfx_gradepow_b = CVar.FindCVar('mfx_gradepow_b'); + if ( !mfx_gradecol_r ) mfx_gradecol_r = CVar.FindCVar('mfx_gradecol_r'); + if ( !mfx_gradecol_g ) mfx_gradecol_g = CVar.FindCVar('mfx_gradecol_g'); + if ( !mfx_gradecol_b ) mfx_gradecol_b = CVar.FindCVar('mfx_gradecol_b'); + if ( !mfx_gradecolfact ) mfx_gradecolfact = CVar.FindCVar('mfx_gradecolfact'); + if ( !mfx_gradesatmul ) mfx_gradesatmul = CVar.FindCVar('mfx_gradesatmul'); + if ( !mfx_gradesatpow ) mfx_gradesatpow = CVar.FindCVar('mfx_gradesatpow'); + if ( !mfx_gradevalmul ) mfx_gradevalmul = CVar.FindCVar('mfx_gradevalmul'); + if ( !mfx_gradevalpow ) mfx_gradevalpow = CVar.FindCVar('mfx_gradevalpow'); Shader.SetEnabled(p,"mfx_grading",mfx_gradeenable.GetBool()); Shader.SetUniform3f(p,"mfx_grading","grademul",(mfx_grademul_r.GetFloat(),mfx_grademul_g.GetFloat(),mfx_grademul_b.GetFloat())); Shader.SetUniform3f(p,"mfx_grading","gradepow",(mfx_gradepow_r.GetFloat(),mfx_gradepow_g.GetFloat(),mfx_gradepow_b.GetFloat())); @@ -92,43 +92,43 @@ Class MariFXHandler : StaticEventHandler Shader.SetUniform1f(p,"mfx_grading","gradesatpow",mfx_gradesatpow.GetFloat()); Shader.SetUniform1f(p,"mfx_grading","gradevalmul",mfx_gradevalmul.GetFloat()); Shader.SetUniform1f(p,"mfx_grading","gradevalpow",mfx_gradevalpow.GetFloat()); - if ( !mfx_cmatenable ) mfx_cmatenable = CVar.GetCVar('mfx_cmatenable',p); - if ( !mfx_cmat_rr ) mfx_cmat_rr = CVar.GetCVar('mfx_cmat_rr',p); - if ( !mfx_cmat_rg ) mfx_cmat_rg = CVar.GetCVar('mfx_cmat_rg',p); - if ( !mfx_cmat_rb ) mfx_cmat_rb = CVar.GetCVar('mfx_cmat_rb',p); - if ( !mfx_cmat_gr ) mfx_cmat_gr = CVar.GetCVar('mfx_cmat_gr',p); - if ( !mfx_cmat_gg ) mfx_cmat_gg = CVar.GetCVar('mfx_cmat_gg',p); - if ( !mfx_cmat_gb ) mfx_cmat_gb = CVar.GetCVar('mfx_cmat_gb',p); - if ( !mfx_cmat_br ) mfx_cmat_br = CVar.GetCVar('mfx_cmat_br',p); - if ( !mfx_cmat_bg ) mfx_cmat_bg = CVar.GetCVar('mfx_cmat_bg',p); - if ( !mfx_cmat_bb ) mfx_cmat_bb = CVar.GetCVar('mfx_cmat_bb',p); + if ( !mfx_cmatenable ) mfx_cmatenable = CVar.FindCVar('mfx_cmatenable'); + if ( !mfx_cmat_rr ) mfx_cmat_rr = CVar.FindCVar('mfx_cmat_rr'); + if ( !mfx_cmat_rg ) mfx_cmat_rg = CVar.FindCVar('mfx_cmat_rg'); + if ( !mfx_cmat_rb ) mfx_cmat_rb = CVar.FindCVar('mfx_cmat_rb'); + if ( !mfx_cmat_gr ) mfx_cmat_gr = CVar.FindCVar('mfx_cmat_gr'); + if ( !mfx_cmat_gg ) mfx_cmat_gg = CVar.FindCVar('mfx_cmat_gg'); + if ( !mfx_cmat_gb ) mfx_cmat_gb = CVar.FindCVar('mfx_cmat_gb'); + if ( !mfx_cmat_br ) mfx_cmat_br = CVar.FindCVar('mfx_cmat_br'); + if ( !mfx_cmat_bg ) mfx_cmat_bg = CVar.FindCVar('mfx_cmat_bg'); + if ( !mfx_cmat_bb ) mfx_cmat_bb = CVar.FindCVar('mfx_cmat_bb'); Shader.SetEnabled(p,"mfx_colormatrix",mfx_cmatenable.GetBool()); Shader.SetUniform3f(p,"mfx_colormatrix","redrow",(mfx_cmat_rr.GetFloat(),mfx_cmat_rg.GetFloat(),mfx_cmat_rb.GetFloat())); Shader.SetUniform3f(p,"mfx_colormatrix","greenrow",(mfx_cmat_gr.GetFloat(),mfx_cmat_gg.GetFloat(),mfx_cmat_gb.GetFloat())); Shader.SetUniform3f(p,"mfx_colormatrix","bluerow",(mfx_cmat_br.GetFloat(),mfx_cmat_bg.GetFloat(),mfx_cmat_bb.GetFloat())); - if ( !mfx_hsenable ) mfx_hsenable = CVar.GetCVar('mfx_hsenable',p); - if ( !mfx_hsover ) mfx_hsover = CVar.GetCVar('mfx_hsover',p); - if ( !mfx_hshue_a ) mfx_hshue_a = CVar.GetCVar('mfx_hshue_a',p); - if ( !mfx_hssat_a ) mfx_hssat_a = CVar.GetCVar('mfx_hssat_a',p); - if ( !mfx_hsval_a ) mfx_hsval_a = CVar.GetCVar('mfx_hsval_a',p); - if ( !mfx_hshue_r ) mfx_hshue_r = CVar.GetCVar('mfx_hshue_r',p); - if ( !mfx_hssat_r ) mfx_hssat_r = CVar.GetCVar('mfx_hssat_r',p); - if ( !mfx_hsval_r ) mfx_hsval_r = CVar.GetCVar('mfx_hsval_r',p); - if ( !mfx_hshue_y ) mfx_hshue_y = CVar.GetCVar('mfx_hshue_y',p); - if ( !mfx_hssat_y ) mfx_hssat_y = CVar.GetCVar('mfx_hssat_y',p); - if ( !mfx_hsval_y ) mfx_hsval_y = CVar.GetCVar('mfx_hsval_y',p); - if ( !mfx_hshue_g ) mfx_hshue_g = CVar.GetCVar('mfx_hshue_g',p); - if ( !mfx_hssat_g ) mfx_hssat_g = CVar.GetCVar('mfx_hssat_g',p); - if ( !mfx_hsval_g ) mfx_hsval_g = CVar.GetCVar('mfx_hsval_g',p); - if ( !mfx_hshue_c ) mfx_hshue_c = CVar.GetCVar('mfx_hshue_c',p); - if ( !mfx_hssat_c ) mfx_hssat_c = CVar.GetCVar('mfx_hssat_c',p); - if ( !mfx_hsval_c ) mfx_hsval_c = CVar.GetCVar('mfx_hsval_c',p); - if ( !mfx_hshue_b ) mfx_hshue_b = CVar.GetCVar('mfx_hshue_b',p); - if ( !mfx_hssat_b ) mfx_hssat_b = CVar.GetCVar('mfx_hssat_b',p); - if ( !mfx_hsval_b ) mfx_hsval_b = CVar.GetCVar('mfx_hsval_b',p); - if ( !mfx_hshue_m ) mfx_hshue_m = CVar.GetCVar('mfx_hshue_m',p); - if ( !mfx_hssat_m ) mfx_hssat_m = CVar.GetCVar('mfx_hssat_m',p); - if ( !mfx_hsval_m ) mfx_hsval_m = CVar.GetCVar('mfx_hsval_m',p); + if ( !mfx_hsenable ) mfx_hsenable = CVar.FindCVar('mfx_hsenable'); + if ( !mfx_hsover ) mfx_hsover = CVar.FindCVar('mfx_hsover'); + if ( !mfx_hshue_a ) mfx_hshue_a = CVar.FindCVar('mfx_hshue_a'); + if ( !mfx_hssat_a ) mfx_hssat_a = CVar.FindCVar('mfx_hssat_a'); + if ( !mfx_hsval_a ) mfx_hsval_a = CVar.FindCVar('mfx_hsval_a'); + if ( !mfx_hshue_r ) mfx_hshue_r = CVar.FindCVar('mfx_hshue_r'); + if ( !mfx_hssat_r ) mfx_hssat_r = CVar.FindCVar('mfx_hssat_r'); + if ( !mfx_hsval_r ) mfx_hsval_r = CVar.FindCVar('mfx_hsval_r'); + if ( !mfx_hshue_y ) mfx_hshue_y = CVar.FindCVar('mfx_hshue_y'); + if ( !mfx_hssat_y ) mfx_hssat_y = CVar.FindCVar('mfx_hssat_y'); + if ( !mfx_hsval_y ) mfx_hsval_y = CVar.FindCVar('mfx_hsval_y'); + if ( !mfx_hshue_g ) mfx_hshue_g = CVar.FindCVar('mfx_hshue_g'); + if ( !mfx_hssat_g ) mfx_hssat_g = CVar.FindCVar('mfx_hssat_g'); + if ( !mfx_hsval_g ) mfx_hsval_g = CVar.FindCVar('mfx_hsval_g'); + if ( !mfx_hshue_c ) mfx_hshue_c = CVar.FindCVar('mfx_hshue_c'); + if ( !mfx_hssat_c ) mfx_hssat_c = CVar.FindCVar('mfx_hssat_c'); + if ( !mfx_hsval_c ) mfx_hsval_c = CVar.FindCVar('mfx_hsval_c'); + if ( !mfx_hshue_b ) mfx_hshue_b = CVar.FindCVar('mfx_hshue_b'); + if ( !mfx_hssat_b ) mfx_hssat_b = CVar.FindCVar('mfx_hssat_b'); + if ( !mfx_hsval_b ) mfx_hsval_b = CVar.FindCVar('mfx_hsval_b'); + if ( !mfx_hshue_m ) mfx_hshue_m = CVar.FindCVar('mfx_hshue_m'); + if ( !mfx_hssat_m ) mfx_hssat_m = CVar.FindCVar('mfx_hssat_m'); + if ( !mfx_hsval_m ) mfx_hsval_m = CVar.FindCVar('mfx_hsval_m'); Shader.SetEnabled(p,"mfx_huesaturation",mfx_hsenable.GetBool()); Shader.SetUniform1f(p,"mfx_huesaturation","hsover",mfx_hsover.GetFloat()); Shader.SetUniform1f(p,"mfx_huesaturation","hshue_a",mfx_hshue_a.GetFloat()); @@ -152,13 +152,13 @@ Class MariFXHandler : StaticEventHandler Shader.SetUniform1f(p,"mfx_huesaturation","hshue_m",mfx_hshue_m.GetFloat()); Shader.SetUniform1f(p,"mfx_huesaturation","hssat_m",mfx_hssat_m.GetFloat()); Shader.SetUniform1f(p,"mfx_huesaturation","hsval_m",mfx_hsval_m.GetFloat()); - if ( !mfx_bssblurenable ) mfx_bssblurenable = CVar.GetCVar('mfx_bssblurenable',p); - if ( !mfx_bssblurradius ) mfx_bssblurradius = CVar.GetCVar('mfx_bssblurradius',p); - if ( !mfx_bsssharpenable ) mfx_bsssharpenable = CVar.GetCVar('mfx_bsssharpenable',p); - if ( !mfx_bsssharpradius ) mfx_bsssharpradius = CVar.GetCVar('mfx_bsssharpradius',p); - if ( !mfx_bsssharpamount ) mfx_bsssharpamount = CVar.GetCVar('mfx_bsssharpamount',p); - if ( !mfx_bssshiftenable ) mfx_bssshiftenable = CVar.GetCVar('mfx_bssshiftenable',p); - if ( !mfx_bssshiftradius ) mfx_bssshiftradius = CVar.GetCVar('mfx_bssshiftradius',p); + if ( !mfx_bssblurenable ) mfx_bssblurenable = CVar.FindCVar('mfx_bssblurenable'); + if ( !mfx_bssblurradius ) mfx_bssblurradius = CVar.FindCVar('mfx_bssblurradius'); + if ( !mfx_bsssharpenable ) mfx_bsssharpenable = CVar.FindCVar('mfx_bsssharpenable'); + if ( !mfx_bsssharpradius ) mfx_bsssharpradius = CVar.FindCVar('mfx_bsssharpradius'); + if ( !mfx_bsssharpamount ) mfx_bsssharpamount = CVar.FindCVar('mfx_bsssharpamount'); + if ( !mfx_bssshiftenable ) mfx_bssshiftenable = CVar.FindCVar('mfx_bssshiftenable'); + if ( !mfx_bssshiftradius ) mfx_bssshiftradius = CVar.FindCVar('mfx_bssshiftradius'); Shader.SetEnabled(p,"mfx_bss_blur",mfx_bssblurenable.GetBool()); Shader.SetUniform1f(p,"mfx_bss_blur","bssblurradius",mfx_bssblurradius.GetFloat()); Shader.SetEnabled(p,"mfx_bss_sharp",mfx_bsssharpenable.GetBool()); @@ -166,20 +166,20 @@ Class MariFXHandler : StaticEventHandler Shader.SetUniform1f(p,"mfx_bss_sharp","bsssharpamount",mfx_bsssharpamount.GetFloat()); Shader.SetEnabled(p,"mfx_bss_shift",mfx_bssshiftenable.GetBool()); Shader.SetUniform1f(p,"mfx_bss_shift","bssshiftradius",mfx_bssshiftradius.GetFloat()); - if ( !mfx_vigenable ) mfx_vigenable = CVar.GetCVar('mfx_vigenable',p); - if ( !mfx_vigcolor_r ) mfx_vigcolor_r = CVar.GetCVar('mfx_vigcolor_r',p); - if ( !mfx_vigcolor_g ) mfx_vigcolor_g = CVar.GetCVar('mfx_vigcolor_g',p); - if ( !mfx_vigcolor_b ) mfx_vigcolor_b = CVar.GetCVar('mfx_vigcolor_b',p); - if ( !mfx_vigpow ) mfx_vigpow = CVar.GetCVar('mfx_vigpow',p); - if ( !mfx_vigmul ) mfx_vigmul = CVar.GetCVar('mfx_vigmul',p); - if ( !mfx_vigbump ) mfx_vigbump = CVar.GetCVar('mfx_vigbump',p); - if ( !mfx_bblurenable ) mfx_bblurenable = CVar.GetCVar('mfx_bblurenable',p); - if ( !mfx_bblurpow ) mfx_bblurpow = CVar.GetCVar('mfx_bblurpow',p); - if ( !mfx_bblurmul ) mfx_bblurmul = CVar.GetCVar('mfx_bblurmul',p); - if ( !mfx_bblurbump ) mfx_bblurbump = CVar.GetCVar('mfx_bblurbump',p); - if ( !mfx_bblurradius ) mfx_bblurradius = CVar.GetCVar('mfx_bblurradius',p); - if ( !mfx_vigshape ) mfx_vigshape = CVar.GetCVar('mfx_vigshape',p); - if ( !mfx_vigmode ) mfx_vigmode = CVar.GetCVar('mfx_vigmode',p); + if ( !mfx_vigenable ) mfx_vigenable = CVar.FindCVar('mfx_vigenable'); + if ( !mfx_vigcolor_r ) mfx_vigcolor_r = CVar.FindCVar('mfx_vigcolor_r'); + if ( !mfx_vigcolor_g ) mfx_vigcolor_g = CVar.FindCVar('mfx_vigcolor_g'); + if ( !mfx_vigcolor_b ) mfx_vigcolor_b = CVar.FindCVar('mfx_vigcolor_b'); + if ( !mfx_vigpow ) mfx_vigpow = CVar.FindCVar('mfx_vigpow'); + if ( !mfx_vigmul ) mfx_vigmul = CVar.FindCVar('mfx_vigmul'); + if ( !mfx_vigbump ) mfx_vigbump = CVar.FindCVar('mfx_vigbump'); + if ( !mfx_bblurenable ) mfx_bblurenable = CVar.FindCVar('mfx_bblurenable'); + if ( !mfx_bblurpow ) mfx_bblurpow = CVar.FindCVar('mfx_bblurpow'); + if ( !mfx_bblurmul ) mfx_bblurmul = CVar.FindCVar('mfx_bblurmul'); + if ( !mfx_bblurbump ) mfx_bblurbump = CVar.FindCVar('mfx_bblurbump'); + if ( !mfx_bblurradius ) mfx_bblurradius = CVar.FindCVar('mfx_bblurradius'); + if ( !mfx_vigshape ) mfx_vigshape = CVar.FindCVar('mfx_vigshape'); + if ( !mfx_vigmode ) mfx_vigmode = CVar.FindCVar('mfx_vigmode'); Shader.SetEnabled(p,"mfx_borderblur",mfx_bblurenable.GetBool()); Shader.SetUniform1f(p,"mfx_borderblur","vigpow",mfx_vigpow.GetFloat()); Shader.SetUniform1f(p,"mfx_borderblur","vigmul",mfx_vigmul.GetFloat()); @@ -196,9 +196,9 @@ Class MariFXHandler : StaticEventHandler Shader.SetUniform1f(p,"mfx_vignette","vigbump",mfx_vigbump.GetFloat()); Shader.SetUniform1i(p,"mfx_vignette","vigshape",mfx_vigshape.GetInt()); Shader.SetUniform1i(p,"mfx_vignette","vigmode",mfx_vigmode.GetInt()); - if ( !mfx_palenable ) mfx_palenable = CVar.GetCVar('mfx_palenable',p); - if ( !mfx_palnum ) mfx_palnum = CVar.GetCVar('mfx_palnum',p); - if ( !mfx_paldither ) mfx_paldither = CVar.GetCVar('mfx_paldither',p); + if ( !mfx_palenable ) mfx_palenable = CVar.FindCVar('mfx_palenable'); + if ( !mfx_palnum ) mfx_palnum = CVar.FindCVar('mfx_palnum'); + if ( !mfx_paldither ) mfx_paldither = CVar.FindCVar('mfx_paldither'); Shader.SetEnabled(p,"mfx_palette",mfx_palenable.GetBool()); Shader.SetUniform1i(p,"mfx_palette","palnum",mfx_palnum.GetInt()); Shader.SetUniform1f(p,"mfx_palette","paldither",mfx_paldither.GetFloat()); @@ -211,12 +211,12 @@ Class MariFXHandler : StaticEventHandler switch( e.args[0] ) { case 0: - if ( !mfx_ne ) mfx_ne = CVar.GetCVar('mfx_ne',p); - if ( !mfx_ni ) mfx_ni = CVar.GetCVar('mfx_ni',p); - if ( !mfx_ns ) mfx_ns = CVar.GetCVar('mfx_ns',p); - if ( !mfx_np ) mfx_np = CVar.GetCVar('mfx_np',p); - if ( !mfx_bnp ) mfx_bnp = CVar.GetCVar('mfx_bnp',p); - if ( !mfx_nb ) mfx_nb = CVar.GetCVar('mfx_nb',p); + if ( !mfx_ne ) mfx_ne = CVar.FindCVar('mfx_ne'); + if ( !mfx_ni ) mfx_ni = CVar.FindCVar('mfx_ni'); + if ( !mfx_ns ) mfx_ns = CVar.FindCVar('mfx_ns'); + if ( !mfx_np ) mfx_np = CVar.FindCVar('mfx_np'); + if ( !mfx_bnp ) mfx_bnp = CVar.FindCVar('mfx_bnp'); + if ( !mfx_nb ) mfx_nb = CVar.FindCVar('mfx_nb'); mfx_ne.ResetToDefault(); mfx_ni.ResetToDefault(); mfx_ns.ResetToDefault(); @@ -225,29 +225,29 @@ Class MariFXHandler : StaticEventHandler mfx_nb.ResetToDefault(); break; case 1: - if ( !mfx_dirtenable ) mfx_dirtenable = CVar.GetCVar('mfx_dirtenable',p); - if ( !mfx_dirtmc ) mfx_dirtmc = CVar.GetCVar('mfx_dirtmc',p); - if ( !mfx_dirtcfactor ) mfx_dirtcfactor = CVar.GetCVar('mfx_dirtcfactor',p); + if ( !mfx_dirtenable ) mfx_dirtenable = CVar.FindCVar('mfx_dirtenable'); + if ( !mfx_dirtmc ) mfx_dirtmc = CVar.FindCVar('mfx_dirtmc'); + if ( !mfx_dirtcfactor ) mfx_dirtcfactor = CVar.FindCVar('mfx_dirtcfactor'); mfx_dirtenable.ResetToDefault(); mfx_dirtmc.ResetToDefault(); mfx_dirtcfactor.ResetToDefault(); break; case 2: - if ( !mfx_gradeenable ) mfx_gradeenable = CVar.GetCVar('mfx_gradeenable',p); - if ( !mfx_grademul_r ) mfx_grademul_r = CVar.GetCVar('mfx_grademul_r',p); - if ( !mfx_grademul_g ) mfx_grademul_g = CVar.GetCVar('mfx_grademul_g',p); - if ( !mfx_grademul_b ) mfx_grademul_b = CVar.GetCVar('mfx_grademul_b',p); - if ( !mfx_gradepow_r ) mfx_gradepow_r = CVar.GetCVar('mfx_gradepow_r',p); - if ( !mfx_gradepow_g ) mfx_gradepow_g = CVar.GetCVar('mfx_gradepow_g',p); - if ( !mfx_gradepow_b ) mfx_gradepow_b = CVar.GetCVar('mfx_gradepow_b',p); - if ( !mfx_gradecol_r ) mfx_gradecol_r = CVar.GetCVar('mfx_gradecol_r',p); - if ( !mfx_gradecol_g ) mfx_gradecol_g = CVar.GetCVar('mfx_gradecol_g',p); - if ( !mfx_gradecol_b ) mfx_gradecol_b = CVar.GetCVar('mfx_gradecol_b',p); - if ( !mfx_gradecolfact ) mfx_gradecolfact = CVar.GetCVar('mfx_gradecolfact',p); - if ( !mfx_gradesatmul ) mfx_gradesatmul = CVar.GetCVar('mfx_gradesatmul',p); - if ( !mfx_gradesatpow ) mfx_gradesatpow = CVar.GetCVar('mfx_gradesatpow',p); - if ( !mfx_gradevalmul ) mfx_gradevalmul = CVar.GetCVar('mfx_gradevalmul',p); - if ( !mfx_gradevalpow ) mfx_gradevalpow = CVar.GetCVar('mfx_gradevalpow',p); + if ( !mfx_gradeenable ) mfx_gradeenable = CVar.FindCVar('mfx_gradeenable'); + if ( !mfx_grademul_r ) mfx_grademul_r = CVar.FindCVar('mfx_grademul_r'); + if ( !mfx_grademul_g ) mfx_grademul_g = CVar.FindCVar('mfx_grademul_g'); + if ( !mfx_grademul_b ) mfx_grademul_b = CVar.FindCVar('mfx_grademul_b'); + if ( !mfx_gradepow_r ) mfx_gradepow_r = CVar.FindCVar('mfx_gradepow_r'); + if ( !mfx_gradepow_g ) mfx_gradepow_g = CVar.FindCVar('mfx_gradepow_g'); + if ( !mfx_gradepow_b ) mfx_gradepow_b = CVar.FindCVar('mfx_gradepow_b'); + if ( !mfx_gradecol_r ) mfx_gradecol_r = CVar.FindCVar('mfx_gradecol_r'); + if ( !mfx_gradecol_g ) mfx_gradecol_g = CVar.FindCVar('mfx_gradecol_g'); + if ( !mfx_gradecol_b ) mfx_gradecol_b = CVar.FindCVar('mfx_gradecol_b'); + if ( !mfx_gradecolfact ) mfx_gradecolfact = CVar.FindCVar('mfx_gradecolfact'); + if ( !mfx_gradesatmul ) mfx_gradesatmul = CVar.FindCVar('mfx_gradesatmul'); + if ( !mfx_gradesatpow ) mfx_gradesatpow = CVar.FindCVar('mfx_gradesatpow'); + if ( !mfx_gradevalmul ) mfx_gradevalmul = CVar.FindCVar('mfx_gradevalmul'); + if ( !mfx_gradevalpow ) mfx_gradevalpow = CVar.FindCVar('mfx_gradevalpow'); mfx_gradeenable.ResetToDefault(); mfx_grademul_r.ResetToDefault(); mfx_grademul_g.ResetToDefault(); @@ -265,16 +265,16 @@ Class MariFXHandler : StaticEventHandler mfx_gradevalpow.ResetToDefault(); break; case 3: - if ( !mfx_cmatenable ) mfx_cmatenable = CVar.GetCVar('mfx_cmatenable',p); - if ( !mfx_cmat_rr ) mfx_cmat_rr = CVar.GetCVar('mfx_cmat_rr',p); - if ( !mfx_cmat_rg ) mfx_cmat_rg = CVar.GetCVar('mfx_cmat_rg',p); - if ( !mfx_cmat_rb ) mfx_cmat_rb = CVar.GetCVar('mfx_cmat_rb',p); - if ( !mfx_cmat_gr ) mfx_cmat_gr = CVar.GetCVar('mfx_cmat_gr',p); - if ( !mfx_cmat_gg ) mfx_cmat_gg = CVar.GetCVar('mfx_cmat_gg',p); - if ( !mfx_cmat_gb ) mfx_cmat_gb = CVar.GetCVar('mfx_cmat_gb',p); - if ( !mfx_cmat_br ) mfx_cmat_br = CVar.GetCVar('mfx_cmat_br',p); - if ( !mfx_cmat_bg ) mfx_cmat_bg = CVar.GetCVar('mfx_cmat_bg',p); - if ( !mfx_cmat_bb ) mfx_cmat_bb = CVar.GetCVar('mfx_cmat_bb',p); + if ( !mfx_cmatenable ) mfx_cmatenable = CVar.FindCVar('mfx_cmatenable'); + if ( !mfx_cmat_rr ) mfx_cmat_rr = CVar.FindCVar('mfx_cmat_rr'); + if ( !mfx_cmat_rg ) mfx_cmat_rg = CVar.FindCVar('mfx_cmat_rg'); + if ( !mfx_cmat_rb ) mfx_cmat_rb = CVar.FindCVar('mfx_cmat_rb'); + if ( !mfx_cmat_gr ) mfx_cmat_gr = CVar.FindCVar('mfx_cmat_gr'); + if ( !mfx_cmat_gg ) mfx_cmat_gg = CVar.FindCVar('mfx_cmat_gg'); + if ( !mfx_cmat_gb ) mfx_cmat_gb = CVar.FindCVar('mfx_cmat_gb'); + if ( !mfx_cmat_br ) mfx_cmat_br = CVar.FindCVar('mfx_cmat_br'); + if ( !mfx_cmat_bg ) mfx_cmat_bg = CVar.FindCVar('mfx_cmat_bg'); + if ( !mfx_cmat_bb ) mfx_cmat_bb = CVar.FindCVar('mfx_cmat_bb'); mfx_cmatenable.ResetToDefault(); mfx_cmat_rr.ResetToDefault(); mfx_cmat_rg.ResetToDefault(); @@ -287,29 +287,29 @@ Class MariFXHandler : StaticEventHandler mfx_cmat_bb.ResetToDefault(); break; case 4: - if ( !mfx_hsenable ) mfx_hsenable = CVar.GetCVar('mfx_hsenable',p); - if ( !mfx_hsover ) mfx_hsover = CVar.GetCVar('mfx_hsover',p); - if ( !mfx_hshue_a ) mfx_hshue_a = CVar.GetCVar('mfx_hshue_a',p); - if ( !mfx_hssat_a ) mfx_hssat_a = CVar.GetCVar('mfx_hssat_a',p); - if ( !mfx_hsval_a ) mfx_hsval_a = CVar.GetCVar('mfx_hsval_a',p); - if ( !mfx_hshue_r ) mfx_hshue_r = CVar.GetCVar('mfx_hshue_r',p); - if ( !mfx_hssat_r ) mfx_hssat_r = CVar.GetCVar('mfx_hssat_r',p); - if ( !mfx_hsval_r ) mfx_hsval_r = CVar.GetCVar('mfx_hsval_r',p); - if ( !mfx_hshue_y ) mfx_hshue_y = CVar.GetCVar('mfx_hshue_y',p); - if ( !mfx_hssat_y ) mfx_hssat_y = CVar.GetCVar('mfx_hssat_y',p); - if ( !mfx_hsval_y ) mfx_hsval_y = CVar.GetCVar('mfx_hsval_y',p); - if ( !mfx_hshue_g ) mfx_hshue_g = CVar.GetCVar('mfx_hshue_g',p); - if ( !mfx_hssat_g ) mfx_hssat_g = CVar.GetCVar('mfx_hssat_g',p); - if ( !mfx_hsval_g ) mfx_hsval_g = CVar.GetCVar('mfx_hsval_g',p); - if ( !mfx_hshue_c ) mfx_hshue_c = CVar.GetCVar('mfx_hshue_c',p); - if ( !mfx_hssat_c ) mfx_hssat_c = CVar.GetCVar('mfx_hssat_c',p); - if ( !mfx_hsval_c ) mfx_hsval_c = CVar.GetCVar('mfx_hsval_c',p); - if ( !mfx_hshue_b ) mfx_hshue_b = CVar.GetCVar('mfx_hshue_b',p); - if ( !mfx_hssat_b ) mfx_hssat_b = CVar.GetCVar('mfx_hssat_b',p); - if ( !mfx_hsval_b ) mfx_hsval_b = CVar.GetCVar('mfx_hsval_b',p); - if ( !mfx_hshue_m ) mfx_hshue_m = CVar.GetCVar('mfx_hshue_m',p); - if ( !mfx_hssat_m ) mfx_hssat_m = CVar.GetCVar('mfx_hssat_m',p); - if ( !mfx_hsval_m ) mfx_hsval_m = CVar.GetCVar('mfx_hsval_m',p); + if ( !mfx_hsenable ) mfx_hsenable = CVar.FindCVar('mfx_hsenable'); + if ( !mfx_hsover ) mfx_hsover = CVar.FindCVar('mfx_hsover'); + if ( !mfx_hshue_a ) mfx_hshue_a = CVar.FindCVar('mfx_hshue_a'); + if ( !mfx_hssat_a ) mfx_hssat_a = CVar.FindCVar('mfx_hssat_a'); + if ( !mfx_hsval_a ) mfx_hsval_a = CVar.FindCVar('mfx_hsval_a'); + if ( !mfx_hshue_r ) mfx_hshue_r = CVar.FindCVar('mfx_hshue_r'); + if ( !mfx_hssat_r ) mfx_hssat_r = CVar.FindCVar('mfx_hssat_r'); + if ( !mfx_hsval_r ) mfx_hsval_r = CVar.FindCVar('mfx_hsval_r'); + if ( !mfx_hshue_y ) mfx_hshue_y = CVar.FindCVar('mfx_hshue_y'); + if ( !mfx_hssat_y ) mfx_hssat_y = CVar.FindCVar('mfx_hssat_y'); + if ( !mfx_hsval_y ) mfx_hsval_y = CVar.FindCVar('mfx_hsval_y'); + if ( !mfx_hshue_g ) mfx_hshue_g = CVar.FindCVar('mfx_hshue_g'); + if ( !mfx_hssat_g ) mfx_hssat_g = CVar.FindCVar('mfx_hssat_g'); + if ( !mfx_hsval_g ) mfx_hsval_g = CVar.FindCVar('mfx_hsval_g'); + if ( !mfx_hshue_c ) mfx_hshue_c = CVar.FindCVar('mfx_hshue_c'); + if ( !mfx_hssat_c ) mfx_hssat_c = CVar.FindCVar('mfx_hssat_c'); + if ( !mfx_hsval_c ) mfx_hsval_c = CVar.FindCVar('mfx_hsval_c'); + if ( !mfx_hshue_b ) mfx_hshue_b = CVar.FindCVar('mfx_hshue_b'); + if ( !mfx_hssat_b ) mfx_hssat_b = CVar.FindCVar('mfx_hssat_b'); + if ( !mfx_hsval_b ) mfx_hsval_b = CVar.FindCVar('mfx_hsval_b'); + if ( !mfx_hshue_m ) mfx_hshue_m = CVar.FindCVar('mfx_hshue_m'); + if ( !mfx_hssat_m ) mfx_hssat_m = CVar.FindCVar('mfx_hssat_m'); + if ( !mfx_hsval_m ) mfx_hsval_m = CVar.FindCVar('mfx_hsval_m'); mfx_hsenable.ResetToDefault(); mfx_hsover.ResetToDefault(); mfx_hshue_a.ResetToDefault(); @@ -335,13 +335,13 @@ Class MariFXHandler : StaticEventHandler mfx_hsval_m.ResetToDefault(); break; case 5: - if ( !mfx_bssblurenable ) mfx_bssblurenable = CVar.GetCVar('mfx_bssblurenable',p); - if ( !mfx_bssblurradius ) mfx_bssblurradius = CVar.GetCVar('mfx_bssblurradius',p); - if ( !mfx_bsssharpenable ) mfx_bsssharpenable = CVar.GetCVar('mfx_bsssharpenable',p); - if ( !mfx_bsssharpradius ) mfx_bsssharpradius = CVar.GetCVar('mfx_bsssharpradius',p); - if ( !mfx_bsssharpamount ) mfx_bsssharpamount = CVar.GetCVar('mfx_bsssharpamount',p); - if ( !mfx_bssshiftenable ) mfx_bssshiftenable = CVar.GetCVar('mfx_bssshiftenable',p); - if ( !mfx_bssshiftradius ) mfx_bssshiftradius = CVar.GetCVar('mfx_bssshiftradius',p); + if ( !mfx_bssblurenable ) mfx_bssblurenable = CVar.FindCVar('mfx_bssblurenable'); + if ( !mfx_bssblurradius ) mfx_bssblurradius = CVar.FindCVar('mfx_bssblurradius'); + if ( !mfx_bsssharpenable ) mfx_bsssharpenable = CVar.FindCVar('mfx_bsssharpenable'); + if ( !mfx_bsssharpradius ) mfx_bsssharpradius = CVar.FindCVar('mfx_bsssharpradius'); + if ( !mfx_bsssharpamount ) mfx_bsssharpamount = CVar.FindCVar('mfx_bsssharpamount'); + if ( !mfx_bssshiftenable ) mfx_bssshiftenable = CVar.FindCVar('mfx_bssshiftenable'); + if ( !mfx_bssshiftradius ) mfx_bssshiftradius = CVar.FindCVar('mfx_bssshiftradius'); mfx_bssblurenable.ResetToDefault(); mfx_bssblurradius.ResetToDefault(); mfx_bsssharpenable.ResetToDefault(); @@ -351,20 +351,20 @@ Class MariFXHandler : StaticEventHandler mfx_bssshiftradius.ResetToDefault(); break; case 6: - if ( !mfx_vigenable ) mfx_vigenable = CVar.GetCVar('mfx_vigenable',p); - if ( !mfx_vigcolor_r ) mfx_vigcolor_r = CVar.GetCVar('mfx_vigcolor_r',p); - if ( !mfx_vigcolor_g ) mfx_vigcolor_g = CVar.GetCVar('mfx_vigcolor_g',p); - if ( !mfx_vigcolor_b ) mfx_vigcolor_b = CVar.GetCVar('mfx_vigcolor_b',p); - if ( !mfx_vigpow ) mfx_vigpow = CVar.GetCVar('mfx_vigpow',p); - if ( !mfx_vigmul ) mfx_vigmul = CVar.GetCVar('mfx_vigmul',p); - if ( !mfx_vigbump ) mfx_vigbump = CVar.GetCVar('mfx_vigbump',p); - if ( !mfx_vigshape ) mfx_vigshape = CVar.GetCVar('mfx_vigshape',p); - if ( !mfx_vigmode ) mfx_vigmode = CVar.GetCVar('mfx_vigmode',p); - if ( !mfx_bblurenable ) mfx_bblurenable = CVar.GetCVar('mfx_bblurenable',p); - if ( !mfx_bblurpow ) mfx_bblurpow = CVar.GetCVar('mfx_bblurpow',p); - if ( !mfx_bblurmul ) mfx_bblurmul = CVar.GetCVar('mfx_bblurmul',p); - if ( !mfx_bblurbump ) mfx_bblurbump = CVar.GetCVar('mfx_bblurbump',p); - if ( !mfx_bblurradius ) mfx_bblurradius = CVar.GetCVar('mfx_bblurradius',p); + if ( !mfx_vigenable ) mfx_vigenable = CVar.FindCVar('mfx_vigenable'); + if ( !mfx_vigcolor_r ) mfx_vigcolor_r = CVar.FindCVar('mfx_vigcolor_r'); + if ( !mfx_vigcolor_g ) mfx_vigcolor_g = CVar.FindCVar('mfx_vigcolor_g'); + if ( !mfx_vigcolor_b ) mfx_vigcolor_b = CVar.FindCVar('mfx_vigcolor_b'); + if ( !mfx_vigpow ) mfx_vigpow = CVar.FindCVar('mfx_vigpow'); + if ( !mfx_vigmul ) mfx_vigmul = CVar.FindCVar('mfx_vigmul'); + if ( !mfx_vigbump ) mfx_vigbump = CVar.FindCVar('mfx_vigbump'); + if ( !mfx_vigshape ) mfx_vigshape = CVar.FindCVar('mfx_vigshape'); + if ( !mfx_vigmode ) mfx_vigmode = CVar.FindCVar('mfx_vigmode'); + if ( !mfx_bblurenable ) mfx_bblurenable = CVar.FindCVar('mfx_bblurenable'); + if ( !mfx_bblurpow ) mfx_bblurpow = CVar.FindCVar('mfx_bblurpow'); + if ( !mfx_bblurmul ) mfx_bblurmul = CVar.FindCVar('mfx_bblurmul'); + if ( !mfx_bblurbump ) mfx_bblurbump = CVar.FindCVar('mfx_bblurbump'); + if ( !mfx_bblurradius ) mfx_bblurradius = CVar.FindCVar('mfx_bblurradius'); mfx_bblurenable.ResetToDefault(); mfx_bblurpow.ResetToDefault(); mfx_bblurmul.ResetToDefault(); @@ -381,18 +381,18 @@ Class MariFXHandler : StaticEventHandler mfx_vigmode.ResetToDefault(); break; case 7: - if ( !mfx_palenable ) mfx_palenable = CVar.GetCVar('mfx_palenable',p); - if ( !mfx_palnum ) mfx_palnum = CVar.GetCVar('mfx_palnum',p); - if ( !mfx_paldither ) mfx_paldither = CVar.GetCVar('mfx_paldither',p); + if ( !mfx_palenable ) mfx_palenable = CVar.FindCVar('mfx_palenable'); + if ( !mfx_palnum ) mfx_palnum = CVar.FindCVar('mfx_palnum'); + if ( !mfx_paldither ) mfx_paldither = CVar.FindCVar('mfx_paldither'); mfx_palenable.ResetToDefault(); mfx_palnum.ResetToDefault(); mfx_paldither.ResetToDefault(); break; case 8: - if ( !mfx_lsharpenable ) mfx_lsharpenable = CVar.GetCVar('mfx_lsharpenable',p); - if ( !mfx_lsharpradius ) mfx_lsharpradius = CVar.GetCVar('mfx_lsharpradius',p); - if ( !mfx_lsharpclamp ) mfx_lsharpclamp = CVar.GetCVar('mfx_lsharpclamp',p); - if ( !mfx_lsharpblend ) mfx_lsharpblend = CVar.GetCVar('mfx_lsharpblend',p); + if ( !mfx_lsharpenable ) mfx_lsharpenable = CVar.FindCVar('mfx_lsharpenable'); + if ( !mfx_lsharpradius ) mfx_lsharpradius = CVar.FindCVar('mfx_lsharpradius'); + if ( !mfx_lsharpclamp ) mfx_lsharpclamp = CVar.FindCVar('mfx_lsharpclamp'); + if ( !mfx_lsharpblend ) mfx_lsharpblend = CVar.FindCVar('mfx_lsharpblend'); mfx_lsharpenable.ResetToDefault(); mfx_lsharpradius.ResetToDefault(); mfx_lsharpclamp.ResetToDefault();