From 1c96de0be82054ec6361277234e40c931787a618 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 12 May 2010 16:15:48 +0200 Subject: [PATCH 1/2] Fixed: #890 Ryzom Client Build Fix - _Bool is a keyword in C99 (patch provided by rti) --- code/ryzom/client/src/interface_v3/interface_options.cpp | 2 +- code/ryzom/client/src/interface_v3/interface_options.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/interface_options.cpp b/code/ryzom/client/src/interface_v3/interface_options.cpp index 961b84055..ae70f1460 100644 --- a/code/ryzom/client/src/interface_v3/interface_options.cpp +++ b/code/ryzom/client/src/interface_v3/interface_options.cpp @@ -48,7 +48,7 @@ void CInterfaceOptionValue::init(const std::string &str) fromString(str, _Int); fromString(str, _Float); _Color= CInterfaceElement::convertColor (str.c_str()); - _Bool= CInterfaceElement::convertBool(str.c_str()); + _Boolean= CInterfaceElement::convertBool(str.c_str()); } diff --git a/code/ryzom/client/src/interface_v3/interface_options.h b/code/ryzom/client/src/interface_v3/interface_options.h index 01aafc6c6..3fdb82a97 100644 --- a/code/ryzom/client/src/interface_v3/interface_options.h +++ b/code/ryzom/client/src/interface_v3/interface_options.h @@ -37,14 +37,14 @@ public: _Color= NLMISC::CRGBA::White; _Int= 0; _Float= 0; - _Bool= false; + _Boolean= false; } const std::string &getValStr () const {return _Str;} sint32 getValSInt32() const {return _Int;} float getValFloat () const {return _Float;} NLMISC::CRGBA getValColor () const {return _Color;} - bool getValBool () const {return _Bool;} + bool getValBool () const {return _Boolean;} void init(const std::string &str); @@ -57,7 +57,7 @@ private: NLMISC::CRGBA _Color; sint32 _Int; float _Float; - bool _Bool; + bool _Boolean; }; From 0ce1916acbdc9b4663366147a25ea4a699d1f2c9 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 12 May 2010 16:17:44 +0200 Subject: [PATCH 2/2] Changed: #878 Fix typos in comments/code --- code/ryzom/client/src/animation.cpp | 2 +- .../client_sheets/animation_set_list_sheet.h | 2 +- .../client/src/interface_v3/chat_window.cpp | 4 +-- .../interface_v3/group_in_scene_bubble.cpp | 26 ------------------- code/ryzom/client/src/landscape_poly_drawer.h | 2 +- code/ryzom/client/src/light_cycle_manager.cpp | 2 +- code/ryzom/client/src/misc.h | 6 ++--- .../ryzom/client/src/motion/user_controls.cpp | 2 +- code/ryzom/client/src/player_cl.cpp | 2 +- code/ryzom/client/src/player_r2_cl.cpp | 2 +- code/ryzom/client/src/r2/tool_choose_pos.cpp | 6 ++--- code/ryzom/client/src/release.cpp | 2 +- code/ryzom/client/src/village.h | 2 +- .../common/src/game_share/starting_point.h | 2 +- 14 files changed, 18 insertions(+), 44 deletions(-) diff --git a/code/ryzom/client/src/animation.cpp b/code/ryzom/client/src/animation.cpp index 0e977a5d7..a82799c10 100644 --- a/code/ryzom/client/src/animation.cpp +++ b/code/ryzom/client/src/animation.cpp @@ -33,7 +33,7 @@ #include "animation_misc.h" #include "debug_client.h" #include "client_cfg.h" -#include "entity_animation_manager.h" // \todo GUIGUI : ajouté pour recompiler les animations au chargement (faire mieux ?). +#include "entity_animation_manager.h" // \todo GUIGUI : added to recompile animations at loading (to do better ?). /////////// diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h index 2f1ee3737..1716e8f24 100644 --- a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h @@ -113,7 +113,7 @@ public: TurnLeft, TurnRight, Emote, - // Old Cast // \todo GUIGUI : a enlever lorsqu'on sera passé au nouveau systeme. + // Old Cast // \todo GUIGUI : to remove when the new system will be used CastGoodBegin, CastGoodSuccess, CastGoodFail, diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp index 8a898a28d..ae674a368 100644 --- a/code/ryzom/client/src/interface_v3/chat_window.cpp +++ b/code/ryzom/client/src/interface_v3/chat_window.cpp @@ -820,8 +820,8 @@ void CChatGroupWindow::updateFreeTellerHeader(CGroupContainer &ft) inviteBut->setActive(isDM); if (isDM) { - inviteBut->setFrozen(false); // TODO Boris : true si le joueur est déjà invité dans l'anim + faire - // PeopleInterraction.updateAllFreeTellerHeaders() quant la liste est updatée + inviteBut->setFrozen(false); // TODO Boris : true if player is already invited in anim + do + // PeopleInterraction.updateAllFreeTellerHeaders() when list is updated } } } diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp index b72ed31c3..51a748408 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp @@ -855,32 +855,6 @@ void CGroupInSceneBubbleManager::chatOpen (uint32 nUID, const ucstring &ucsText, } } } -#if !FINAL_VERSION - -NLMISC_COMMAND(testChatOpen1, "", "") -{ - CEntityCL *selection = EntitiesMngr.entity(UserEntity->selection()); - if (selection != NULL) - { - const ucstring text("Ceci doit être la page1.Ceci doit être la page1.Ceci doit être la page1.Ceci doit être la page1.Ceci doit être la page1.{break}Ceci doit en principe être la seconde page... Elle comprends un certain nombre de caractères et est utilisée pour déterminée la moyenne maximale que l'on peut atteindre, entre les langues (par exemple l'allemand) la taille de tout ca peut changer du tout au tout. Il faut se donner une marge a ne pas depasser.{break}Et enfin cette page doit être la dernière!"); - InSceneBubbleManager.chatOpen(selection->dataSetId(), text); - } - return true; -} - -// TEMP TEMP TEMP -NLMISC_COMMAND(testChatOpen2, "", "") -{ - CEntityCL *selection = EntitiesMngr.entity(UserEntity->selection()); - if (selection != NULL) - { - const ucstring text("Ceci doit être une page toute seule pour voir ce que ca fait ..."); - InSceneBubbleManager.chatOpen(selection->dataSetId(), text); - } - return true; -} - -#endif // *************************************************************************** diff --git a/code/ryzom/client/src/landscape_poly_drawer.h b/code/ryzom/client/src/landscape_poly_drawer.h index 51cd006df..d27500169 100644 --- a/code/ryzom/client/src/landscape_poly_drawer.h +++ b/code/ryzom/client/src/landscape_poly_drawer.h @@ -66,7 +66,7 @@ private: // to infinity during shadow volume display. // To a best robustness and to join depth range [depthMin, depthMax] used in display of main scene, an epsilon // factor is calculated to transpose Z buffer values from [depthMin, 1] to [depthMin, depthMax] -// while à [depthMin, 1] depth range is used during shadow volume display. +// while in [depthMin, 1] depth range is used during shadow volume display. //----------------------------------------------------------------------------------------------------------- class CLandscapePolyDrawer : public NLMISC::CSingleton { diff --git a/code/ryzom/client/src/light_cycle_manager.cpp b/code/ryzom/client/src/light_cycle_manager.cpp index 47b3deed5..2cbc0a6e1 100644 --- a/code/ryzom/client/src/light_cycle_manager.cpp +++ b/code/ryzom/client/src/light_cycle_manager.cpp @@ -45,7 +45,7 @@ #include "misc.h" #include "interface_v3/interface_manager.h" -//#include "sound_manager.h" // \todo GUIGUI : SOUND_MANAGER A REMETTRE lorsque intégration nouveau FE fini et la class modifiée. +//#include "sound_manager.h" // \todo GUIGUI : uncomment after new FE done and class modified H_AUTO_DECL(RZ_LightCycleManager) diff --git a/code/ryzom/client/src/misc.h b/code/ryzom/client/src/misc.h index 9f9383f41..7f9bd8593 100644 --- a/code/ryzom/client/src/misc.h +++ b/code/ryzom/client/src/misc.h @@ -86,9 +86,9 @@ double angleBetween2Vect(const NLMISC::CVectorD &from, const NLMISC::CVectorD &t void makeUp(NL3D::UInstance face, sint idMakeUp); /** - * qStart est le quaterion à t=0, - * qEnd est le quaterion à t=TAnimEnd, - * time est entre 0 et 1. (1=> TAnimEnd) + * qStart is the quaterion at t=0, + * qEnd is the quaterion at t=TAnimEnd, + * time is between 0 and 1. (1=> TAnimEnd) */ NLMISC::CQuat applyRotationFactor(NLMISC::CQuat in, float rotFactor, NLMISC::CQuat qStart, NLMISC::CQuat qEnd, float time); diff --git a/code/ryzom/client/src/motion/user_controls.cpp b/code/ryzom/client/src/motion/user_controls.cpp index 714fea653..020d21182 100644 --- a/code/ryzom/client/src/motion/user_controls.cpp +++ b/code/ryzom/client/src/motion/user_controls.cpp @@ -599,7 +599,7 @@ void CUserControls::cameraLook(bool fullMode) //----------------------------------------------- // commonMove : // Manage some common actions. -// \todo GUIGUI : gérer le control avant l'update des entités, mais la vue qu'après le déplacement. +// \todo GUIGUI : manage control before entities update, but view only after move //----------------------------------------------- void CUserControls::commonMove() { diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp index c72356110..6872665de 100644 --- a/code/ryzom/client/src/player_cl.cpp +++ b/code/ryzom/client/src/player_cl.cpp @@ -931,7 +931,7 @@ void CPlayerCL::updateVisualPropertyVpb(const NLMISC::TGameCycle &/* gameCycle * //----------------------------------------------- // updateVisualPropertyVpc : // Update the Visual Property C. -// \todo GUIGUI : factoriser les tatouages avec la création de perso +// \todo GUIGUI : factorize tatoos with character creation //----------------------------------------------- void CPlayerCL::updateVisualPropertyVpc(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop) { diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/code/ryzom/client/src/player_r2_cl.cpp index 85a7905f1..2cbfb6869 100644 --- a/code/ryzom/client/src/player_r2_cl.cpp +++ b/code/ryzom/client/src/player_r2_cl.cpp @@ -692,7 +692,7 @@ void CPlayerR2CL::updateVisualPropertyVpb(const NLMISC::TGameCycle &/* gameCycle //----------------------------------------------- // updateVisualPropertyVpc : // Update the Visual Property C. -// \todo GUIGUI : factoriser les tatouages avec la création de perso +// \todo GUIGUI : factorize tatoos with character creation //----------------------------------------------- void CPlayerR2CL::updateVisualPropertyVpc(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop) diff --git a/code/ryzom/client/src/r2/tool_choose_pos.cpp b/code/ryzom/client/src/r2/tool_choose_pos.cpp index 5e67c4735..7637322ee 100644 --- a/code/ryzom/client/src/r2/tool_choose_pos.cpp +++ b/code/ryzom/client/src/r2/tool_choose_pos.cpp @@ -307,9 +307,9 @@ void CToolChoosePos::updateBeforeRender() } // see if all pos are accessible and update the _Valid flag - // NB NICO : LE CODE SUIVANT MARCHE MAIS - // voir avec les autres si c'est vraiment pertinent de tester ce type de collisions - // au final -> comme le test entre entité n'est pas fait, intérêt douteux ... + // NB NICO : THE FOLLOWING CODE IS WORKING BUT + // see with others if it's usefull to check this type of collisions + // finally -> since check is never done, limited/no interest ... /* if (shown && entity->getPrimitive()) { diff --git a/code/ryzom/client/src/release.cpp b/code/ryzom/client/src/release.cpp index 278b58ee8..15ff9b856 100644 --- a/code/ryzom/client/src/release.cpp +++ b/code/ryzom/client/src/release.cpp @@ -44,7 +44,7 @@ #include "pacs_client.h" #include "world_database_manager.h" #include "continent_manager.h" -#include "sound_manager.h" // \todo GUIGUI : SOUND_MANAGER A REMETTRE lorsque intégration nouveau FE fini et la class modifiée. +#include "sound_manager.h" #include "weather.h" #include "weather_manager_client.h" #include "prim_file.h" diff --git a/code/ryzom/client/src/village.h b/code/ryzom/client/src/village.h index 6fe03a5aa..f19ba53e0 100644 --- a/code/ryzom/client/src/village.h +++ b/code/ryzom/client/src/village.h @@ -72,7 +72,7 @@ public: //\name From IStreamableEntity //@{ /** Given a pos, test wether the village needs to be loaded now. -à * It it returns false, it means that the village is too far or that asynchronous loading suffice. + * It it returns false, it means that the village is too far or that asynchronous loading suffice. * It it returns true, the next call to update will return only when the loading is completed. */ virtual bool needCompleteLoading(const NLMISC::CVector &pos) const; diff --git a/code/ryzom/common/src/game_share/starting_point.h b/code/ryzom/common/src/game_share/starting_point.h index 1103866bc..90beb871c 100644 --- a/code/ryzom/common/src/game_share/starting_point.h +++ b/code/ryzom/common/src/game_share/starting_point.h @@ -33,7 +33,7 @@ namespace RYZOM_STARTING_POINT rosilio, miani, - // zoraï start village + // zorai start village zorai_start, qai_lo = zorai_start, sheng_wo,