From 1760d16dd2b6fbc64b6cd413d6a4eb7d5931fa4a Mon Sep 17 00:00:00 2001 From: Riasan Date: Tue, 23 May 2017 21:59:28 +0200 Subject: [PATCH] Fix: Typo by forceCameraFirstPerson --HG-- branch : compatibility-develop --- .../ryzom/client/src/interface_v3/action_handler_move.cpp | 2 +- code/ryzom/client/src/user_entity.cpp | 8 +++----- code/ryzom/client/src/user_entity.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/action_handler_move.cpp b/code/ryzom/client/src/interface_v3/action_handler_move.cpp index 62d51d0b7..d402f1750 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_move.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_move.cpp @@ -231,7 +231,7 @@ 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 (CAHTForceFP, "force_camera_fp"); diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp index 166732b9c..cad200aeb 100644 --- a/code/ryzom/client/src/user_entity.cpp +++ b/code/ryzom/client/src/user_entity.cpp @@ -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()) @@ -3226,12 +3226,10 @@ void CUserEntity::forceCamareaFirstPerson() if(!UserEntity->forceIndoorFPV()) { if (UserEntity->viewMode() != CUserEntity::FirstPV) - { //Enter the 1st Person View Mode UserEntity->viewMode(CUserEntity::FirstPV); - } } -}// forceCamareaFirstPerson // +}// forceCameraFirstPerson // //--------------------------------------------------- // getScale : diff --git a/code/ryzom/client/src/user_entity.h b/code/ryzom/client/src/user_entity.h index e79af8dba..7e693536b 100644 --- a/code/ryzom/client/src/user_entity.h +++ b/code/ryzom/client/src/user_entity.h @@ -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).