It seems that the attribute structure also lives in the caste structure

Moved in DFTypes, files updated accordingly
develop
simon 2010-05-10 12:58:54 +02:00
parent c32d9d6d8e
commit 81045aba5c
7 changed files with 36 additions and 13 deletions

@ -199,6 +199,17 @@ struct t_settlement
int16_t local_y1; int16_t local_y1;
int16_t local_y2; int16_t local_y2;
}; };
struct t_attrib
{
uint32_t level;
uint32_t field_4;
uint32_t field_8;
uint32_t field_C;
uint32_t leveldiff;
uint32_t field_14;
uint32_t field_18;
};
}// namespace DFHack }// namespace DFHack
#endif // TYPES_H_INCLUDED #endif // TYPES_H_INCLUDED

@ -275,16 +275,6 @@ namespace DFHack
t_matglossPair material; t_matglossPair material;
bool active; bool active;
}; };
struct t_attrib
{
uint32_t level;
uint32_t field_4;
uint32_t field_8;
uint32_t field_C;
uint32_t leveldiff;
uint32_t field_14;
uint32_t field_18;
};
// FIXME: define in Memory.xml instead? // FIXME: define in Memory.xml instead?

@ -60,6 +60,24 @@ namespace DFHack
char adjective[128]; char adjective[128];
std::vector<t_colormodifier> ColorModifier; std::vector<t_colormodifier> ColorModifier;
std::vector<t_bodypart> bodypart; std::vector<t_bodypart> bodypart;
t_attrib strength;
t_attrib agility;
t_attrib toughness;
t_attrib endurance;
t_attrib recuperation;
t_attrib disease_resistance;
t_attrib analytical_ability;
t_attrib focus;
t_attrib willpower;
t_attrib creativity;
t_attrib intuition;
t_attrib patience;
t_attrib memory;
t_attrib linguistic_ability;
t_attrib spatial_sense;
t_attrib musicality;
t_attrib kinesthetic_sense;
}; };
struct t_matglossOther struct t_matglossOther

@ -24,11 +24,12 @@ distribution.
#include "DFCommonInternal.h" #include "DFCommonInternal.h"
#include "../private/APIPrivate.h" #include "../private/APIPrivate.h"
#include "modules/Materials.h" #include "DFTypes.h"
#include "modules/Items.h"
#include "DFMemInfo.h" #include "DFMemInfo.h"
#include "DFProcess.h" #include "DFProcess.h"
#include "DFVector.h" #include "DFVector.h"
#include "modules/Materials.h"
#include "modules/Items.h"
using namespace DFHack; using namespace DFHack;
@ -263,4 +264,4 @@ std::string Items::getItemDescription(uint32_t itemptr, Materials * Materials)
out.append(" "); out.append(" ");
out.append(this->getItemClass(item.matdesc.itemType)); out.append(this->getItemClass(item.matdesc.itemType));
return out; return out;
} }

@ -24,6 +24,7 @@ distribution.
#include "DFCommonInternal.h" #include "DFCommonInternal.h"
#include "../private/APIPrivate.h" #include "../private/APIPrivate.h"
#include "DFTypes.h"
#include "modules/Materials.h" #include "modules/Materials.h"
#include "DFMemInfo.h" #include "DFMemInfo.h"
#include "DFProcess.h" #include "DFProcess.h"

@ -30,6 +30,7 @@ distribution.
using namespace std; using namespace std;
#include "DFCommonInternal.h" #include "DFCommonInternal.h"
#include "DFTypes.h"
#include "modules/Materials.h" #include "modules/Materials.h"
#include "modules/Materials_C.h" #include "modules/Materials_C.h"

@ -32,6 +32,7 @@ distribution.
using namespace std; using namespace std;
#include "DFTypes.h"
#include "modules/Materials.h" #include "modules/Materials.h"
#include "DF_Imports.cpp" #include "DF_Imports.cpp"
#include "DF_Helpers.cpp" #include "DF_Helpers.cpp"