MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a couple of attribute accesses

develop
doomchild 2010-04-13 08:55:39 -05:00
parent 32cbdea87b
commit 244a3c1333
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dfhack/python/DF_CreatureType.cpp
Unescape Escape View File

@ -87,6 +87,8 @@ static PyObject* DF_Creature_Base_new(PyTypeObject* type, PyObject* args, PyObje
self->name = PyString_FromString(""); self->name = PyString_FromString("");
self->artifact_name = PyString_FromString(""); self->artifact_name = PyString_FromString("");
self->position = NULL;
self->strength = NULL; self->strength = NULL;
self->agility = NULL; self->agility = NULL;
self->toughness = NULL; self->toughness = NULL;
@ -136,8 +138,10 @@ static void DF_Creature_Base_dealloc(DF_Creature_Base* self)
static PyMemberDef DF_Creature_Base_members[] = static PyMemberDef DF_Creature_Base_members[] =
{ {
{"origin", T_UINT, offsetof(DF_Creature_Base, origin), 0, ""}, {"origin", T_UINT, offsetof(DF_Creature_Base, origin), 0, ""},
{"position", T_OBJECT_EX, offsetof(DF_Creature_Base, position), 0, ""},
{"_flags1", T_UINT, offsetof(DF_Creature_Base, flags1), 0, ""}, {"_flags1", T_UINT, offsetof(DF_Creature_Base, flags1), 0, ""},
{"_flags2", T_UINT, offsetof(DF_Creature_Base, flags2), 0, ""}, {"_flags2", T_UINT, offsetof(DF_Creature_Base, flags2), 0, ""},
{"race", T_UINT, offsetof(DF_Creature_Base, race), 0, ""},
{"name", T_OBJECT_EX, offsetof(DF_Creature_Base, name), 0, ""}, {"name", T_OBJECT_EX, offsetof(DF_Creature_Base, name), 0, ""},
{"artifact_name", T_OBJECT_EX, offsetof(DF_Creature_Base, artifact_name), 0, ""}, {"artifact_name", T_OBJECT_EX, offsetof(DF_Creature_Base, artifact_name), 0, ""},
{"profession", T_INT, offsetof(DF_Creature_Base, profession), 0, ""}, {"profession", T_INT, offsetof(DF_Creature_Base, profession), 0, ""},
@ -211,11 +215,13 @@ static PyObject* BuildCreature(DFHack::t_creature& creature)
if(obj != NULL) if(obj != NULL)
{ {
obj->origin = creature.origin;
obj->position = Py_BuildValue("III", creature.x, creature.y, creature.z); obj->position = Py_BuildValue("III", creature.x, creature.y, creature.z);
obj->profession = creature.profession; obj->profession = creature.profession;
obj->mood = creature.mood; obj->mood = creature.mood;
obj->happiness = creature.happiness; obj->happiness = creature.happiness;
obj->c_id = creature.id; obj->c_id = creature.id;
obj->race = creature.race;
obj->agility = BuildAttribute(creature.agility); obj->agility = BuildAttribute(creature.agility);
obj->strength = BuildAttribute(creature.strength); obj->strength = BuildAttribute(creature.strength);
obj->toughness = BuildAttribute(creature.toughness); obj->toughness = BuildAttribute(creature.toughness);