diff --git a/ScriptFunctions/RegisterScriptFunctions.cpp b/ScriptFunctions/RegisterScriptFunctions.cpp index 6f696ff..ca96d79 100644 --- a/ScriptFunctions/RegisterScriptFunctions.cpp +++ b/ScriptFunctions/RegisterScriptFunctions.cpp @@ -17,7 +17,6 @@ void registerScriptFunctions() Script::registerUniversalFunction("now", &ScriptFunctions::now); Script::registerUniversalFunction("subwintype", &ScriptFunctions::subwintype); Script::registerUniversalFunction("subwinname", &ScriptFunctions::subwinname); - Script::registerUniversalFunction("rand", &ScriptFunctions::rand); /* * IRC utilities diff --git a/ScriptFunctions/ScriptGeneralUtils.cpp b/ScriptFunctions/ScriptGeneralUtils.cpp index 871c02b..71b88af 100644 --- a/ScriptFunctions/ScriptGeneralUtils.cpp +++ b/ScriptFunctions/ScriptGeneralUtils.cpp @@ -211,26 +211,4 @@ ValueHolder subwinname(Script&, std::vector& args) return cwin->getButtonText().toStdString(); } -ValueHolder rand(Script& std, std::vector & args) -{ - if (args.size() != 2) - throwInsufficientParameters("rand", args.size(), 4); - - if (args[0].getType() != ValueHolder::Type::Integer) - throwNotANumber("rand", 1); - - if (args[1].getType() != ValueHolder::Type::Integer) - throwNotANumber("rand", 2); - - int lo = ValueExtract(args[0]).toInt(); - int hi = ValueExtract(args[1]).toInt(); - - static std::random_device device; - static std::mt19937 generator(device()); - - std::uniform_int_distribution distribution(lo, hi); - - return ValueHolder(distribution(generator)); -} - } diff --git a/ScriptFunctions/ScriptGeneralUtils.h b/ScriptFunctions/ScriptGeneralUtils.h index 5c114e1..c75b929 100644 --- a/ScriptFunctions/ScriptGeneralUtils.h +++ b/ScriptFunctions/ScriptGeneralUtils.h @@ -15,7 +15,6 @@ ValueHolder unixnow(Script& , std::vector& args); ValueHolder now(Script& , std::vector& args); ValueHolder subwintype(Script&, std::vector& args); ValueHolder subwinname(Script&, std::vector& args); -ValueHolder rand(Script&, std::vector& args); } #endif // SCRIPTGENERALUTILS_H