← Back to branch summary

~ubuntu-branches/ubuntu/saucy/blender/saucy-proposed

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_IController.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/GameLogic/SCA_IController.h
65
65
        void    UnlinkAllActuators();
66
66
        void    UnlinkActuator(class SCA_IActuator* actua);
67
67
        void    UnlinkSensor(class SCA_ISensor* sensor);
68
 
        void    SetState(unsigned int state) { m_statemask = state; }
69
 
        void    ApplyState(unsigned int state);
 
68
        void    SetState(unsigned int state) { m_statemask = state; }
 
69
        void    ApplyState(unsigned int state);
70
70
        void    Deactivate()
71
71
        {
72
72
                // the controller can only be part of a sensor m_newControllers list
106
106
        static PyObject*        pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
107
107
        static PyObject*        pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
108
108
        static PyObject*        pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
109
 
#endif // WITH_PYTHON
 
109
#endif  /* WITH_PYTHON */
110
110
};
111
111
 
112
 
#endif
113
 
 
 
112
#endif  /* __SCA_ICONTROLLER_H__ */