From 98786b946cb11bcb53faadce496d4edfebabeb05 Mon Sep 17 00:00:00 2001 From: Niklas Fiekas Date: Wed, 25 Jul 2018 09:51:10 +0200 Subject: [PATCH] Fix Analysis Contempt combo option --- src/uci.h | 1 - src/ucioption.cpp | 5 +---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/src/uci.h b/src/uci.h index 2355717..9f5a910 100644 --- a/src/uci.h +++ b/src/uci.h @@ -52,7 +52,6 @@ public: Option(const char* v, OnChange = nullptr); Option(const char* v, const std::vector& variants, OnChange = nullptr); Option(double v, int minv, int maxv, OnChange = nullptr); - Option(const char* v, const char *cur, OnChange = nullptr); Option& operator=(const std::string&); void operator<<(const Option&); diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 0374548..d20252e 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -64,7 +64,7 @@ void init(OptionsMap& o) { o["Debug Log File"] << Option("", on_logger); o["Contempt"] << Option(21, -100, 100); - o["Analysis Contempt"] << Option("Both var Off var White var Black var Both", "Both"); + o["Analysis Contempt"] << Option("Both", {"Both", "Off", "White", "Black"}); o["Threads"] << Option(1, 1, 512, on_threads); o["Hash"] << Option(16, 1, MaxHashMB, on_hash_size); o["Clear Hash"] << Option(on_clear_hash); @@ -133,9 +133,6 @@ Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f) Option::Option(double v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f) { defaultValue = currentValue = std::to_string(v); } -Option::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f) -{ defaultValue = v; currentValue = cur; } - Option::operator double() const { assert(type == "check" || type == "spin"); return (type == "spin" ? stof(currentValue) : currentValue == "true"); -- 1.7.0.4