diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_PythonInit.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 252 |
1 files changed, 127 insertions, 125 deletions
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 7d29a20d1a2..43fca40f2da 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -210,15 +210,15 @@ static PyObject *gp_OrigPythonSysModules= NULL; #include "SCA_PythonController.h" // List of methods defined in the module -static PyObject* ErrorObject; +static PyObject *ErrorObject; static const char *gPyGetRandomFloat_doc="getRandomFloat returns a random floating point value in the range [0..1]"; -static PyObject* gPyGetRandomFloat(PyObject*) +static PyObject *gPyGetRandomFloat(PyObject *) { return PyFloat_FromDouble(MT_random()); } -static PyObject* gPySetGravity(PyObject*, PyObject* value) +static PyObject *gPySetGravity(PyObject *, PyObject *value) { MT_Vector3 vec; if (!PyVecTo(value, vec)) @@ -240,7 +240,7 @@ file to make a full path name (doesn't change during the game, even if you load\ other .blend).\n\ The function also converts the directory separator to the local file system format."; -static PyObject* gPyExpandPath(PyObject*, PyObject* args) +static PyObject *gPyExpandPath(PyObject *, PyObject *args) { char expanded[FILE_MAX]; char* filename; @@ -257,7 +257,7 @@ static char gPyStartGame_doc[] = "startGame(blend)\n\ Loads the blend file"; -static PyObject* gPyStartGame(PyObject*, PyObject* args) +static PyObject *gPyStartGame(PyObject *, PyObject *args) { char* blendfile; @@ -274,7 +274,7 @@ static char gPyEndGame_doc[] = "endGame()\n\ Ends the current game"; -static PyObject* gPyEndGame(PyObject*) +static PyObject *gPyEndGame(PyObject *) { gp_KetsjiEngine->RequestExit(KX_EXIT_REQUEST_QUIT_GAME); @@ -287,7 +287,7 @@ static char gPyRestartGame_doc[] = "restartGame()\n\ Restarts the current game by reloading the .blend file"; -static PyObject* gPyRestartGame(PyObject*) +static PyObject *gPyRestartGame(PyObject *) { gp_KetsjiEngine->RequestExit(KX_EXIT_REQUEST_RESTART_GAME); gp_KetsjiEngine->SetNameNextGame(gp_GamePythonPath); @@ -299,7 +299,7 @@ static char gPySaveGlobalDict_doc[] = "saveGlobalDict()\n" "Saves bge.logic.globalDict to a file"; -static PyObject* gPySaveGlobalDict(PyObject*) +static PyObject *gPySaveGlobalDict(PyObject *) { char marshal_path[512]; char *marshal_buffer = NULL; @@ -336,7 +336,7 @@ static char gPyLoadGlobalDict_doc[] = "LoadGlobalDict()\n" "Loads bge.logic.globalDict from a file"; -static PyObject* gPyLoadGlobalDict(PyObject*) +static PyObject *gPyLoadGlobalDict(PyObject *) { char marshal_path[512]; char *marshal_buffer = NULL; @@ -381,7 +381,7 @@ body = Message body\ to = Name of object to send the message to\ from = Name of object to send the string from"; -static PyObject* gPySendMessage(PyObject*, PyObject* args) +static PyObject *gPySendMessage(PyObject *, PyObject *args) { char* subject; char* body = (char *)""; @@ -397,9 +397,9 @@ static PyObject* gPySendMessage(PyObject*, PyObject* args) } // this gets a pointer to an array filled with floats -static PyObject* gPyGetSpectrum(PyObject*) +static PyObject *gPyGetSpectrum(PyObject *) { - PyObject* resultlist = PyList_New(512); + PyObject *resultlist = PyList_New(512); for (int index = 0; index < 512; index++) { @@ -409,7 +409,7 @@ static PyObject* gPyGetSpectrum(PyObject*) return resultlist; } -static PyObject* gPySetLogicTicRate(PyObject*, PyObject* args) +static PyObject *gPySetLogicTicRate(PyObject *, PyObject *args) { float ticrate; if (!PyArg_ParseTuple(args, "f:setLogicTicRate", &ticrate)) @@ -419,12 +419,12 @@ static PyObject* gPySetLogicTicRate(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetLogicTicRate(PyObject*) +static PyObject *gPyGetLogicTicRate(PyObject *) { return PyFloat_FromDouble(KX_KetsjiEngine::GetTicRate()); } -static PyObject* gPySetExitKey(PyObject*, PyObject* args) +static PyObject *gPySetExitKey(PyObject *, PyObject *args) { short exitkey; if (!PyArg_ParseTuple(args, "h:setExitKey", &exitkey)) @@ -433,12 +433,12 @@ static PyObject* gPySetExitKey(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetExitKey(PyObject*) +static PyObject *gPyGetExitKey(PyObject *) { return PyLong_FromSsize_t(KX_KetsjiEngine::GetExitKey()); } -static PyObject* gPySetMaxLogicFrame(PyObject*, PyObject* args) +static PyObject *gPySetMaxLogicFrame(PyObject *, PyObject *args) { int frame; if (!PyArg_ParseTuple(args, "i:setMaxLogicFrame", &frame)) @@ -448,12 +448,12 @@ static PyObject* gPySetMaxLogicFrame(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetMaxLogicFrame(PyObject*) +static PyObject *gPyGetMaxLogicFrame(PyObject *) { return PyLong_FromSsize_t(KX_KetsjiEngine::GetMaxLogicFrame()); } -static PyObject* gPySetMaxPhysicsFrame(PyObject*, PyObject* args) +static PyObject *gPySetMaxPhysicsFrame(PyObject *, PyObject *args) { int frame; if (!PyArg_ParseTuple(args, "i:setMaxPhysicsFrame", &frame)) @@ -463,12 +463,12 @@ static PyObject* gPySetMaxPhysicsFrame(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetMaxPhysicsFrame(PyObject*) +static PyObject *gPyGetMaxPhysicsFrame(PyObject *) { return PyLong_FromSsize_t(KX_KetsjiEngine::GetMaxPhysicsFrame()); } -static PyObject* gPySetPhysicsTicRate(PyObject*, PyObject* args) +static PyObject *gPySetPhysicsTicRate(PyObject *, PyObject *args) { float ticrate; if (!PyArg_ParseTuple(args, "f:setPhysicsTicRate", &ticrate)) @@ -478,7 +478,7 @@ static PyObject* gPySetPhysicsTicRate(PyObject*, PyObject* args) Py_RETURN_NONE; } #if 0 // unused -static PyObject* gPySetPhysicsDebug(PyObject*, PyObject* args) +static PyObject *gPySetPhysicsDebug(PyObject *, PyObject *args) { int debugMode; if (!PyArg_ParseTuple(args, "i:setPhysicsDebug", &debugMode)) @@ -490,21 +490,21 @@ static PyObject* gPySetPhysicsDebug(PyObject*, PyObject* args) #endif -static PyObject* gPyGetPhysicsTicRate(PyObject*) +static PyObject *gPyGetPhysicsTicRate(PyObject *) { return PyFloat_FromDouble(PHY_GetActiveEnvironment()->getFixedTimeStep()); } -static PyObject* gPyGetAverageFrameRate(PyObject*) +static PyObject *gPyGetAverageFrameRate(PyObject *) { return PyFloat_FromDouble(KX_KetsjiEngine::GetAverageFrameRate()); } -static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args) +static PyObject *gPyGetBlendFileList(PyObject *, PyObject *args) { char cpath[sizeof(gp_GamePythonPath)]; char *searchpath = NULL; - PyObject* list, *value; + PyObject *list, *value; DIR *dp; struct dirent *dirp; @@ -545,7 +545,7 @@ static char gPyAddScene_doc[] = adds a scene to the game engine\n\ name = Name of the scene\n\ overlay = Overlay or underlay"; -static PyObject* gPyAddScene(PyObject*, PyObject* args) +static PyObject *gPyAddScene(PyObject *, PyObject *args) { char* name; int overlay = 1; @@ -561,7 +561,7 @@ static PyObject* gPyAddScene(PyObject*, PyObject* args) static const char *gPyGetCurrentScene_doc = "getCurrentScene()\n" "Gets a reference to the current scene.\n"; -static PyObject* gPyGetCurrentScene(PyObject* self) +static PyObject *gPyGetCurrentScene(PyObject *self) { return gp_KetsjiScene->GetProxy(); } @@ -569,10 +569,10 @@ static PyObject* gPyGetCurrentScene(PyObject* self) static const char *gPyGetSceneList_doc = "getSceneList()\n" "Return a list of converted scenes.\n"; -static PyObject* gPyGetSceneList(PyObject* self) +static PyObject *gPyGetSceneList(PyObject *self) { KX_KetsjiEngine* m_engine = KX_GetActiveEngine(); - PyObject* list; + PyObject *list; KX_SceneList* scenes = m_engine->CurrentScenes(); int numScenes = scenes->size(); int i; @@ -665,7 +665,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) Py_RETURN_NONE; } -static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) +static PyObject *gLibLoad(PyObject *, PyObject *args, PyObject *kwds) { KX_Scene *kx_scene= gp_KetsjiScene; char *path; @@ -721,7 +721,7 @@ static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) Py_RETURN_FALSE; } -static PyObject *gLibNew(PyObject*, PyObject* args) +static PyObject *gLibNew(PyObject *, PyObject *args) { KX_Scene *kx_scene= gp_KetsjiScene; char *path; @@ -779,7 +779,7 @@ static PyObject *gLibNew(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject *gLibFree(PyObject*, PyObject* args) +static PyObject *gLibFree(PyObject *, PyObject *args) { KX_Scene *kx_scene= gp_KetsjiScene; char *path; @@ -796,7 +796,7 @@ static PyObject *gLibFree(PyObject*, PyObject* args) } } -static PyObject *gLibList(PyObject*, PyObject* args) +static PyObject *gLibList(PyObject *, PyObject *args) { vector<Main*> &dynMaggie = gp_KetsjiScene->GetSceneConverter()->GetMainDynamic(); int i= 0; @@ -866,14 +866,14 @@ static struct PyMethodDef game_methods[] = { {NULL, (PyCFunction) NULL, 0, NULL } }; -static PyObject* gPyGetWindowHeight(PyObject*, PyObject* args) +static PyObject *gPyGetWindowHeight(PyObject *, PyObject *args) { return PyLong_FromSsize_t((gp_Canvas ? gp_Canvas->GetHeight() : 0)); } -static PyObject* gPyGetWindowWidth(PyObject*, PyObject* args) +static PyObject *gPyGetWindowWidth(PyObject *, PyObject *args) { return PyLong_FromSsize_t((gp_Canvas ? gp_Canvas->GetWidth() : 0)); } @@ -883,7 +883,7 @@ static PyObject* gPyGetWindowWidth(PyObject*, PyObject* args) // temporarility visibility thing, will be moved to rasterizer/renderer later bool gUseVisibilityTemp = false; -static PyObject* gPyEnableVisibility(PyObject*, PyObject* args) +static PyObject *gPyEnableVisibility(PyObject *, PyObject *args) { int visible; if (!PyArg_ParseTuple(args,"i:enableVisibility",&visible)) @@ -895,7 +895,7 @@ static PyObject* gPyEnableVisibility(PyObject*, PyObject* args) -static PyObject* gPyShowMouse(PyObject*, PyObject* args) +static PyObject *gPyShowMouse(PyObject *, PyObject *args) { int visible; if (!PyArg_ParseTuple(args,"i:showMouse",&visible)) @@ -916,7 +916,7 @@ static PyObject* gPyShowMouse(PyObject*, PyObject* args) -static PyObject* gPySetMousePosition(PyObject*, PyObject* args) +static PyObject *gPySetMousePosition(PyObject *, PyObject *args) { int x,y; if (!PyArg_ParseTuple(args,"ii:setMousePosition",&x,&y)) @@ -928,7 +928,7 @@ static PyObject* gPySetMousePosition(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPySetEyeSeparation(PyObject*, PyObject* args) +static PyObject *gPySetEyeSeparation(PyObject *, PyObject *args) { float sep; if (!PyArg_ParseTuple(args, "f:setEyeSeparation", &sep)) @@ -944,7 +944,7 @@ static PyObject* gPySetEyeSeparation(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetEyeSeparation(PyObject*) +static PyObject *gPyGetEyeSeparation(PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.getEyeSeparation(), Rasterizer not available"); @@ -954,7 +954,7 @@ static PyObject* gPyGetEyeSeparation(PyObject*) return PyFloat_FromDouble(gp_Rasterizer->GetEyeSeparation()); } -static PyObject* gPySetFocalLength(PyObject*, PyObject* args) +static PyObject *gPySetFocalLength(PyObject *, PyObject *args) { float focus; if (!PyArg_ParseTuple(args, "f:setFocalLength", &focus)) @@ -970,7 +970,7 @@ static PyObject* gPySetFocalLength(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetFocalLength(PyObject*, PyObject*, PyObject*) +static PyObject *gPyGetFocalLength(PyObject *, PyObject *, PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.getFocalLength(), Rasterizer not available"); @@ -982,7 +982,7 @@ static PyObject* gPyGetFocalLength(PyObject*, PyObject*, PyObject*) Py_RETURN_NONE; } -static PyObject* gPySetBackgroundColor(PyObject*, PyObject* value) +static PyObject *gPySetBackgroundColor(PyObject *, PyObject *value) { MT_Vector4 vec; @@ -1003,7 +1003,7 @@ static PyObject* gPySetBackgroundColor(PyObject*, PyObject* value) -static PyObject* gPySetMistColor(PyObject*, PyObject* value) +static PyObject *gPySetMistColor(PyObject *, PyObject *value) { MT_Vector3 vec; @@ -1013,25 +1013,25 @@ static PyObject* gPySetMistColor(PyObject*, PyObject* value) if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setMistColor(color), Rasterizer not available"); return NULL; - } + } gp_Rasterizer->SetFogColor((float)vec[0], (float)vec[1], (float)vec[2]); Py_RETURN_NONE; } -static PyObject* gPyDisableMist(PyObject*) +static PyObject *gPyDisableMist(PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setMistColor(color), Rasterizer not available"); return NULL; - } + } gp_Rasterizer->DisableFog(); Py_RETURN_NONE; } -static PyObject* gPySetMistStart(PyObject*, PyObject* args) +static PyObject *gPySetMistStart(PyObject *, PyObject *args) { float miststart; @@ -1050,7 +1050,7 @@ static PyObject* gPySetMistStart(PyObject*, PyObject* args) -static PyObject* gPySetMistEnd(PyObject*, PyObject* args) +static PyObject *gPySetMistEnd(PyObject *, PyObject *args) { float mistend; @@ -1068,7 +1068,7 @@ static PyObject* gPySetMistEnd(PyObject*, PyObject* args) } -static PyObject* gPySetAmbientColor(PyObject*, PyObject* value) +static PyObject *gPySetAmbientColor(PyObject *, PyObject *value) { MT_Vector3 vec; @@ -1078,7 +1078,7 @@ static PyObject* gPySetAmbientColor(PyObject*, PyObject* value) if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setAmbientColor(color), Rasterizer not available"); return NULL; - } + } gp_Rasterizer->SetAmbientColor((float)vec[0], (float)vec[1], (float)vec[2]); Py_RETURN_NONE; @@ -1087,7 +1087,7 @@ static PyObject* gPySetAmbientColor(PyObject*, PyObject* value) -static PyObject* gPyMakeScreenshot(PyObject*, PyObject* args) +static PyObject *gPyMakeScreenshot(PyObject *, PyObject *args) { char* filename; if (!PyArg_ParseTuple(args,"s:makeScreenshot",&filename)) @@ -1101,7 +1101,7 @@ static PyObject* gPyMakeScreenshot(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyEnableMotionBlur(PyObject*, PyObject* args) +static PyObject *gPyEnableMotionBlur(PyObject *, PyObject *args) { float motionblurvalue; if (!PyArg_ParseTuple(args,"f:enableMotionBlur",&motionblurvalue)) @@ -1117,7 +1117,7 @@ static PyObject* gPyEnableMotionBlur(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyDisableMotionBlur(PyObject*) +static PyObject *gPyDisableMotionBlur(PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.disableMotionBlur(), Rasterizer not available"); @@ -1147,9 +1147,9 @@ static int getGLSLSettingFlag(const char *setting) return -1; } -static PyObject* gPySetGLSLMaterialSetting(PyObject*, - PyObject* args, - PyObject*) +static PyObject *gPySetGLSLMaterialSetting(PyObject *, + PyObject *args, + PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); char *setting; @@ -1190,9 +1190,9 @@ static PyObject* gPySetGLSLMaterialSetting(PyObject*, Py_RETURN_NONE; } -static PyObject* gPyGetGLSLMaterialSetting(PyObject*, - PyObject* args, - PyObject*) +static PyObject *gPyGetGLSLMaterialSetting(PyObject *, + PyObject *args, + PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); char *setting; @@ -1216,9 +1216,9 @@ static PyObject* gPyGetGLSLMaterialSetting(PyObject*, #define KX_BLENDER_MULTITEX_MATERIAL 1 #define KX_BLENDER_GLSL_MATERIAL 2 -static PyObject* gPySetMaterialType(PyObject*, - PyObject* args, - PyObject*) +static PyObject *gPySetMaterialType(PyObject *, + PyObject *args, + PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); int type; @@ -1240,7 +1240,7 @@ static PyObject* gPySetMaterialType(PyObject*, Py_RETURN_NONE; } -static PyObject* gPyGetMaterialType(PyObject*) +static PyObject *gPyGetMaterialType(PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); int flag; @@ -1255,7 +1255,7 @@ static PyObject* gPyGetMaterialType(PyObject*) return PyLong_FromSsize_t(flag); } -static PyObject* gPySetAnisotropicFiltering(PyObject*, PyObject* args) +static PyObject *gPySetAnisotropicFiltering(PyObject *, PyObject *args) { short level; @@ -1272,16 +1272,16 @@ static PyObject* gPySetAnisotropicFiltering(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetAnisotropicFiltering(PyObject*, PyObject* args) +static PyObject *gPyGetAnisotropicFiltering(PyObject *, PyObject *args) { return PyLong_FromLong(gp_Rasterizer->GetAnisotropicFiltering()); } -static PyObject* gPyDrawLine(PyObject*, PyObject* args) +static PyObject *gPyDrawLine(PyObject *, PyObject *args) { - PyObject* ob_from; - PyObject* ob_to; - PyObject* ob_color; + PyObject *ob_from; + PyObject *ob_to; + PyObject *ob_color; if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.drawLine(obFrom, obTo, color): Rasterizer not available"); @@ -1306,7 +1306,7 @@ static PyObject* gPyDrawLine(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPySetWindowSize(PyObject*, PyObject* args) +static PyObject *gPySetWindowSize(PyObject *, PyObject *args) { int width, height; if (!PyArg_ParseTuple(args, "ii:resize", &width, &height)) @@ -1383,11 +1383,11 @@ static struct PyModuleDef GameLogic_module_def = { 0, /* m_free */ }; -PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack to get gravity hook +PyObject *initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack to get gravity hook { - PyObject* m; - PyObject* d; - PyObject* item; /* temp PyObject* storage */ + PyObject *m; + PyObject *d; + PyObject *item; /* temp PyObject *storage */ gp_KetsjiEngine = engine; gp_KetsjiScene = scene; @@ -1405,7 +1405,7 @@ PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack } else { PyErr_Clear(); - // Create the module and add the functions + // Create the module and add the functions m = PyModule_Create(&GameLogic_module_def); PyDict_SetItemString(PySys_GetObject("modules"), GameLogic_module_def.m_name, m); } @@ -1832,7 +1832,7 @@ static void restorePySysObjects(void) PyDict_Clear(sys_mods); PyDict_Update(sys_mods, gp_OrigPythonSysModules); Py_DECREF(gp_OrigPythonSysModules); - gp_OrigPythonSysModules= NULL; + gp_OrigPythonSysModules= NULL; // fprintf(stderr, "\nRestore Path: %d ", PyList_GET_SIZE(sys_path)); @@ -1862,7 +1862,7 @@ static struct _inittab bge_internal_modules[]= { * Python is not initialized. * see bpy_interface.c's BPY_python_start() which shares the same functionality in blender. */ -PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv) +PyObject *initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv) { /* Yet another gotcha in the py api * Cant run PySys_SetArgv more then once because this adds the @@ -1935,7 +1935,7 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur } void exitGamePlayerPythonScripting() -{ +{ /* Clean up the Python mouse and keyboard */ delete gp_PythonKeyboard; gp_PythonKeyboard = NULL; @@ -1956,7 +1956,7 @@ void exitGamePlayerPythonScripting() /** * Python is already initialized. */ -PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie) +PyObject *initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie) { #if 0 // XXX TODO Py3 STR_String pname = progname; @@ -1998,9 +1998,10 @@ void exitGamePythonScripting() /* similar to the above functions except it sets up the namespace * and other more general things */ -void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main *blenderdata, PyObject * pyGlobalDict, PyObject **gameLogic, PyObject **gameLogic_keys, int argc, char** argv) +void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene *startscene, Main *blenderdata, + PyObject *pyGlobalDict, PyObject **gameLogic, PyObject **gameLogic_keys, int argc, char** argv) { - PyObject* dictionaryobject; + PyObject *dictionaryobject; if (argv) /* player only */ dictionaryobject= initGamePlayerPythonScripting("Ketsji", psl_Lowest, blenderdata, argc, argv); @@ -2053,15 +2054,15 @@ static struct PyModuleDef Rasterizer_module_def = { 0, /* m_free */ }; -PyObject* initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas) +PyObject *initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas) { gp_Canvas = canvas; gp_Rasterizer = rasty; - PyObject* m; - PyObject* d; - PyObject* item; + PyObject *m; + PyObject *d; + PyObject *item; /* Use existing module where possible * be careful not to init any runtime vars after this */ @@ -2114,9 +2115,9 @@ static char gPyEventToString_doc[] = "EventToString(event) - Take a valid event from the GameKeys module or Keyboard Sensor and return a name" ; -static PyObject* gPyEventToString(PyObject*, PyObject* value) +static PyObject *gPyEventToString(PyObject *, PyObject *value) { - PyObject* mod, *dict, *key, *val, *ret = NULL; + PyObject *mod, *dict, *key, *val, *ret = NULL; Py_ssize_t pos = 0; mod = PyImport_ImportModule( "GameKeys" ); @@ -2144,7 +2145,7 @@ static char gPyEventToCharacter_doc[] = "EventToCharacter(event, is_shift) - Take a valid event from the GameKeys module or Keyboard Sensor and return a character" ; -static PyObject* gPyEventToCharacter(PyObject*, PyObject* args) +static PyObject *gPyEventToCharacter(PyObject *, PyObject *args) { int event, shift; if (!PyArg_ParseTuple(args,"ii:EventToCharacter", &event, &shift)) @@ -2179,11 +2180,11 @@ static struct PyModuleDef GameKeys_module_def = { 0, /* m_free */ }; -PyObject* initGameKeys() +PyObject *initGameKeys() { - PyObject* m; - PyObject* d; - PyObject* item; + PyObject *m; + PyObject *d; + PyObject *item; /* Use existing module where possible */ m = PyImport_ImportModule( "GameKeys" ); @@ -2231,24 +2232,24 @@ PyObject* initGameKeys() KX_MACRO_addTypesToDict(d, YKEY, SCA_IInputDevice::KX_YKEY); KX_MACRO_addTypesToDict(d, ZKEY, SCA_IInputDevice::KX_ZKEY); - KX_MACRO_addTypesToDict(d, ZEROKEY, SCA_IInputDevice::KX_ZEROKEY); - KX_MACRO_addTypesToDict(d, ONEKEY, SCA_IInputDevice::KX_ONEKEY); - KX_MACRO_addTypesToDict(d, TWOKEY, SCA_IInputDevice::KX_TWOKEY); + KX_MACRO_addTypesToDict(d, ZEROKEY, SCA_IInputDevice::KX_ZEROKEY); + KX_MACRO_addTypesToDict(d, ONEKEY, SCA_IInputDevice::KX_ONEKEY); + KX_MACRO_addTypesToDict(d, TWOKEY, SCA_IInputDevice::KX_TWOKEY); KX_MACRO_addTypesToDict(d, THREEKEY, SCA_IInputDevice::KX_THREEKEY); - KX_MACRO_addTypesToDict(d, FOURKEY, SCA_IInputDevice::KX_FOURKEY); - KX_MACRO_addTypesToDict(d, FIVEKEY, SCA_IInputDevice::KX_FIVEKEY); - KX_MACRO_addTypesToDict(d, SIXKEY, SCA_IInputDevice::KX_SIXKEY); + KX_MACRO_addTypesToDict(d, FOURKEY, SCA_IInputDevice::KX_FOURKEY); + KX_MACRO_addTypesToDict(d, FIVEKEY, SCA_IInputDevice::KX_FIVEKEY); + KX_MACRO_addTypesToDict(d, SIXKEY, SCA_IInputDevice::KX_SIXKEY); KX_MACRO_addTypesToDict(d, SEVENKEY, SCA_IInputDevice::KX_SEVENKEY); KX_MACRO_addTypesToDict(d, EIGHTKEY, SCA_IInputDevice::KX_EIGHTKEY); - KX_MACRO_addTypesToDict(d, NINEKEY, SCA_IInputDevice::KX_NINEKEY); + KX_MACRO_addTypesToDict(d, NINEKEY, SCA_IInputDevice::KX_NINEKEY); KX_MACRO_addTypesToDict(d, CAPSLOCKKEY, SCA_IInputDevice::KX_CAPSLOCKKEY); - KX_MACRO_addTypesToDict(d, LEFTCTRLKEY, SCA_IInputDevice::KX_LEFTCTRLKEY); + KX_MACRO_addTypesToDict(d, LEFTCTRLKEY, SCA_IInputDevice::KX_LEFTCTRLKEY); KX_MACRO_addTypesToDict(d, LEFTALTKEY, SCA_IInputDevice::KX_LEFTALTKEY); KX_MACRO_addTypesToDict(d, RIGHTALTKEY, SCA_IInputDevice::KX_RIGHTALTKEY); KX_MACRO_addTypesToDict(d, RIGHTCTRLKEY, SCA_IInputDevice::KX_RIGHTCTRLKEY); - KX_MACRO_addTypesToDict(d, RIGHTSHIFTKEY, SCA_IInputDevice::KX_RIGHTSHIFTKEY); + KX_MACRO_addTypesToDict(d, RIGHTSHIFTKEY, SCA_IInputDevice::KX_RIGHTSHIFTKEY); KX_MACRO_addTypesToDict(d, LEFTSHIFTKEY, SCA_IInputDevice::KX_LEFTSHIFTKEY); KX_MACRO_addTypesToDict(d, ESCKEY, SCA_IInputDevice::KX_ESCKEY); @@ -2256,25 +2257,25 @@ PyObject* initGameKeys() KX_MACRO_addTypesToDict(d, RETKEY, SCA_IInputDevice::KX_RETKEY); KX_MACRO_addTypesToDict(d, ENTERKEY, SCA_IInputDevice::KX_RETKEY); KX_MACRO_addTypesToDict(d, SPACEKEY, SCA_IInputDevice::KX_SPACEKEY); - KX_MACRO_addTypesToDict(d, LINEFEEDKEY, SCA_IInputDevice::KX_LINEFEEDKEY); + KX_MACRO_addTypesToDict(d, LINEFEEDKEY, SCA_IInputDevice::KX_LINEFEEDKEY); KX_MACRO_addTypesToDict(d, BACKSPACEKEY, SCA_IInputDevice::KX_BACKSPACEKEY); KX_MACRO_addTypesToDict(d, DELKEY, SCA_IInputDevice::KX_DELKEY); KX_MACRO_addTypesToDict(d, SEMICOLONKEY, SCA_IInputDevice::KX_SEMICOLONKEY); - KX_MACRO_addTypesToDict(d, PERIODKEY, SCA_IInputDevice::KX_PERIODKEY); - KX_MACRO_addTypesToDict(d, COMMAKEY, SCA_IInputDevice::KX_COMMAKEY); - KX_MACRO_addTypesToDict(d, QUOTEKEY, SCA_IInputDevice::KX_QUOTEKEY); - KX_MACRO_addTypesToDict(d, ACCENTGRAVEKEY, SCA_IInputDevice::KX_ACCENTGRAVEKEY); - KX_MACRO_addTypesToDict(d, MINUSKEY, SCA_IInputDevice::KX_MINUSKEY); - KX_MACRO_addTypesToDict(d, SLASHKEY, SCA_IInputDevice::KX_SLASHKEY); + KX_MACRO_addTypesToDict(d, PERIODKEY, SCA_IInputDevice::KX_PERIODKEY); + KX_MACRO_addTypesToDict(d, COMMAKEY, SCA_IInputDevice::KX_COMMAKEY); + KX_MACRO_addTypesToDict(d, QUOTEKEY, SCA_IInputDevice::KX_QUOTEKEY); + KX_MACRO_addTypesToDict(d, ACCENTGRAVEKEY, SCA_IInputDevice::KX_ACCENTGRAVEKEY); + KX_MACRO_addTypesToDict(d, MINUSKEY, SCA_IInputDevice::KX_MINUSKEY); + KX_MACRO_addTypesToDict(d, SLASHKEY, SCA_IInputDevice::KX_SLASHKEY); KX_MACRO_addTypesToDict(d, BACKSLASHKEY, SCA_IInputDevice::KX_BACKSLASHKEY); - KX_MACRO_addTypesToDict(d, EQUALKEY, SCA_IInputDevice::KX_EQUALKEY); - KX_MACRO_addTypesToDict(d, LEFTBRACKETKEY, SCA_IInputDevice::KX_LEFTBRACKETKEY); - KX_MACRO_addTypesToDict(d, RIGHTBRACKETKEY, SCA_IInputDevice::KX_RIGHTBRACKETKEY); + KX_MACRO_addTypesToDict(d, EQUALKEY, SCA_IInputDevice::KX_EQUALKEY); + KX_MACRO_addTypesToDict(d, LEFTBRACKETKEY, SCA_IInputDevice::KX_LEFTBRACKETKEY); + KX_MACRO_addTypesToDict(d, RIGHTBRACKETKEY, SCA_IInputDevice::KX_RIGHTBRACKETKEY); KX_MACRO_addTypesToDict(d, LEFTARROWKEY, SCA_IInputDevice::KX_LEFTARROWKEY); KX_MACRO_addTypesToDict(d, DOWNARROWKEY, SCA_IInputDevice::KX_DOWNARROWKEY); - KX_MACRO_addTypesToDict(d, RIGHTARROWKEY, SCA_IInputDevice::KX_RIGHTARROWKEY); - KX_MACRO_addTypesToDict(d, UPARROWKEY, SCA_IInputDevice::KX_UPARROWKEY); + KX_MACRO_addTypesToDict(d, RIGHTARROWKEY, SCA_IInputDevice::KX_RIGHTARROWKEY); + KX_MACRO_addTypesToDict(d, UPARROWKEY, SCA_IInputDevice::KX_UPARROWKEY); KX_MACRO_addTypesToDict(d, PAD2 , SCA_IInputDevice::KX_PAD2); KX_MACRO_addTypesToDict(d, PAD4 , SCA_IInputDevice::KX_PAD4); @@ -2347,14 +2348,14 @@ PyObject* initGameKeys() int saveGamePythonConfig( char **marshal_buffer) { int marshal_length = 0; - PyObject* gameLogic = PyImport_ImportModule("GameLogic"); + PyObject *gameLogic = PyImport_ImportModule("GameLogic"); if (gameLogic) { - PyObject* pyGlobalDict = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module + PyObject *pyGlobalDict = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module if (pyGlobalDict) { -#ifdef Py_MARSHAL_VERSION - PyObject* pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict, 2); // Py_MARSHAL_VERSION == 2 as of Py2.5 +#ifdef Py_MARSHAL_VERSION + PyObject *pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict, 2); // Py_MARSHAL_VERSION == 2 as of Py2.5 #else - PyObject* pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict ); + PyObject *pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict ); #endif if (pyGlobalDictMarshal) { // for testing only @@ -2384,12 +2385,12 @@ int loadGamePythonConfig(char *marshal_buffer, int marshal_length) { /* Restore the dict */ if (marshal_buffer) { - PyObject* gameLogic = PyImport_ImportModule("GameLogic"); + PyObject *gameLogic = PyImport_ImportModule("GameLogic"); if (gameLogic) { - PyObject* pyGlobalDict = PyMarshal_ReadObjectFromString(marshal_buffer, marshal_length); + PyObject *pyGlobalDict = PyMarshal_ReadObjectFromString(marshal_buffer, marshal_length); if (pyGlobalDict) { - PyObject* pyGlobalDict_orig = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module. + PyObject *pyGlobalDict_orig = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module. if (pyGlobalDict_orig) { PyDict_Clear(pyGlobalDict_orig); PyDict_Update(pyGlobalDict_orig, pyGlobalDict); @@ -2405,10 +2406,11 @@ int loadGamePythonConfig(char *marshal_buffer, int marshal_length) PyErr_Clear(); printf("Error could not marshall string\n"); } - } else { + } + else { PyErr_Clear(); printf("Error, bge.logic failed to import bge.logic.globalDict will be lost\n"); - } + } } return 0; } |