mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 20:36:42 +00:00
Code Issues Releases Wiki Activity

Fix bolt for magic effects that don't have one specified

Browse source
This commit is contained in:
scrawl 2013-11-29 10:39:37 +01:00
parent b82ee4b44f
commit ffc885853a
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1066,6 +1066,7 @@ void Animation::addEffect(const std::string &model, int effectId, bool loop, con
for(size_t i = 0;i < params.mObjects.mParticles.size(); ++i) for(size_t i = 0;i < params.mObjects.mParticles.size(); ++i)
{ {
Ogre::ParticleSystem* partSys = params.mObjects.mParticles[i]; Ogre::ParticleSystem* partSys = params.mObjects.mParticles[i];
sh::Factory::getInstance()._ensureMaterial(partSys->getMaterialName(), "Default");
Ogre::MaterialPtr mat = Ogre::MaterialManager::getSingleton().getByName(partSys->getMaterialName()); Ogre::MaterialPtr mat = Ogre::MaterialManager::getSingleton().getByName(partSys->getMaterialName());
static int count = 0; static int count = 0;
Ogre::String materialName = "openmw/" + Ogre::StringConverter::toString(count++); Ogre::String materialName = "openmw/" + Ogre::StringConverter::toString(count++);

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -2086,6 +2086,8 @@ namespace MWWorld
iter->mEffectID); iter->mEffectID);
projectileModel = magicEffect->mBolt; projectileModel = magicEffect->mBolt;
if (projectileModel.empty())
projectileModel = "VFX_DefaultBolt";
static const std::string schools[] = { static const std::string schools[] = {
"alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"