While testing YoFrankie with the new API attributes found some issues...

- corrections to docs
- disallow calling controller.activate(actuator) when the controller is not active. (Raise a SystemError)
- Added 2 new attributes, CValue.name - deprecates CValue.getName(), KX_GameObject.children deprecated KX_GameObject.getChildren(), (same for getChildrenRecursive()).

1 files changed, 10 insertions, 0 deletions

diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 212366e6526..abb3b36b91e 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -494,6 +494,11 @@ int SCA_PythonController::py_setattro(PyObject *attr, PyObject *value)
 
 PyObject* SCA_PythonController::PyActivate(PyObject *value)
 {
+	if(m_sCurrentController != this) {
+		PyErr_SetString(PyExc_SystemError, "Cannot add an actuator from a non-active controller");
+		return NULL;
+	}
+	
 	SCA_IActuator* actu = LinkedActuatorFromPy(value);
 	if(actu==NULL)
 		return NULL;
@@ -504,6 +509,11 @@ PyObject* SCA_PythonController::PyActivate(PyObject *value)
 
 PyObject* SCA_PythonController::PyDeActivate(PyObject *value)
 {
+	if(m_sCurrentController != this) {
+		PyErr_SetString(PyExc_SystemError, "Cannot add an actuator from a non-active controller");
+		return NULL;
+	}
+	
 	SCA_IActuator* actu = LinkedActuatorFromPy(value);
 	if(actu==NULL)
 		return NULL;