mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-25 16:43:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix vfs bindings

Browse Source
This commit is contained in:
Evil Eye 2024-09-14 10:10:26 +02:00
parent 1ac0f27bbd
commit 2978b32f51
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwlua/vfsbindings.cpp
View File

@ -144,7 +144,11 @@ namespace MWLua
values.push_back(sol::make_object<std::string>(lua, msg)); values.push_back(sol::make_object<std::string>(lua, msg));
} }
else else
values.push_back(sol::make_object<std::streampos>(lua, self.mFilePtr->tellg())); {
// tellg returns std::streampos which is not required to be a numeric type. It is required to be
// convertible to std::streamoff which is a number
values.push_back(sol::make_object<std::streamoff>(lua, self.mFilePtr->tellg()));
}
} }
catch (std::exception& e) catch (std::exception& e)
{ {
@ -205,7 +209,7 @@ namespace MWLua
}); });
}; };
handle["close"] = [](lua_State* L, FileHandle& self) { handle["close"] = [](sol::this_state lua, FileHandle& self) {
sol::variadic_results values; sol::variadic_results values;
try try
{ {
@ -214,16 +218,16 @@ namespace MWLua
{ {
auto msg = "Can not close file '" + self.mFileName + "': file handle is still opened."; auto msg = "Can not close file '" + self.mFileName + "': file handle is still opened.";
values.push_back(sol::nil); values.push_back(sol::nil);
values.push_back(sol::make_object<std::string>(L, msg)); values.push_back(sol::make_object<std::string>(lua, msg));
} }
else else
values.push_back(sol::make_object<bool>(L, true)); values.push_back(sol::make_object<bool>(lua, true));
} }
catch (std::exception& e) catch (std::exception& e)
{ {
auto msg = "Can not close file '" + self.mFileName + "': " + std::string(e.what()); auto msg = "Can not close file '" + self.mFileName + "': " + std::string(e.what());
values.push_back(sol::nil); values.push_back(sol::nil);
values.push_back(sol::make_object<std::string>(L, msg)); values.push_back(sol::make_object<std::string>(lua, msg));
} }
return values; return values;