XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Small change

Browse Source
This commit is contained in:
Federico Cecchetto 2022-05-02 01:07:43 +02:00
parent 4cfe4f093f
commit 8d0191c410
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,8 +167,11 @@ namespace ui_scripting
{
if (!this->is<T>())
{
throw std::runtime_error(utils::string::va("%s expected, got %s",
typeid(T).name(), game::hks::typenames[this->get_raw().t + 2]));
const auto hks_typename = game::hks::typenames[this->get_raw().t + 2];
const auto typename_ = get_typename<T>();
throw std::runtime_error(utils::string::va("%s expected, got %s",
typename_.data(), hks_typename));
}
return get<T>();
@ -184,6 +187,7 @@ namespace ui_scripting
hks_object value_{};
private:
template <typename T>
T get() const;
@ -201,16 +205,15 @@ namespace ui_scripting
template <typename T>
T as() const
{
if (!this->value_.is<T>())
try
{
const auto hks_typename = game::hks::typenames[this->value_.get_raw().t + 2];
const auto typename_ = get_typename<T>();
throw std::runtime_error(utils::string::va("bad argument #%d (%s expected, got %s)",
this->index_ + 1, typename_.data(), hks_typename));
return this->value_.as<T>();
}
catch (const std::exception& e)
{
throw std::runtime_error(utils::string::va("bad argument #%d (%s)",
this->index_ + 1, e.what()));
}
return this->value_.get<T>();
}
template <>