diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 11:36:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 11:36:32 +0400 |
commit | 81d8f17843f92c6d6abbacb652ca22917910f4bc (patch) | |
tree | eb6f5f38f6f38a863c76383d92eeb40f11679dbf /source/gameengine | |
parent | 29806d3bcf0d17eaced1f3b524a7a81cdeebc495 (diff) |
style cleanup: pep8, indentation
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Expressions/ErrorValue.cpp | 8 | ||||
-rw-r--r-- | source/gameengine/Expressions/Operator2Expr.cpp | 5 | ||||
-rw-r--r-- | source/gameengine/GameLogic/SCA_IInputDevice.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/GameLogic/SCA_KeyboardManager.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageRender.cpp | 2 |
5 files changed, 8 insertions, 11 deletions
diff --git a/source/gameengine/Expressions/ErrorValue.cpp b/source/gameengine/Expressions/ErrorValue.cpp index db5be0d2ee1..ba9c52be6c7 100644 --- a/source/gameengine/Expressions/ErrorValue.cpp +++ b/source/gameengine/Expressions/ErrorValue.cpp @@ -39,10 +39,10 @@ pre: effect: constructs a new CErrorValue containing errormessage errmsg */ { - m_strErrorText = "["; - m_strErrorText += errmsg; - m_strErrorText += "]"; - SetError(true); + m_strErrorText = "["; + m_strErrorText += errmsg; + m_strErrorText += "]"; + SetError(true); } diff --git a/source/gameengine/Expressions/Operator2Expr.cpp b/source/gameengine/Expressions/Operator2Expr.cpp index e34e40d55eb..2224b0ff5e8 100644 --- a/source/gameengine/Expressions/Operator2Expr.cpp +++ b/source/gameengine/Expressions/Operator2Expr.cpp @@ -244,10 +244,7 @@ CExpression* COperator2Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlink / */ - return Release(); - - - + return Release(); } diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.cpp b/source/gameengine/GameLogic/SCA_IInputDevice.cpp index 181889f0375..16626b05526 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.cpp +++ b/source/gameengine/GameLogic/SCA_IInputDevice.cpp @@ -62,7 +62,7 @@ void SCA_IInputDevice::ClearStatusTable(int tableid) const SCA_InputEvent& SCA_IInputDevice::GetEventValue(SCA_IInputDevice::KX_EnumInputs inputcode) { - // cerr << "SCA_IInputDevice::GetEventValue" << endl; +// cerr << "SCA_IInputDevice::GetEventValue" << endl; return m_eventStatusTables[m_currentTable][inputcode]; } diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.cpp b/source/gameengine/GameLogic/SCA_KeyboardManager.cpp index 3111ad0de5f..edf1f300fba 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardManager.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardManager.cpp @@ -64,7 +64,7 @@ SCA_IInputDevice* SCA_KeyboardManager::GetInputDevice() void SCA_KeyboardManager::NextFrame() { //const SCA_InputEvent& event = GetEventValue(SCA_IInputDevice::KX_EnumInputs inputcode)=0; - // cerr << "SCA_KeyboardManager::NextFrame"<< endl; +// cerr << "SCA_KeyboardManager::NextFrame"<< endl; SG_DList::iterator<SCA_ISensor> it(m_sensors); for (it.begin();!it.end();++it) { diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 3bdf293b15a..3718a7b3094 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -359,7 +359,7 @@ static int setBackground (PyImage * self, PyObject * value, void * closure) getImageRender(self)->setBackground((unsigned char)(PyLong_AsSsize_t(PySequence_Fast_GET_ITEM(value, 0))), (unsigned char)(PyLong_AsSsize_t(PySequence_Fast_GET_ITEM(value, 1))), (unsigned char)(PyLong_AsSsize_t(PySequence_Fast_GET_ITEM(value, 2))), - (unsigned char)(PyLong_AsSsize_t(PySequence_Fast_GET_ITEM(value, 3)))); + (unsigned char)(PyLong_AsSsize_t(PySequence_Fast_GET_ITEM(value, 3)))); // success return 0; } |