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

NPC rank is correctly loaded now. Also corrected a potential bug (i think).

Browse source
This commit is contained in:
gugus 2012-04-12 17:08:57 +02:00
parent 0553227ee1
commit 03d6d1fb82
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwclass/npc.cpp
View file

@ -55,14 +55,16 @@ namespace MWClass
{ {
if(ref->base->npdt52.gold != -10) if(ref->base->npdt52.gold != -10)
{ {
data->mNpcStats.mFactionRank[ref->base->faction] = ref->base->npdt52.rank; data->mNpcStats.mFactionRank[ref->base->faction] = (int)ref->base->npdt52.rank;
} }
else else
{ {
data->mNpcStats.mFactionRank[ref->base->faction] = ref->base->npdt52.rank; data->mNpcStats.mFactionRank[ref->base->faction] = (int)ref->base->npdt12.rank;
} }
} }
if(ref->base->npdt52.gold != -10)
{
for (int i=0; i<27; ++i) for (int i=0; i<27; ++i)
data->mNpcStats.mSkill[i].setBase (ref->base->npdt52.skills[i]); data->mNpcStats.mSkill[i].setBase (ref->base->npdt52.skills[i]);
@ -80,6 +82,11 @@ namespace MWClass
data->mCreatureStats.mDynamic[2].set (ref->base->npdt52.fatigue); data->mCreatureStats.mDynamic[2].set (ref->base->npdt52.fatigue);
data->mCreatureStats.mLevel = ref->base->npdt52.level; data->mCreatureStats.mLevel = ref->base->npdt52.level;
}
else
{
//TODO: do something with npdt12 maybe:p
}
// \todo add initial container content // \todo add initial container content