mirror of
https://github.com/OpenMW/openmw.git
synced 2025-11-29 17:34:30 +00:00
Address conversion warnings in essimporter
This commit is contained in:
parent
ea2ff63bf6
commit
ddd614f815
2 changed files with 3 additions and 3 deletions
|
|
@ -48,8 +48,8 @@ namespace ESSImport
|
||||||
for (int i = 0; i < ESM::Skill::Length; ++i)
|
for (int i = 0; i < ESM::Skill::Length; ++i)
|
||||||
{
|
{
|
||||||
npcStats.mSkills[i].mMod = 0.f;
|
npcStats.mSkills[i].mMod = 0.f;
|
||||||
npcStats.mSkills[i].mCurrent = actorData.mSkills[i][1];
|
npcStats.mSkills[i].mCurrent = static_cast<float>(actorData.mSkills[i][1]);
|
||||||
npcStats.mSkills[i].mBase = actorData.mSkills[i][0];
|
npcStats.mSkills[i].mBase = static_cast<float>(actorData.mSkills[i][0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
npcStats.mTimeToStartDrowning = actorData.mACDT.mBreathMeter;
|
npcStats.mTimeToStartDrowning = actorData.mACDT.mBreathMeter;
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
|
||||||
void convertImage(char* data, int size, int width, int height, GLenum pf, const std::string& out)
|
void convertImage(char* data, size_t size, int width, int height, GLenum pf, const std::string& out)
|
||||||
{
|
{
|
||||||
osg::ref_ptr<osg::Image> image(new osg::Image);
|
osg::ref_ptr<osg::Image> image(new osg::Image);
|
||||||
image->allocateImage(width, height, 1, pf, GL_UNSIGNED_BYTE);
|
image->allocateImage(width, height, 1, pf, GL_UNSIGNED_BYTE);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue