Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'fix_msvc_warnings' into 'master'
Some checks failed
Build and test / Ubuntu (push) Has been cancelled
Details
Build and test / MacOS (push) Has been cancelled
Details
Build and test / Read .env file and expose it as output (push) Has been cancelled
Details
Build and test / Windows (2019) (push) Has been cancelled
Details
Build and test / Windows (2022) (push) Has been cancelled
Details

Browse source 
Fix msvc warnings

See merge request OpenMW/openmw!4579
This commit is contained in:
Alexei Kotov 2025-03-11 00:55:32 +03:00
commit 569ed4559f
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/components_tests/misc/testmathutil.cpp
View file

@ -51,7 +51,7 @@ namespace Misc
const std::pair<osg::Quat, osg::Vec3f> eulerAnglesXZQuat[] = { const std::pair<osg::Quat, osg::Vec3f> eulerAnglesXZQuat[] = {
{ {
osg::Quat(1, 0, 0, 0), osg::Quat(1, 0, 0, 0),
osg::Vec3f(0, 0, osg::PI), osg::Vec3f(0, 0, osg::PIf),
}, },
{ {
osg::Quat(0, 1, 0, 0), osg::Quat(0, 1, 0, 0),
@ -59,7 +59,7 @@ namespace Misc
}, },
{ {
osg::Quat(0, 0, 1, 0), osg::Quat(0, 0, 1, 0),
osg::Vec3f(0, 0, osg::PI), osg::Vec3f(0, 0, osg::PIf),
}, },
{ {
osg::Quat(0, 0, 0, 1), osg::Quat(0, 0, 0, 1),
@ -128,15 +128,15 @@ namespace Misc
const std::pair<osg::Quat, osg::Vec3f> eulerAnglesZYXQuat[] = { const std::pair<osg::Quat, osg::Vec3f> eulerAnglesZYXQuat[] = {
{ {
osg::Quat(1, 0, 0, 0), osg::Quat(1, 0, 0, 0),
osg::Vec3f(osg::PI, 0, 0), osg::Vec3f(osg::PIf, 0, 0),
}, },
{ {
osg::Quat(0, 1, 0, 0), osg::Quat(0, 1, 0, 0),
osg::Vec3f(osg::PI, 0, osg::PI), osg::Vec3f(osg::PIf, 0, osg::PIf),
}, },
{ {
osg::Quat(0, 0, 1, 0), osg::Quat(0, 0, 1, 0),
osg::Vec3f(0, 0, osg::PI), osg::Vec3f(0, 0, osg::PIf),
}, },
{ {
osg::Quat(0, 0, 0, 1), osg::Quat(0, 0, 0, 1),

2
components/esm3/effectlist.cpp
View file

@ -32,7 +32,7 @@ namespace ESM
void EffectList::updateIndexes() void EffectList::updateIndexes()
{ {
for (size_t i = 0; i < mList.size(); i++) for (size_t i = 0; i < mList.size(); i++)
mList[i].mIndex = i; mList[i].mIndex = static_cast<uint32_t>(i);
} }
void EffectList::add(ESMReader& esm) void EffectList::add(ESMReader& esm)

3
components/lua/l10n.cpp
View file

@ -32,7 +32,8 @@ namespace
// Argument names // Argument names
const auto str = LuaUtil::cast<std::string>(key); const auto str = LuaUtil::cast<std::string>(key);
argNames.push_back(icu::UnicodeString::fromUTF8(icu::StringPiece(str.data(), str.size()))); argNames.push_back(
icu::UnicodeString::fromUTF8(icu::StringPiece(str.data(), static_cast<int32_t>(str.size()))));
} }
} }
} }