diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-01 10:44:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-01 10:44:08 -0300 |
| commit | 4804462ee06c1b3e2d1b50b857ce8693d3c0936d (patch) | |
| tree | 5d1d06399c5ce28f27253943f35ef4a11d3ac633 /servers | |
| parent | af42e244e0c41c92b6eeab379f7ba68869dbd0a9 (diff) | |
-Fixes from source code analyzizer, closes #1768
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics/joints/generic_6dof_joint_sw.cpp | 2 | ||||
| -rw-r--r-- | servers/physics_2d_server.cpp | 2 | ||||
| -rw-r--r-- | servers/physics_server.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/shader_language.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/servers/physics/joints/generic_6dof_joint_sw.cpp b/servers/physics/joints/generic_6dof_joint_sw.cpp index 3d569df2c9..decc379461 100644 --- a/servers/physics/joints/generic_6dof_joint_sw.cpp +++ b/servers/physics/joints/generic_6dof_joint_sw.cpp @@ -536,7 +536,7 @@ void Generic6DOFJointSW::set_param(Vector3::Axis p_axis,PhysicsServer::G6DOFJoin } break; case PhysicsServer::G6DOF_JOINT_ANGULAR_LIMIT_SOFTNESS: { - m_angularLimits[p_axis].m_limitSoftness; + m_angularLimits[p_axis].m_limitSoftness=p_value; } break; case PhysicsServer::G6DOF_JOINT_ANGULAR_DAMPING: { diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 16a15617ff..088c092e75 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -285,7 +285,7 @@ Array Physics2DDirectSpaceState::_cast_motion(const Ref<Physics2DShapeQueryParam Array ret(true); ret.resize(2); ret[0]=closest_safe; - ret[0]=closest_unsafe; + ret[1]=closest_unsafe; return ret; } diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index a5c7d35490..010e02d884 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -303,7 +303,7 @@ Array PhysicsDirectSpaceState::_cast_motion(const Ref<PhysicsShapeQueryParameter Array ret(true); ret.resize(2); ret[0]=closest_safe; - ret[0]=closest_unsafe; + ret[1]=closest_unsafe; return ret; } diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 16676cec83..77b7ddbc93 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -1279,7 +1279,7 @@ ShaderLanguage::Node* ShaderLanguage::validate_function_call(Parser&parser, Oper if (p_func->op==OP_CONSTRUCT && all_const) { - bool all_const=false; + Vector<float> cdata; for(int i=0;i<argcount;i++) { |