From 45f81d18bd9bb28eaebfd1d8eacf5528293162dc Mon Sep 17 00:00:00 2001 From: doomchild Date: Tue, 20 Apr 2010 12:19:41 -0500 Subject: [PATCH] updated type strings/names --- dfhack/python/DF_Constructions.cpp | 4 ++-- dfhack/python/DF_GUI.cpp | 4 ++-- dfhack/python/DF_Translate.cpp | 4 ++-- dfhack/python/pydfhack.cpp | 22 +++++++++++----------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dfhack/python/DF_Constructions.cpp b/dfhack/python/DF_Constructions.cpp index 237efb479..0bfe99320 100644 --- a/dfhack/python/DF_Constructions.cpp +++ b/dfhack/python/DF_Constructions.cpp @@ -178,7 +178,7 @@ static PyTypeObject DF_Construction_type = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ - "pydfhack.Construction", /*tp_name*/ + "pydfhack._ConstructionManager", /*tp_name*/ sizeof(DF_Construction), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)DF_Construction_dealloc, /*tp_dealloc*/ @@ -197,7 +197,7 @@ static PyTypeObject DF_Construction_type = 0, /*tp_setattro*/ 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "pydfhack Construction objects", /* tp_doc */ + "pydfhack ConstructionManager object", /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ diff --git a/dfhack/python/DF_GUI.cpp b/dfhack/python/DF_GUI.cpp index 015d115b9..e289b7650 100644 --- a/dfhack/python/DF_GUI.cpp +++ b/dfhack/python/DF_GUI.cpp @@ -163,7 +163,7 @@ static PyTypeObject DF_GUI_type = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ - "pydfhack.GUI", /*tp_name*/ + "pydfhack._GUIManager", /*tp_name*/ sizeof(DF_GUI), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)DF_GUI_dealloc, /*tp_dealloc*/ @@ -182,7 +182,7 @@ static PyTypeObject DF_GUI_type = 0, /*tp_setattro*/ 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "pydfhack GUI objects", /* tp_doc */ + "pydfhack GUIManager object", /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ diff --git a/dfhack/python/DF_Translate.cpp b/dfhack/python/DF_Translate.cpp index 274e5ccdd..c61b6065e 100644 --- a/dfhack/python/DF_Translate.cpp +++ b/dfhack/python/DF_Translate.cpp @@ -237,7 +237,7 @@ static PyTypeObject DF_Translate_type = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ - "pydfhack.Translate", /*tp_name*/ + "pydfhack._TranslationManager", /*tp_name*/ sizeof(DF_Translate), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)DF_Translate_dealloc, /*tp_dealloc*/ @@ -256,7 +256,7 @@ static PyTypeObject DF_Translate_type = 0, /*tp_setattro*/ 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "pydfhack Translate objects", /* tp_doc */ + "pydfhack TranslationManager object", /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ diff --git a/dfhack/python/pydfhack.cpp b/dfhack/python/pydfhack.cpp index 323c2ad70..fadb0852b 100644 --- a/dfhack/python/pydfhack.cpp +++ b/dfhack/python/pydfhack.cpp @@ -118,17 +118,17 @@ PyMODINIT_FUNC initpydfhack(void) Py_INCREF(&DF_GUI_type); PyModule_AddObject(module, "API", (PyObject*)&DF_API_type); - PyModule_AddObject(module, "MemInfo", (PyObject*)&DF_MemInfo_type); - PyModule_AddObject(module, "Position", (PyObject*)&DF_Position_type); - PyModule_AddObject(module, "Materials", (PyObject*)&DF_Material_type); - PyModule_AddObject(module, "Creature_Base", (PyObject*)&DF_Creature_Base_type); - PyModule_AddObject(module, "CreatureManager", (PyObject*)&DF_CreatureManager_type); - PyModule_AddObject(module, "Translate", (PyObject*)&DF_Translate_type); - PyModule_AddObject(module, "Vegetation", (PyObject*)&DF_Vegetation_type); - PyModule_AddObject(module, "Building", (PyObject*)&DF_Building_type); - PyModule_AddObject(module, "ConstructionManager", (PyObject*)&DF_Construction_type); - PyModule_AddObject(module, "Map", (PyObject*)&DF_Map_type); - PyModule_AddObject(module, "GUI", (PyObject*)&DF_GUI_type); + PyModule_AddObject(module, "_MemInfo", (PyObject*)&DF_MemInfo_type); + PyModule_AddObject(module, "_PositionManager", (PyObject*)&DF_Position_type); + PyModule_AddObject(module, "_MaterialsManager", (PyObject*)&DF_Material_type); + PyModule_AddObject(module, "_Creature_Base", (PyObject*)&DF_Creature_Base_type); + PyModule_AddObject(module, "_CreatureManager", (PyObject*)&DF_CreatureManager_type); + PyModule_AddObject(module, "_TranslationManager", (PyObject*)&DF_Translate_type); + PyModule_AddObject(module, "_VegetationManager", (PyObject*)&DF_Vegetation_type); + PyModule_AddObject(module, "_BuildingManager", (PyObject*)&DF_Building_type); + PyModule_AddObject(module, "_ConstructionManager", (PyObject*)&DF_Construction_type); + PyModule_AddObject(module, "_MapManager", (PyObject*)&DF_Map_type); + PyModule_AddObject(module, "_GUIManager", (PyObject*)&DF_GUI_type); DoImports();