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

updated type string, tweaked reverse designation build

develop
doomchild 2010-04-20 12:21:52 -05:00
parent 5cc3b5e4c7
commit f86cb94d36
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dfhack/python/DF_Maps.cpp
Unescape Escape View File

@ -301,7 +301,7 @@ static void ReverseBuildDesignations40d(PyObject* list, DFHack::designations40d&
for(int i = 0; i < 16; i++) for(int i = 0; i < 16; i++)
{ {
innerList = PyList_GetItem(list, i); innerList = PyList_GET_ITEM(list, i);
for(int j = 0; j < 16; j++) for(int j = 0; j < 16; j++)
des[i][j].whole = (uint32_t)PyInt_AsLong(PyList_GET_ITEM(innerList, j)); des[i][j].whole = (uint32_t)PyInt_AsLong(PyList_GET_ITEM(innerList, j));
@ -581,6 +581,8 @@ static PyObject* DF_Map_ReadDesignations(DF_Map* self, PyObject* args)
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static DFHack::designations40d writeDes;
static PyObject* DF_Map_WriteDesignations(DF_Map* self, PyObject* args) static PyObject* DF_Map_WriteDesignations(DF_Map* self, PyObject* args)
{ {
PyObject* desList; PyObject* desList;
@ -591,11 +593,9 @@ static PyObject* DF_Map_WriteDesignations(DF_Map* self, PyObject* args)
if(!PyArg_ParseTuple(args, "IIIO", &x, &y, &z, &desList)) if(!PyArg_ParseTuple(args, "IIIO", &x, &y, &z, &desList))
return NULL; return NULL;
designations40d des; ReverseBuildDesignations40d(desList, writeDes);
ReverseBuildDesignations40d(desList, des);
if(self->m_Ptr->WriteDesignations(x, y, z, &des)) if(self->m_Ptr->WriteDesignations(x, y, z, &writeDes))
Py_RETURN_TRUE; Py_RETURN_TRUE;
else else
Py_RETURN_FALSE; Py_RETURN_FALSE;
@ -817,7 +817,7 @@ static PyTypeObject DF_Map_type =
{ {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"pydfhack.Map", /*tp_name*/ "pydfhack._MapManager", /*tp_name*/
sizeof(DF_Map), /*tp_basicsize*/ sizeof(DF_Map), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
(destructor)DF_Map_dealloc, /*tp_dealloc*/ (destructor)DF_Map_dealloc, /*tp_dealloc*/
@ -836,7 +836,7 @@ static PyTypeObject DF_Map_type =
0, /*tp_setattro*/ 0, /*tp_setattro*/
0, /*tp_as_buffer*/ 0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
"pydfhack Map objects", /* tp_doc */ "pydfhack MapManager object", /* tp_doc */
0, /* tp_traverse */ 0, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */