diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-09-30 02:49:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-30 02:49:33 +0400 |
| commit | 8b6f5c171da4d9b165c5ba0628f0302430dbed2b (patch) | |
| tree | 143760eb8bfb151e6bea7fc5fdaed0fafe221a49 /source/gameengine/GameLogic | |
| parent | 71b3088596feb008e503be6430a30555aaffa586 (diff) | |
- rather then passing the python namespace dictionary to the controller function get the namespace from the converter.
- renamed SetPythonDictionary() to SetPyNamespace()
- remove IsLight(), GetGameObjectType() existed before this but wasnt used for lights.
Diffstat (limited to 'source/gameengine/GameLogic')
| -rw-r--r-- | source/gameengine/GameLogic/SCA_IObject.h | 1 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/SCA_PythonController.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/SCA_PythonController.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index 60335f8fe01..f078e129378 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -219,6 +219,7 @@ public: typedef enum ObjectTypes { OBJ_ARMATURE=0, OBJ_CAMERA=1, + OBJ_LIGHT=2, }ObjectTypes; }; diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index 3a70d1485dc..ac3e0434d20 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -151,7 +151,7 @@ void SCA_PythonController::SetScriptName(const STR_String& name) #ifndef DISABLE_PYTHON -void SCA_PythonController::SetDictionary(PyObject* pythondictionary) +void SCA_PythonController::SetNamespace(PyObject* pythondictionary) { if (m_pythondictionary) { diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h index f6a1064b77d..eeac710c6ea 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.h +++ b/source/gameengine/GameLogic/SCA_PythonController.h @@ -84,7 +84,7 @@ class SCA_PythonController : public SCA_IController void SetScriptText(const STR_String& text); void SetScriptName(const STR_String& name); #ifndef DISABLE_PYTHON - void SetDictionary(PyObject* pythondictionary); + void SetNamespace(PyObject* pythondictionary); #endif void SetDebug(bool debug) { m_debug = debug; } void AddTriggeredSensor(class SCA_ISensor* sensor) |