sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE API cleanup: more consistent type check on set attribute (mouse and keyboard so far). Check type after name so that the user get a type error when assigning a wrong type to a built-in attribute.

Browse Source
This commit is contained in:
Benoit Bolsee 2008-12-30 16:44:34 +00:00
parent cbc3c7e878
commit cbceb6c8b2
2 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
View File

@ -846,49 +846,64 @@ SCA_KeyboardSensor::_getattr(const STR_String& attr)
int SCA_KeyboardSensor::_setattr(const STR_String& attr, PyObject *value)
{
if (PyInt_Check(value))
if (attr == "key")
{
int val = PyInt_AsLong(value);
if (attr == "key")
{
m_hotkey = val;
return 0;
}
if (attr == "hold1")
{
m_qual = val;
return 0;
}
if (attr == "hold2")
{
m_qual2 = val;
return 0;
}
if (attr == "useAllKeys")
{
m_bAllKeys = (val != 0);
return 0;
if (!PyInt_Check(value)){
PyErr_SetString(PyExc_TypeError, "expected an integer");
return 1;
}
m_hotkey = PyInt_AsLong(value);
return 0;
}
if (PyString_Check(value))
if (attr == "hold1")
{
STR_String val = PyString_AsString(value);
if (attr == "logToggleProperty")
{
m_toggleprop = val;
return 0;
if (!PyInt_Check(value)){
PyErr_SetString(PyExc_TypeError, "expected an integer");
return 1;
}
m_qual = PyInt_AsLong(value);
return 0;
}
if (attr == "hold2")
{
if (!PyInt_Check(value)){
PyErr_SetString(PyExc_TypeError, "expected an integer");
return 1;
}
m_qual2 = PyInt_AsLong(value);
return 0;
}
if (attr == "logTargetProperty")
{
m_targetprop = val;
return 0;
if (attr == "useAllKeys")
{
if (!PyInt_Check(value)){
PyErr_SetString(PyExc_TypeError, "expected an integer");
return 1;
}
m_bAllKeys = (PyInt_AsLong(value) != 0);
return 0;
}
if (attr == "logToggleProperty")
{
if (!PyString_Check(value)){
PyErr_SetString(PyExc_TypeError, "expected a string");
return 1;
}
m_toggleprop = PyString_AsString(value);
return 0;
}
if (attr == "logTargetProperty")
{
if (!PyString_Check(value)){
PyErr_SetString(PyExc_TypeError, "expected a string");
return 1;
}
m_targetprop = PyString_AsString(value);
return 0;
}
return SCA_ISensor::_setattr(attr, value);

39
source/gameengine/GameLogic/SCA_MouseSensor.cpp
View File

@ -343,31 +343,30 @@ PyObject* SCA_MouseSensor::_getattr(const STR_String& attr) {
int SCA_MouseSensor::_setattr(const STR_String& attr, PyObject *value)
{
if (PyInt_Check(value))
if (attr == "mode")
{
if (!PyInt_Check(value)){
PyErr_SetString(PyExc_TypeError, "expected an integer");
return 1;
}
int val = PyInt_AsLong(value);
if (attr == "mode")
{
if ((val < KX_MOUSESENSORMODE_NODEF)
|| (val > KX_MOUSESENSORMODE_MAX)){
PyErr_SetString(PyExc_ValueError, "invalid mode specified!");
return NULL;
}
m_mousemode = val;
UpdateHotkey();
return 0;
if ((val < KX_MOUSESENSORMODE_NODEF)
|| (val > KX_MOUSESENSORMODE_MAX)){
PyErr_SetString(PyExc_ValueError, "invalid mode specified!");
return 1;
}
m_mousemode = val;
UpdateHotkey();
return 0;
}
else
if (attr == "position")
{
if (attr == "position")
{
PyErr_SetString(PyExc_AttributeError, "read-only property!");
return NULL;
}
PyErr_SetString(PyExc_AttributeError, "'position' is a read-only property!");
return 1;
}
return SCA_ISensor::_setattr(attr, value);