griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge trunk 16118 -> 116886

Browse Source
This commit is contained in:
Martin Poirier
2008-10-02 20:39:57 +00:00
parent 39e66e4d6f 06c43148a1
commit c35a2d6ea9
1066 changed files with 112489 additions and 41598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
View File

@@ -149,8 +149,8 @@ PyParentObject SCA_ActuatorSensor::Parents[] = {
};
PyMethodDef SCA_ActuatorSensor::Methods[] = {
{"getActuator", (PyCFunction) SCA_ActuatorSensor::sPyGetActuator, METH_NOARGS, GetActuator_doc},
{"setActuator", (PyCFunction) SCA_ActuatorSensor::sPySetActuator, METH_VARARGS, SetActuator_doc},
{"getActuator", (PyCFunction) SCA_ActuatorSensor::sPyGetActuator, METH_NOARGS, (PY_METHODCHAR)GetActuator_doc},
{"setActuator", (PyCFunction) SCA_ActuatorSensor::sPySetActuator, METH_VARARGS, (PY_METHODCHAR)SetActuator_doc},
{NULL,NULL} //Sentinel
};
@@ -159,7 +159,7 @@ PyObject* SCA_ActuatorSensor::_getattr(const STR_String& attr) {
}
/* 3. getActuator */
char SCA_ActuatorSensor::GetActuator_doc[] =
const char SCA_ActuatorSensor::GetActuator_doc[] =
"getActuator()\n"
"\tReturn the Actuator with which the sensor operates.\n";
PyObject* SCA_ActuatorSensor::PyGetActuator(PyObject* self)
@@ -168,7 +168,7 @@ PyObject* SCA_ActuatorSensor::PyGetActuator(PyObject* self)
}
/* 4. setActuator */
char SCA_ActuatorSensor::SetActuator_doc[] =
const char SCA_ActuatorSensor::SetActuator_doc[] =
"setActuator(name)\n"
"\t- name: string\n"
"\tSets the Actuator with which to operate. If there is no Actuator\n"