mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 07:45:31 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into cc9cii

Browse source
This commit is contained in:
cc9cii 2015-05-14 06:54:58 +10:00
commit 3514dac9bc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/world/nestedcoladapterimp.hpp
View file

@ -311,7 +311,7 @@ namespace CSMWorld
case 0:
{
if (effect.mEffectID >=0 && effect.mEffectID < ESM::MagicEffect::Length)
return effect.mRange;
return effect.mEffectID;
else
throw std::runtime_error("Magic effects ID unexpected value");
}

2
components/esm/loadnpc.cpp
View file

@ -143,7 +143,7 @@ namespace ESM
void NPC::blank()
{
mNpdtType = 0;
mNpdtType = NPC_DEFAULT;
mNpdt52.mLevel = 0;
mNpdt52.mStrength = mNpdt52.mIntelligence = mNpdt52.mWillpower = mNpdt52.mAgility =
mNpdt52.mSpeed = mNpdt52.mEndurance = mNpdt52.mPersonality = mNpdt52.mLuck = 0;