Merge branch 'master' into automove

This commit is contained in:
Bret Curtis 2020-06-08 11:42:05 +02:00 committed by GitHub
commit cd97d0c61c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
94 changed files with 1034 additions and 759 deletions

View file

@ -30,8 +30,8 @@ namespace ESM
int mCurrentCrimeId;
int mPaidCrimeId;
StatState<int> mSaveAttributes[ESM::Attribute::Length];
StatState<int> mSaveSkills[ESM::Skill::Length];
StatState<float> mSaveAttributes[ESM::Attribute::Length];
StatState<float> mSaveSkills[ESM::Skill::Length];
typedef std::map<std::string, std::string> PreviousItems; // previous equipped items, needed for bound spells
PreviousItems mPreviousItems;