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

fixed a couple of allocator callback names 

added __str__ method to Tree
develop
doomchild 2011-03-11 16:59:25 -06:00
parent c5e9f67389
commit de8226e142
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/python/pydfhack/dftypes.py
Unescape Escape View File

@ -232,7 +232,7 @@ def _alloc_custom_workshop_buffer_callback(ptr, count):
_custom_workshop_functype = CFUNCTYPE(c_int, POINTER(POINTER(CustomWorkshop)), c_uint) _custom_workshop_functype = CFUNCTYPE(c_int, POINTER(POINTER(CustomWorkshop)), c_uint)
_custom_workshop_func = _custom_workshop_functype(_alloc_custom_workshop_buffer_callback) _custom_workshop_func = _custom_workshop_functype(_alloc_custom_workshop_buffer_callback)
_register_callback("alloc_t_customWorkshop_buffer_callback", _custom_workshop_func) _register_callback("alloc_customWorkshop_buffer_callback", _custom_workshop_func)
class Construction(Structure): class Construction(Structure):
_fields_ = [("x", c_ushort), _fields_ = [("x", c_ushort),
@ -256,6 +256,26 @@ class Tree(Structure):
("z", c_ushort), ("z", c_ushort),
("address", c_uint)] ("address", c_uint)]
def __str__(self):
water = ""
tree_type = "tree"
if self.type == 1 or self.type == 3:
water = "near-water"
if self.type == 2 or self.type == 3:
tree_type = "shrub"
s = "%d:%d = %s %s\nAddress: 0x%x\n" % (self.type, self.material, water, tree_type, self.address)
return s
def _alloc_tree_buffer_callback(ptr, count):
return util._allocate_array(ptr, Tree, count)
_alloc_tree_buffer_functype = CFUNCTYPE(c_int, POINTER(POINTER(Tree)), c_uint)
_alloc_tree_buffer_func = _alloc_tree_buffer_functype(_alloc_tree_buffer_func)
_register_callback("alloc_tree_buffer_callback", _alloc_tree_buffer_func)
class Material(Structure): class Material(Structure):
_fields_ = [("itemType", c_short), _fields_ = [("itemType", c_short),
("subType", c_short), ("subType", c_short),
@ -268,7 +288,7 @@ def _alloc_material_buffer_callback(ptr, count):
_material_functype = CFUNCTYPE(c_int, POINTER(POINTER(Material)), c_uint) _material_functype = CFUNCTYPE(c_int, POINTER(POINTER(Material)), c_uint)
_material_func = _material_functype(_alloc_material_buffer_callback) _material_func = _material_functype(_alloc_material_buffer_callback)
_register_callback("alloc_t_material_buffer_callback", _material_func) _register_callback("alloc_material_buffer_callback", _material_func)
class Skill(Structure): class Skill(Structure):
_fields_ = [("id", c_uint), _fields_ = [("id", c_uint),