diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
commit | 5ef9039b7e2ea16bd4b651aab21d5aa690485569 (patch) | |
tree | e67247fa43d89748900b697eb9bdf0341fe53afc /source/gameengine/GameLogic | |
parent | fb56dbc2afc7c8b6ffc24406ed82cbcbff090da3 (diff) | |
parent | 5ebee683bd736ef80df939552bbe0d8e104b56df (diff) |
Cycles: svn merge -r41531:41613 ^/trunk/blender
Diffstat (limited to 'source/gameengine/GameLogic')
26 files changed, 29 insertions, 29 deletions
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h index ec4c4a1cbcf..42446b7a2b1 100644 --- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h +++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h @@ -37,7 +37,7 @@ class SCA_2DFilterActuator : public SCA_IActuator { - Py_Header; + Py_Header private: vector<STR_String> m_propNames; diff --git a/source/gameengine/GameLogic/SCA_ANDController.h b/source/gameengine/GameLogic/SCA_ANDController.h index e39dea547a2..363bca630aa 100644 --- a/source/gameengine/GameLogic/SCA_ANDController.h +++ b/source/gameengine/GameLogic/SCA_ANDController.h @@ -39,7 +39,7 @@ class SCA_ANDController : public SCA_IController { - Py_Header; + Py_Header //virtual void Trigger(class SCA_LogicManager* logicmgr); public: SCA_ANDController(SCA_IObject* gameobj); diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h index 9b5793787a2..e7a7525bb40 100644 --- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h +++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h @@ -40,7 +40,7 @@ class SCA_ActuatorSensor : public SCA_ISensor { - Py_Header; + Py_Header STR_String m_checkactname; bool m_lastresult; bool m_midresult; diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.h b/source/gameengine/GameLogic/SCA_AlwaysSensor.h index 41e9a9612c6..8748793d9a3 100644 --- a/source/gameengine/GameLogic/SCA_AlwaysSensor.h +++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.h @@ -38,7 +38,7 @@ class SCA_AlwaysSensor : public SCA_ISensor { - Py_Header; + Py_Header bool m_alwaysresult; public: SCA_AlwaysSensor(class SCA_EventManager* eventmgr, diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h b/source/gameengine/GameLogic/SCA_DelaySensor.h index fea713502b4..ccb8f00c548 100644 --- a/source/gameengine/GameLogic/SCA_DelaySensor.h +++ b/source/gameengine/GameLogic/SCA_DelaySensor.h @@ -38,7 +38,7 @@ class SCA_DelaySensor : public SCA_ISensor { - Py_Header; + Py_Header bool m_lastResult; bool m_repeat; int m_delay; diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.h b/source/gameengine/GameLogic/SCA_ExpressionController.h index 4e549c08ed1..93a3f08c95f 100644 --- a/source/gameengine/GameLogic/SCA_ExpressionController.h +++ b/source/gameengine/GameLogic/SCA_ExpressionController.h @@ -39,7 +39,7 @@ class SCA_ExpressionController : public SCA_IController { -// Py_Header; +// Py_Header STR_String m_exprText; CExpression* m_exprCache; diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h index 795e02dcf78..5481f2ae8e4 100644 --- a/source/gameengine/GameLogic/SCA_IController.h +++ b/source/gameengine/GameLogic/SCA_IController.h @@ -42,7 +42,7 @@ */ class SCA_IController : public SCA_ILogicBrick { - Py_Header; + Py_Header protected: std::vector<class SCA_ISensor*> m_linkedsensors; std::vector<class SCA_IActuator*> m_linkedactuators; diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h index 4016c557bf3..87b37a8ef39 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.h +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h @@ -43,7 +43,7 @@ class SCA_IScene; class SCA_ILogicBrick : public CValue { - Py_Header; + Py_Header protected: SCA_IObject* m_gameobj; int m_Execute_Priority; diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index 1d16d4f0af7..b0a03de1242 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -54,7 +54,7 @@ typedef std::vector<SCA_IObject *> SCA_ObjectList; class SCA_IObject : public CValue { - Py_Header; + Py_Header protected: friend class KX_StateActuator; diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h index 970faf7d29a..ef082095c0d 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.h +++ b/source/gameengine/GameLogic/SCA_ISensor.h @@ -47,7 +47,7 @@ */ class SCA_ISensor : public SCA_ILogicBrick { - Py_Header; + Py_Header protected: class SCA_EventManager* m_eventmgr; diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h index b4ed2c06d2f..db34ce4cc15 100644 --- a/source/gameengine/GameLogic/SCA_JoystickSensor.h +++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h @@ -38,7 +38,7 @@ class SCA_JoystickSensor :public SCA_ISensor { - Py_Header; + Py_Header /** * Axis 1-JOYAXIS_MAX, MUST be followed by m_axisf @@ -128,8 +128,8 @@ public: /* --------------------------------------------------------------------- */ /* Joystick Index */ - KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetButtonActiveList); - KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,GetButtonStatus); + KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetButtonActiveList) + KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,GetButtonStatus) static PyObject* pyattr_get_axis_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_axis_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h index 37a42cdcbe6..e7283978ae1 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h @@ -44,7 +44,7 @@ * exclusive. */ class SCA_KeyboardSensor : public SCA_ISensor { - Py_Header; + Py_Header /** * the key this sensor is sensing for diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h index ecfa776112a..4bac9c10e13 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.h +++ b/source/gameengine/GameLogic/SCA_MouseSensor.h @@ -39,7 +39,7 @@ class SCA_MouseSensor : public SCA_ISensor { - Py_Header; + Py_Header /** * Use SCA_IInputDevice values to encode the mouse mode for now. diff --git a/source/gameengine/GameLogic/SCA_NANDController.h b/source/gameengine/GameLogic/SCA_NANDController.h index 8eb26127a51..723d2a5fe0d 100644 --- a/source/gameengine/GameLogic/SCA_NANDController.h +++ b/source/gameengine/GameLogic/SCA_NANDController.h @@ -36,7 +36,7 @@ class SCA_NANDController : public SCA_IController { - Py_Header; + Py_Header //virtual void Trigger(class SCA_LogicManager* logicmgr); public: SCA_NANDController(SCA_IObject* gameobj); diff --git a/source/gameengine/GameLogic/SCA_NORController.h b/source/gameengine/GameLogic/SCA_NORController.h index 6580ad7bc8c..26d7e925923 100644 --- a/source/gameengine/GameLogic/SCA_NORController.h +++ b/source/gameengine/GameLogic/SCA_NORController.h @@ -36,7 +36,7 @@ class SCA_NORController : public SCA_IController { - Py_Header; + Py_Header //virtual void Trigger(class SCA_LogicManager* logicmgr); public: SCA_NORController(SCA_IObject* gameobj); diff --git a/source/gameengine/GameLogic/SCA_ORController.h b/source/gameengine/GameLogic/SCA_ORController.h index 4edd34f6302..53debf894a3 100644 --- a/source/gameengine/GameLogic/SCA_ORController.h +++ b/source/gameengine/GameLogic/SCA_ORController.h @@ -36,7 +36,7 @@ class SCA_ORController : public SCA_IController { - Py_Header; + Py_Header //virtual void Trigger(class SCA_LogicManager* logicmgr); public: SCA_ORController(SCA_IObject* gameobj); diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h index f4a43a7e21c..17419e34c2a 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.h +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h @@ -36,7 +36,7 @@ class SCA_PropertyActuator : public SCA_IActuator { - Py_Header; + Py_Header enum KX_ACT_PROP_MODE { KX_ACT_PROP_NODEF = 0, diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h index c1fe5320546..bf7b1e879f7 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.h +++ b/source/gameengine/GameLogic/SCA_PropertySensor.h @@ -37,7 +37,7 @@ class SCA_PropertySensor : public SCA_ISensor { - Py_Header; + Py_Header //class CExpression* m_rightexpr; int m_checktype; STR_String m_checkpropval; diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index d69358928e6..8a87a734a1c 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -164,7 +164,7 @@ void SCA_PythonController::SetNamespace(PyObject* pythondictionary) /* Without __file__ set the sys.argv[0] is used for the filename * which ends up with lines from the blender binary being printed in the console */ - PyDict_SetItemString(m_pythondictionary, "__file__", PyUnicode_FromString(m_scriptName.Ptr())); + PyDict_SetItemString(m_pythondictionary, "__file__", PyUnicode_From_STR_String(m_scriptName)); } #endif @@ -490,7 +490,7 @@ PyObject* SCA_PythonController::pyattr_get_script(void *self_v, const KX_PYATTRI // static_cast<void *>(dynamic_cast<Derived *>(obj)) - static_cast<void *>(obj) SCA_PythonController* self= static_cast<SCA_PythonController*>(self_v); - return PyUnicode_FromString(self->m_scriptText); + return PyUnicode_From_STR_String(self->m_scriptText); } diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h index 0d22c347861..521a676bf4a 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.h +++ b/source/gameengine/GameLogic/SCA_PythonController.h @@ -42,7 +42,7 @@ class SCA_IObject; class SCA_PythonController : public SCA_IController { - Py_Header; + Py_Header #ifdef WITH_PYTHON struct _object * m_bytecode; /* SCA_PYEXEC_SCRIPT only */ PyObject* m_function; /* SCA_PYEXEC_MODULE only */ diff --git a/source/gameengine/GameLogic/SCA_PythonKeyboard.h b/source/gameengine/GameLogic/SCA_PythonKeyboard.h index 9c761e054f2..7ecf76d1581 100644 --- a/source/gameengine/GameLogic/SCA_PythonKeyboard.h +++ b/source/gameengine/GameLogic/SCA_PythonKeyboard.h @@ -31,7 +31,7 @@ class SCA_PythonKeyboard : public PyObjectPlus { - Py_Header; + Py_Header private: class SCA_IInputDevice *m_keyboard; #ifdef WITH_PYTHON diff --git a/source/gameengine/GameLogic/SCA_PythonMouse.h b/source/gameengine/GameLogic/SCA_PythonMouse.h index dfdf00bc6e9..4ad655dce8f 100644 --- a/source/gameengine/GameLogic/SCA_PythonMouse.h +++ b/source/gameengine/GameLogic/SCA_PythonMouse.h @@ -31,7 +31,7 @@ class SCA_PythonMouse : public PyObjectPlus { - Py_Header; + Py_Header private: class SCA_IInputDevice *m_mouse; class RAS_ICanvas *m_canvas; diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h index 66d22d5952b..c439b445a5b 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.h +++ b/source/gameengine/GameLogic/SCA_RandomActuator.h @@ -38,7 +38,7 @@ class SCA_RandomActuator : public SCA_IActuator { - Py_Header; + Py_Header /** Property to assign to */ STR_String m_propname; diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h index f0ae2fd2bde..cec8bcdb445 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.h +++ b/source/gameengine/GameLogic/SCA_RandomSensor.h @@ -39,7 +39,7 @@ class SCA_RandomSensor : public SCA_ISensor { - Py_Header; + Py_Header unsigned int m_currentDraw; int m_iteration; diff --git a/source/gameengine/GameLogic/SCA_XNORController.h b/source/gameengine/GameLogic/SCA_XNORController.h index de0af2ba9d5..c2cdad2cdf4 100644 --- a/source/gameengine/GameLogic/SCA_XNORController.h +++ b/source/gameengine/GameLogic/SCA_XNORController.h @@ -36,7 +36,7 @@ class SCA_XNORController : public SCA_IController { - Py_Header; + Py_Header //virtual void Trigger(class SCA_LogicManager* logicmgr); public: SCA_XNORController(SCA_IObject* gameobj); diff --git a/source/gameengine/GameLogic/SCA_XORController.h b/source/gameengine/GameLogic/SCA_XORController.h index 96098082165..1f38a510046 100644 --- a/source/gameengine/GameLogic/SCA_XORController.h +++ b/source/gameengine/GameLogic/SCA_XORController.h @@ -36,7 +36,7 @@ class SCA_XORController : public SCA_IController { - Py_Header; + Py_Header //virtual void Trigger(class SCA_LogicManager* logicmgr); public: SCA_XORController(SCA_IObject* gameobj); |