Rim/h2-mod
Rim/h2-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LUI std::optional + cleanup

Browse Source
This commit is contained in:
fed 2023-02-24 00:39:45 +01:00
parent 7fd6db31ca
commit 6745473ac3
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/game/ui_scripting/script_value.cpp
View File

@ -437,16 +437,6 @@ namespace ui_scripting
return this->get_raw().v.native == other.get_raw().v.native; return this->get_raw().v.native == other.get_raw().v.native;
} }
arguments script_value::operator()() const
{
return this->as<function>()();
}
arguments script_value::operator()(const arguments& arguments) const
{
return this->as<function>()(arguments);
}
function_argument::function_argument(const arguments& args, const script_value& value, const int index) function_argument::function_argument(const arguments& args, const script_value& value, const int index)
: values_(args) : values_(args)
, value_(value) , value_(value)

16
src/client/game/ui_scripting/script_value.hpp
View File

@ -136,24 +136,14 @@ namespace ui_scripting
{ {
} }
template <typename F> template <typename T>
script_value(const std::optional<F> optional) script_value(const std::optional<T>& optional)
: script_value(optional.has_value() ? script_value(optional.value()) : script_value())
{ {
if (optional.has_value())
{
script_value::script_value(optional.value());
}
else
{
script_value::script_value();
}
} }
bool operator==(const script_value& other) const; bool operator==(const script_value& other) const;
arguments operator()() const;
arguments operator()(const arguments& arguments) const;
template<class ...T> template<class ...T>
arguments operator()(T... arguments) const arguments operator()(T... arguments) const
{ {