teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix travis build error and warnings

Browse source
This commit is contained in:
Allofich 2016-08-09 02:03:13 +09:00
parent 1910128e9c
commit cad41599cf
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwclass/door.cpp
View file

@ -120,10 +120,9 @@ namespace MWClass
{ {
MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr); MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
const ESM::MagicEffect *effect; int index = ESM::MagicEffect::effectStringToId("sEffectTelekinesis");
int index = effect->effectStringToId("sEffectTelekinesis"); const ESM::MagicEffect *effect = store.get<ESM::MagicEffect>().find(index);
effect = store.get<ESM::MagicEffect>().find(index);
animation->addSpellCastGlow(effect); // TODO: Telekinesis glow should only be as long as the door animation animation->addSpellCastGlow(effect); // TODO: Telekinesis glow should only be as long as the door animation
} }

7
apps/openmw/mwrender/animation.cpp
View file

@ -183,11 +183,6 @@ namespace
return mDone; return mDone;
} }
int getTexUnit()
{
return mTexUnit;
}
void setWatchedSpellGlow(osg::ref_ptr<GlowUpdater> watched) void setWatchedSpellGlow(osg::ref_ptr<GlowUpdater> watched)
{ {
mWatchedSpellGlow = watched; mWatchedSpellGlow = watched;
@ -1190,7 +1185,7 @@ namespace MWRender
void Animation::addSpellCastGlow(const ESM::MagicEffect *effect){ void Animation::addSpellCastGlow(const ESM::MagicEffect *effect){
osg::Vec4f glowColor = {1,1,1,1}; osg::Vec4f glowColor(1,1,1,1);
glowColor.x() = effect->mData.mRed / 255.f; glowColor.x() = effect->mData.mRed / 255.f;
glowColor.y() = effect->mData.mGreen / 255.f; glowColor.y() = effect->mData.mGreen / 255.f;
glowColor.z() = effect->mData.mBlue / 255.f; glowColor.z() = effect->mData.mBlue / 255.f;