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

Import from package; Check for import errors and handle them

develop
RusAnon 2010-05-03 15:00:18 +11:00
parent f2fd748fc6
commit ff52803eff
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,12 @@ static void DoImports()
{
if(FlagsModule == NULL)
{
FlagsModule = PyImport_ImportModule("pydfhackflags");
FlagsModule = PyImport_ImportModule("pydfhack.pydfhackflags");
if (PyErr_Occurred())
{
PyErr_Print();
return ;
}
CreatureFlags1_type = PyObject_GetAttrString(FlagsModule, "CreatureFlags1");
CreatureFlags2_type = PyObject_GetAttrString(FlagsModule, "CreatureFlags2");
@ -72,7 +77,12 @@ static void DoImports()
}
if(TypesModule == NULL)
{
TypesModule = PyImport_ImportModule("pydftypes");
TypesModule = PyImport_ImportModule("pydfhack.pydftypes");
if (PyErr_Occurred())
{
PyErr_Print();
return ;
}
Note_type = PyObject_GetAttrString(TypesModule, "Note");
Construction_type = PyObject_GetAttrString(TypesModule, "Construction");