Changed: edit force_camera_fp command

--HG--
branch : develop
This commit is contained in:
Riasan 2017-05-23 19:38:26 +02:00
parent 319cab93cd
commit 8b4d189c31
3 changed files with 10 additions and 9 deletions

View file

@ -226,15 +226,15 @@ class CAHToggleCamera : public IActionHandler
REGISTER_ACTION_HANDLER (CAHToggleCamera, "toggle_camera");
// ------------------------------------------------------------------------------------------------
class CAHToggleForceFP : public IActionHandler
class CAHTForceFP : public IActionHandler
{
virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
{
// Change the camera view to first person
UserEntity->forceCamareaFirstPerson();
UserEntity->forceCameraFirstPerson();
}
};
REGISTER_ACTION_HANDLER (CAHToggleForceFP, "force_camera_fp");
REGISTER_ACTION_HANDLER (CAHTForceFP, "force_camera_fp");
// ------------------------------------------------------------------------------------------------
class CAHToggleNames : public IActionHandler

View file

@ -3214,10 +3214,10 @@ void CUserEntity::toggleCamera()
}// toggleCamera //
//-----------------------------------------------
// forceCamareaFirstPerson :
// forceCameraFirstPerson :
// Force Camera to First Person View
//-----------------------------------------------
void CUserEntity::forceCamareaFirstPerson()
void CUserEntity::forceCameraFirstPerson()
{
// You cannot change the camera view when dead.
if(isDead())
@ -3225,10 +3225,11 @@ void CUserEntity::forceCamareaFirstPerson()
// Only if not inside a building.
if(!UserEntity->forceIndoorFPV())
{
//Enter the 1st Person View Mode
UserEntity->viewMode(CUserEntity::FirstPV);
if (UserEntity->viewMode() != CUserEntity::FirstPV)
//Enter the 1st Person View Mode
UserEntity->viewMode(CUserEntity::FirstPV);
}
}// forceCamareaFirstPerson //
}// forceCameraFirstPerson //
//---------------------------------------------------
// getScale :

View file

@ -370,7 +370,7 @@ public:
/// Toggle Camera (First/Third Person)
void toggleCamera();
/// Force Camera First Person View
void forceCamareaFirstPerson();
void forceCameraFirstPerson();
//@}
/// Return the entity scale. (return 1.0 if there is any problem).