godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Fix build after c2a9cb34

Browse Source 
`return` statements were missing, and those warnings do not need to be
behind #ifdefs, they do not expose any deprecated API.
This commit is contained in:
Rémi Verschelde
2018-08-27 10:10:40 +02:00
parent 3c0ea513de
commit ddfef86836
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/bullet/generic_6dof_joint_bullet.cpp
View File

@@ -152,11 +152,10 @@ void Generic6DOFJointBullet::set_param(Vector3::Axis p_axis, PhysicsServer::G6DO
case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT:
sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_maxMotorForce = p_value;
break;
#ifndef DISABLE_DEPRECATED
default:
ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated");
WARN_DEPRECATED
#endif // DISABLE_DEPRECATED
break;
}
}
@@ -183,12 +182,10 @@ real_t Generic6DOFJointBullet::get_param(Vector3::Axis p_axis, PhysicsServer::G6
return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_targetVelocity;
case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT:
return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_maxMotorForce;
#ifndef DISABLE_DEPRECATED
default:
ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated");
WARN_DEPRECATED;
return 0;
#endif // DISABLE_DEPRECATED
}
}
@@ -218,11 +215,10 @@ void Generic6DOFJointBullet::set_flag(Vector3::Axis p_axis, PhysicsServer::G6DOF
case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_MOTOR:
sixDOFConstraint->getTranslationalLimitMotor()->m_enableMotor[p_axis] = flags[p_axis][p_flag];
break;
#ifndef DISABLE_DEPRECATED
default:
ERR_EXPLAIN("This flag " + itos(p_flag) + " is deprecated");
WARN_DEPRECATED
#endif // DISABLE_DEPRECATED
break;
}
}