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

fixed type setters to return -1 instead of NULL on error

develop
doomchild 2010-04-21 14:59:04 -05:00
parent dcaeadf4d3
commit b0bda21d8e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dfhack/python/DF_API.cpp
Unescape Escape View File

@ -467,13 +467,13 @@ static int DF_API_setMapType(DF_API* self, PyObject* value)
{ {
PySys_WriteStdout("failed type check"); PySys_WriteStdout("failed type check");
PyErr_SetString(PyExc_TypeError, "value must be a type object"); PyErr_SetString(PyExc_TypeError, "value must be a type object");
return NULL; return -1;
} }
if(PyObject_IsSubclass(value, (PyObject*)&DF_Map_type) <= 0) if(PyObject_IsSubclass(value, (PyObject*)&DF_Map_type) <= 0)
{ {
PySys_WriteStdout("failed subclass check"); PySys_WriteStdout("failed subclass check");
PyErr_SetString(PyExc_TypeError, "value must be descended from pydfhack._MapManager"); PyErr_SetString(PyExc_TypeError, "value must be descended from pydfhack._MapManager");
return NULL; return -1;
} }
self->map_type = value; self->map_type = value;
@ -492,13 +492,13 @@ static int DF_API_setVegetationType(DF_API* self, PyObject* value)
{ {
PySys_WriteStdout("failed type check"); PySys_WriteStdout("failed type check");
PyErr_SetString(PyExc_TypeError, "value must be a type object"); PyErr_SetString(PyExc_TypeError, "value must be a type object");
return NULL; return -1;
} }
if(PyObject_IsSubclass(value, (PyObject*)&DF_Vegetation_type) <= 0) if(PyObject_IsSubclass(value, (PyObject*)&DF_Vegetation_type) <= 0)
{ {
PySys_WriteStdout("failed subclass check"); PySys_WriteStdout("failed subclass check");
PyErr_SetString(PyExc_TypeError, "value must be descended from pydfhack._VegetationManager"); PyErr_SetString(PyExc_TypeError, "value must be descended from pydfhack._VegetationManager");
return NULL; return -1;
} }
self->vegetation_type = value; self->vegetation_type = value;
@ -517,13 +517,13 @@ static int DF_API_setGUIType(DF_API* self, PyObject* value)
{ {
PySys_WriteStdout("failed type check"); PySys_WriteStdout("failed type check");
PyErr_SetString(PyExc_TypeError, "value must be a type object"); PyErr_SetString(PyExc_TypeError, "value must be a type object");
return NULL; return -1;
} }
if(PyObject_IsSubclass(value, (PyObject*)&DF_GUI_type) <= 0) if(PyObject_IsSubclass(value, (PyObject*)&DF_GUI_type) <= 0)
{ {
PySys_WriteStdout("failed subclass check"); PySys_WriteStdout("failed subclass check");
PyErr_SetString(PyExc_TypeError, "value must be descended from pydfhack._GUIManager"); PyErr_SetString(PyExc_TypeError, "value must be descended from pydfhack._GUIManager");
return NULL; return -1;
} }
self->gui_type = value; self->gui_type = value;
@ -653,7 +653,7 @@ static PyTypeObject DF_API_type =
{ {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"pydfhack.API", /*tp_name*/ "pydfhack._API", /*tp_name*/
sizeof(DF_API), /*tp_basicsize*/ sizeof(DF_API), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
(destructor)DF_API_dealloc, /*tp_dealloc*/ (destructor)DF_API_dealloc, /*tp_dealloc*/
@ -672,7 +672,7 @@ static PyTypeObject DF_API_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 API objects", /* tp_doc */ "pydfhack _API objects", /* tp_doc */
0, /* tp_traverse */ 0, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */