diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-16 17:05:15 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-16 17:05:15 +0400 |
| commit | 2fd6e728513f46e1f313667dfcf6b3d6e09cad39 (patch) | |
| tree | 97306352111268430c9c5bcd75c1638be098cc0d /source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp | |
| parent | 9827bf0cd7c94273e147caae6bb254cf70aed221 (diff) | |
Changed Python _getattr/_setattr methods to use const STR_String& instead of char* - makes using these methods much nicer.
Diffstat (limited to 'source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp index 666d4474130..37d772b9674 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp @@ -93,17 +93,7 @@ bool KX_SCA_AddObjectActuator::Update(double curtime, SCA_IObject* replica = m_scene->AddReplicaObject(m_OriginalObject,GetParent(),m_timeProp ); KX_GameObject * game_obj = static_cast<KX_GameObject *>(replica); game_obj->setLinearVelocity(m_linear_velocity,m_localFlag); - - //if (game_obj->GetSumoObject()) - //{ - // If this is object is also controlled by physics. - // we have to inform the physics controller that - // we no longer take control of the object. - // game_obj->GetPhysicsController()->ResolveCombinedVelocities(m_linear_velocity, - // MT_Vector3(0,0,0), - // m_localFlag, - // false); - //} + game_obj->ResolveCombinedVelocities(m_linear_velocity, MT_Vector3(0., 0., 0.), m_localFlag, false); // keep a copy of the last object, to allow python scripters to change it if (m_lastCreatedObject) @@ -184,7 +174,7 @@ PyMethodDef KX_SCA_AddObjectActuator::Methods[] = { }; -PyObject* KX_SCA_AddObjectActuator::_getattr(char* attr) +PyObject* KX_SCA_AddObjectActuator::_getattr(const STR_String& attr) { _getattr_up(SCA_IActuator); } |