From bae9fcec3549cad135058da1ca6edafc5bc32c21 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sun, 30 Jun 2024 16:06:29 +0200 Subject: [PATCH] removed some parameter conflicts --- config.cpp | 1 - history.cpp | 1 - screenshot.cpp | 2 -- 3 files changed, 4 deletions(-) diff --git a/config.cpp b/config.cpp index ddbba20a..5cae1ca3 100644 --- a/config.cpp +++ b/config.cpp @@ -1196,7 +1196,6 @@ EX void initConfig() { -> editable("flashing effects", 'h') -> help("Disable if you are photosensitive. Replaces flashing effects such as Orb of Storms lightning with slow, adjustable animations."); - param_f(vid.binary_width, parameter_names("bwidth", "binary-tiling-width"), 1); param_custom_ld(vid.binary_width, "binary tiling width", menuitem_binary_width, 'v'); param_b(fake::multiple_special_draw, "fake_multiple", true); diff --git a/history.cpp b/history.cpp index 3883ba8e..21e98212 100644 --- a/history.cpp +++ b/history.cpp @@ -756,7 +756,6 @@ EX namespace history { history::includeHistory = false; }) + addHook(hooks_configfile, 0, [] { - param_b(autobandhistory, "include history"); // check! param_f(lvspeed, parameter_names("lvspeed", "lineview speed")); param_f(extra_line_steps, "lineview extension"); diff --git a/screenshot.cpp b/screenshot.cpp index 7a0ceee2..d28652dd 100644 --- a/screenshot.cpp +++ b/screenshot.cpp @@ -1760,7 +1760,6 @@ auto animhook = addHook(hooks_frame, 100, display_animation) #endif + addHook(hooks_configfile, 100, [] { #if CAP_CONFIG - param_f(anims::period, parameter_names("aperiod", "animation period")); param_i(anims::noframes, "animation frames"); param_f(anims::cycle_length, parameter_names("acycle", "animation cycle length")); param_f(anims::parabolic_length, parameter_names("aparabolic", "animation parabolic length")) @@ -1776,7 +1775,6 @@ auto animhook = addHook(hooks_frame, 100, display_animation) param_f(rug_rotation1, "rug_rotation1"); param_f(rug_rotation2, "rug_rotation2"); param_f(rotation_distance, "rotation_distance"); - param_f(cycle_length, "cycle_length"); param_f(env_ocean, "env_ocean"); param_f(env_volcano, "env_volcano"); param_b(wallopt, "wallopt");