Merge remote branch 'corristo/header-refactoring'

actorid
Marc Zinnschlag 14 years ago
commit 3cb994764c

@ -23,12 +23,16 @@ enum VarType
enum Specialization
{
SPC_Combat = 0, SPC_Magic = 1, SPC_Stealth = 2
SPC_Combat = 0,
SPC_Magic = 1,
SPC_Stealth = 2
};
enum RangeType
{
RT_Self = 0, RT_Touch = 1, RT_Target = 2
RT_Self = 0,
RT_Touch = 1,
RT_Target = 2
};
/** A list of references to spells and spell effects. This is shared

@ -14,7 +14,10 @@ struct Apparatus
{
enum AppaType
{
MortarPestle = 0, Albemic = 1, Calcinator = 2, Retort = 3
MortarPestle = 0,
Albemic = 1,
Calcinator = 2,
Retort = 3
};
struct AADTstruct

@ -29,12 +29,15 @@ struct BodyPart
enum Flags
{
BPF_Female = 1, BPF_Playable = 2
BPF_Female = 1,
BPF_Playable = 2
};
enum MeshType
{
MT_Skin = 0, MT_Clothing = 1, MT_Armor = 2
MT_Skin = 0,
MT_Clothing = 1,
MT_Armor = 2
};
struct BYDTstruct

@ -38,7 +38,9 @@ struct Class
enum Specialization
{
Combat = 0, Magic = 1, Stealth = 2
Combat = 0,
Magic = 1,
Stealth = 2
};
static const Specialization specializationIds[3];

@ -30,7 +30,10 @@ struct Creature
enum Type
{
Creatures = 0, Deadra = 1, Undead = 2, Humanoid = 3
Creatures = 0,
Deadra = 1,
Undead = 2,
Humanoid = 3
};
struct NPDTstruct

@ -3,7 +3,8 @@
#include "esm_reader.hpp"
namespace ESM {
namespace ESM
{
/*
* Sound generator. This describes the sounds a creature make.
@ -11,24 +12,24 @@ namespace ESM {
struct SoundGenerator
{
enum Type
enum Type
{
LeftFoot = 0,
RightFoot = 1,
SwimLeft = 2,
SwimRight = 3,
Moan = 4,
Roar = 5,
Scream = 6,
Land = 7
LeftFoot = 0,
RightFoot = 1,
SwimLeft = 2,
SwimRight = 3,
Moan = 4,
Roar = 5,
Scream = 6,
Land = 7
};
// Type
int type;
// Type
int type;
std::string creature, sound;
std::string creature, sound;
void load(ESMReader &esm);
void load(ESMReader &esm);
};
}
#endif

Loading…
Cancel
Save