Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-09 12:07:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 49

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-04-08 20:05:52 +02:00
commit 85e5bd212b
37 changed files with 234 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/esm/loadlevlist.hpp
View file

@ -22,17 +22,20 @@ struct LeveledListBase
{
enum Flags
{
AllLevels = 0x01, // Calculate from all levels <= player
// level, not just the closest below
// player.
Each = 0x02 // Select a new item each time this
Each = 0x01, // Select a new item each time this
// list is instantiated, instead of
// giving several identical items
}; // (used when a container has more
// (used when a container has more
// than one instance of one leveled
// list.)
AllLevels = 0x02 // Calculate from all levels <= player
// level, not just the closest below
// player.
};
int mFlags;
unsigned char mChanceNone; // Chance that none are selected (0-255?)
unsigned char mChanceNone; // Chance that none are selected (0-100)
std::string mId;
// Record name used to read references. Must be set before load() is

2
components/esm/loadnpc.hpp
View file

@ -35,11 +35,11 @@ struct NPC
Apparatus = 0x00100,
RepairItem = 0x00200,
Misc = 0x00400,
Potions = 0x02000,
// Other services
Spells = 0x00800,
MagicItems = 0x01000,
Potions = 0x02000,
Training = 0x04000, // What skills?
Spellmaking = 0x08000,
Enchanting = 0x10000,