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

Fix vector assignment and parameter storage

Browse Source
This commit is contained in:
momo5502 2019-01-19 14:11:05 +01:00
parent b47a2dabbc
commit 8a9efb47ee
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/module/console.cpp
View File

@ -85,6 +85,7 @@ private:
static void log_message(const std::string& message) static void log_message(const std::string& message)
{ {
OutputDebugStringA(message.data());
game::native::Conbuf_AppendText(message.data()); game::native::Conbuf_AppendText(message.data());
} }

17
src/module/scripting.cpp
View File

@ -408,10 +408,10 @@ chaiscript::Boxed_Value scripting::make_boxed(const game::native::VariableValue
} }
else if (value.type == game::native::SCRIPT_VECTOR) else if (value.type == game::native::SCRIPT_VECTOR)
{ {
std::vector<float> values; std::vector<chaiscript::Boxed_Value> values;
values.push_back(value.u.vectorValue[0]); values.push_back(chaiscript::var(value.u.vectorValue[0]));
values.push_back(value.u.vectorValue[1]); values.push_back(chaiscript::var(value.u.vectorValue[1]));
values.push_back(value.u.vectorValue[2]); values.push_back(chaiscript::var(value.u.vectorValue[2]));
return chaiscript::var(values); return chaiscript::var(values);
} }
@ -559,6 +559,9 @@ chaiscript::Boxed_Value scripting::call(const std::string& function, const unsig
this->push_param(argument); this->push_param(argument);
} }
*game::native::scr_numParam = *game::native::scr_numArgs;
*game::native::scr_numArgs = 0;
if (!call_safe(function_ptr, entity)) if (!call_safe(function_ptr, entity))
{ {
throw std::runtime_error("Error executing function '" + function + "'"); throw std::runtime_error("Error executing function '" + function + "'");
@ -649,6 +652,12 @@ void scripting::push_param(const chaiscript::Boxed_Value& value) const
value_ptr->type = game::native::SCRIPT_INTEGER; value_ptr->type = game::native::SCRIPT_INTEGER;
value_ptr->u.intValue = real_value; value_ptr->u.intValue = real_value;
} }
else if (value.get_type_info() == typeid(bool))
{
const auto real_value = this->chai_->boxed_cast<bool>(value);
value_ptr->type = game::native::SCRIPT_INTEGER;
value_ptr->u.intValue = real_value;
}
else if (value.get_type_info() == typeid(entity)) else if (value.get_type_info() == typeid(entity))
{ {
const auto real_value = this->chai_->boxed_cast<entity>(value); const auto real_value = this->chai_->boxed_cast<entity>(value);