From ba089f8548608e5298e57ae026d31128701b7966 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 12 Feb 2013 22:48:37 +0100 Subject: [PATCH] Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) --- code/ryzom/client/src/animated_scene_object.cpp | 6 +++--- code/ryzom/client/src/animated_scene_object.h | 2 +- .../src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h | 4 ++-- .../src/lua_ide_dll_nevrax/include/cj60/CJCaption.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJControlBar.h | 4 ++-- .../src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJDockContext.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJFlatButton.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h | 4 ++-- .../include/cj60/CJFlatHeaderCtrl.h | 4 ++-- .../src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h | 4 ++-- .../src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h | 4 ++-- .../src/lua_ide_dll_nevrax/include/cj60/CJListView.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h | 4 ++-- .../include/cj60/CJMiniDockFrameWnd.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h | 4 ++-- .../lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h | 4 ++-- .../src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h | 4 ++-- .../src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp | 6 +++--- .../lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp | 4 ++-- .../source/CJ60Lib/CJControlBar.cpp | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp | 4 ++-- .../source/CJ60Lib/CJDockContext.cpp | 4 ++-- .../source/CJ60Lib/CJExplorerBar.cpp | 4 ++-- .../source/CJ60Lib/CJFlatButton.cpp | 4 ++-- .../source/CJ60Lib/CJFlatComboBox.cpp | 4 ++-- .../source/CJ60Lib/CJFlatHeaderCtrl.cpp | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp | 4 ++-- .../source/CJ60Lib/CJMDIFrameWnd.cpp | 4 ++-- .../source/CJ60Lib/CJMiniDockFrameWnd.cpp | 4 ++-- .../source/CJ60Lib/CJOutlookBar.cpp | 4 ++-- .../source/CJ60Lib/CJPagerCtrl.cpp | 4 ++-- .../source/CJ60Lib/CJSearchEdit.cpp | 4 ++-- .../source/CJ60Lib/CJSizeDockBar.cpp | 4 ++-- .../source/CJ60Lib/CJTabctrlBar.cpp | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp | 4 ++-- .../lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp | 4 ++-- code/ryzom/client/src/scene_parser.cpp | 2 +- code/ryzom/client/src/stage.cpp | 2 +- code/ryzom/client/src/stage.h | 2 +- code/ryzom/server/src/ai_service/alias_tree_owner.h | 2 +- .../server/src/ai_service/bot_chat_interface.cpp | 2 +- code/ryzom/server/src/ai_service/continent.cpp | 2 +- code/ryzom/server/src/ai_service/family_behavior.cpp | 4 ++-- code/ryzom/server/src/ai_service/knapsack_solver.cpp | 10 +++++----- code/ryzom/server/src/ai_service/nf_static.cpp | 2 +- code/ryzom/server/src/ai_service/path_behaviors.cpp | 2 +- code/ryzom/server/src/ai_service/script_compiler.cpp | 2 +- .../src/ai_service/script_compiler_native_func.cpp | 4 ++-- code/ryzom/server/src/ai_service/script_vm.cpp | 2 +- code/ryzom/server/src/ai_share/world_map.h | 2 +- .../src/entities_game_service/client_messages.cpp | 2 +- .../egs_sheets/egs_static_brick.cpp | 2 +- .../entity_manager/entity_base.h | 2 +- .../mission_manager/mission_step_queue.cpp | 4 ++-- .../entities_game_service/outpost_manager/outpost.h | 2 +- .../outpost_manager/outpost_squad.h | 2 +- .../phrase_manager/fg_prospection_phrase.cpp | 2 +- .../phrase_manager/magic_action_attack.cpp | 8 ++++---- .../phrase_manager/magic_action_debuff.cpp | 8 ++++---- .../phrase_manager/magic_action_dot.cpp | 8 ++++---- .../player_manager/cdb_branch.h | 2 +- .../src/frontend_service/distance_prioritizer.cpp | 4 ++-- .../src/input_output_service/string_manager.cpp | 2 +- .../server/src/logger_service/logger_service.cpp | 2 +- code/ryzom/server/src/sabrina/combat_attacker.cpp | 2 +- .../ryzom/server/src/sabrina/magic_action_attack.cpp | 8 ++++---- .../ryzom/server/src/sabrina/magic_action_debuff.cpp | 8 ++++---- code/ryzom/server/src/sabrina/magic_action_dot.cpp | 8 ++++---- .../testing_tool_service/testing_tool_service.cpp | 2 +- code/ryzom/tools/leveldesign/georges_convert/form.h | 6 +++--- .../leveldesign/georges_convert/form_body_elt_atom.h | 4 ++-- .../leveldesign/georges_convert/form_body_elt_list.h | 4 ++-- .../georges_convert/form_body_elt_struct.h | 4 ++-- .../georges_plugin_sound/sound_plugin.cpp | 4 ++-- .../mission_compiler_lib/mission_compiler.cpp | 2 +- .../tools/leveldesign/mp_generator/moulinette.h | 11 ++++------- .../world_editor/land_export_lib/export.cpp | 2 +- .../world_editor/world_editor_plugin/plugin.cpp | 12 ++++++------ .../sheet_random_generator.cpp | 2 +- .../tools/sheet_random_generator/srg_utilities.h | 2 +- 89 files changed, 175 insertions(+), 178 deletions(-) diff --git a/code/ryzom/client/src/animated_scene_object.cpp b/code/ryzom/client/src/animated_scene_object.cpp index 9e1b4273c..487841214 100644 --- a/code/ryzom/client/src/animated_scene_object.cpp +++ b/code/ryzom/client/src/animated_scene_object.cpp @@ -209,7 +209,7 @@ CAnimatedSceneObject::CAnimatedSceneObject( const CEntityId& Id, const list < st current.identity (); current.setRot (_Rotation); - // Rotation 90° + // Rotation 90 degrees CMatrix rot90; rot90.identity (); rot90.rotateZ (-(float)Pi/2); @@ -322,7 +322,7 @@ void CAnimatedSceneObject::resetInitialPos( void ) current.identity (); current.setRot (_Rotation); - // Rotation 90° + // Rotation 90 degrees CMatrix rot90; rot90.identity (); rot90.rotateZ (-(float)Pi/2); @@ -741,7 +741,7 @@ void CAnimatedSceneObject::removeOffsetAnimation () // Remove the first frame animation current *= firstFrame; - // Rotation 90° + // Rotation 90 degrees CMatrix rot90; rot90.identity (); rot90.rotateZ (-(float)Pi/2); diff --git a/code/ryzom/client/src/animated_scene_object.h b/code/ryzom/client/src/animated_scene_object.h index e26acc3bd..6c9136a81 100644 --- a/code/ryzom/client/src/animated_scene_object.h +++ b/code/ryzom/client/src/animated_scene_object.h @@ -98,7 +98,7 @@ public: // Process logic and displacement and setup visual animation void applyObjectAnimationTimeslice( double time ); - // manage animation start, if they are many animation, we choose one randomly (TODO: add contrôle to animation launched and manage some mode (loop, repeat number, sequences..) + // manage animation start, if they are many animation, we choose one randomly (TODO: add control to animation launched and manage some mode (loop, repeat number, sequences..) void manageObjectAnimation( double Time, NLMISC::CVector userPos ); // update (add to end list) Animation sequence with sequence diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h index 96b0bde95..551bcc708 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJ60Lib.h @@ -16,7 +16,7 @@ // CJ60Lib.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h index b1ed9e4da..a9785f4cb 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJCaption.h @@ -16,7 +16,7 @@ // CJCaption.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h index 0d3b250e9..6bd62810b 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJControlBar.h @@ -18,7 +18,7 @@ // // DevStudio Style Resizable Docking Control Bar. // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -29,7 +29,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h index b362584f2..2d4913966 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockBar.h @@ -16,7 +16,7 @@ // CJDockBar.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h index 7681ed176..99b222058 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJDockContext.h @@ -16,7 +16,7 @@ // CJDockContext.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h index 29ca6b455..0438a040a 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJExplorerBar.h @@ -16,7 +16,7 @@ // CJExplorerBar.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h index 0771160ba..3a7c06035 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatButton.h @@ -16,7 +16,7 @@ // CJFlatButton.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h index 35b0470b7..d234a42c9 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatComboBox.h @@ -16,7 +16,7 @@ // CJFlatComboBox.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h index a2d70b7c0..833346364 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFlatHeaderCtrl.h @@ -16,7 +16,7 @@ // CJHeaderCtrl.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h index 6bcd16fbe..cad476dc4 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJFrameWnd.h @@ -16,7 +16,7 @@ // CJFrameWnd.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h index 26dc0e6b7..27e098e99 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListCtrl.h @@ -16,7 +16,7 @@ // CJListCtrl.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h index e08e12652..eadd1a09c 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJListView.h @@ -16,7 +16,7 @@ // CJListView.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h index 10fb158b7..a35def9db 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMDIFrameWnd.h @@ -16,7 +16,7 @@ // CJMDIFrameWnd.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h index 8bf61aafb..2808eca91 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJMiniDockFrameWnd.h @@ -16,7 +16,7 @@ // CJMiniDockFrameWnd.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h index 9b3c85685..2a9606cc8 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h @@ -16,7 +16,7 @@ // CJOutlookBar.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h index dec3533c9..08d6edbb8 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJPagerCtrl.h @@ -16,7 +16,7 @@ // CJPagerCtrl.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h index 8a7a99377..b3ba7f9c5 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSearchEdit.h @@ -16,7 +16,7 @@ // CJCJSearchEdit.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h index d0a9d6d0f..23f4b0338 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJSizeDockBar.h @@ -16,7 +16,7 @@ // CJSizeDockBar.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h index c2d262805..97dc31a23 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJTabCtrlBar.h @@ -23,7 +23,7 @@ // mailto:dirk_clemens@hotmail.com // http://www.codeguru.com/docking/sizing_tabctrl_bar.shtml // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -34,7 +34,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h index c04f64012..e46419508 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJToolBar.h @@ -16,7 +16,7 @@ // CJToolBar.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h index 974396a66..206c6e324 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/SHFileInfo.h @@ -16,7 +16,7 @@ // SHFileInfo.h : header file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp index 1dc27d0e7..116253499 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJ60lib.cpp @@ -16,7 +16,7 @@ // CJ60Lib.cpp : Defines the initialization routines for the DLL. // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. @@ -127,7 +127,7 @@ bool GetVerComCtl32() if (iVerComCtl32 < 471) { CString str; - str.Format(_T("Copyright © 1998-99 Kirk Stowell\nmailto:kstowell@codejockeys.com - http://www.codejockeys.com/kstowell/\n\nCode Jockey's CJ60 extension library requires ComCtl32.dll, version 4.71 or later. The curent version found on this system is %d.%d.%d. To get the latest version of ComCtl32.dll visit Microsoft's site at:\n\nhttp://www.microsoft.com/msdn/downloads/files/40comupd.htm"), dvi.dwMajorVersion, dvi.dwMinorVersion, dvi.dwBuildNumber); + str.Format(_T("Copyright (c) 1998-99 Kirk Stowell\nmailto:kstowell@codejockeys.com - http://www.codejockeys.com/kstowell/\n\nCode Jockey's CJ60 extension library requires ComCtl32.dll, version 4.71 or later. The curent version found on this system is %d.%d.%d. To get the latest version of ComCtl32.dll visit Microsoft's site at:\n\nhttp://www.microsoft.com/msdn/downloads/files/40comupd.htm"), dvi.dwMajorVersion, dvi.dwMinorVersion, dvi.dwBuildNumber); AfxMessageBox(str, MB_ICONSTOP); return false; } diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp index e332d9888..8279e8de8 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJCaption.cpp @@ -16,7 +16,7 @@ // CJCaption.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp index 1f9b5c5c9..7a72a2594 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJControlBar.cpp @@ -18,7 +18,7 @@ // // DevStudio Style Resizable Docking Control Bar. // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -29,7 +29,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp index 023d1d06b..da3a60aa3 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockBar.cpp @@ -16,7 +16,7 @@ // CJDockBar.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp index fea530dd8..878734f95 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJDockContext.cpp @@ -16,7 +16,7 @@ // CJDockContext.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp index 133b23c41..51884ac18 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJExplorerBar.cpp @@ -16,7 +16,7 @@ // CJExplorerBar.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp index 39fcab1ae..a1c098f8c 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatButton.cpp @@ -16,7 +16,7 @@ // CJFlatButton.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp index a021e7d79..1d3cca12b 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatComboBox.cpp @@ -16,7 +16,7 @@ // CJFlatComboBox.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp index 79ba0568a..4a38124dd 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFlatHeaderCtrl.cpp @@ -16,7 +16,7 @@ // CJFlatHeaderCtrl.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp index 5d2e7450e..9559d2ed2 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJFrameWnd.cpp @@ -16,7 +16,7 @@ // CJFrameWnd.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp index 552e868e4..5986c3fa7 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListCtrl.cpp @@ -16,7 +16,7 @@ // CJListCtrl.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp index 5616cd0ac..8fc49bee3 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJListView.cpp @@ -16,7 +16,7 @@ // CJListView.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp index be37c2506..d5a3ce2c0 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMDIFrameWnd.cpp @@ -16,7 +16,7 @@ // CJMDIFrameWnd.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp index 999e4785d..b31b0e47f 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJMiniDockFrameWnd.cpp @@ -16,7 +16,7 @@ // CJMiniDockFrameWnd.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp index 3ae3d6546..7e5a4cfca 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJOutlookBar.cpp @@ -16,7 +16,7 @@ // CJOutlookBar.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp index 8c43077f2..6b532575d 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJPagerCtrl.cpp @@ -16,7 +16,7 @@ // CJPagerCtrl.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp index f96996399..cc0781ce5 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSearchEdit.cpp @@ -16,7 +16,7 @@ // CJSearchEdit.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp index 0eadce0c2..6696020c1 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJSizeDockBar.cpp @@ -16,7 +16,7 @@ // CJSizeDockBar.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp index 98e278c9a..9b94f6233 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJTabctrlBar.cpp @@ -23,7 +23,7 @@ // mailto:dirk_clemens@hotmail.com // http://www.codeguru.com/docking/sizing_tabctrl_bar.shtml // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -34,7 +34,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp index 1cc9b4cbe..cf405e720 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/CJToolBar.cpp @@ -16,7 +16,7 @@ // CJToolBar.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp index 6659ca4d9..78b2a57db 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/SHFileInfo.cpp @@ -16,7 +16,7 @@ // SHFileInfo.cpp : implementation file // -// Copyright © 1998-99 Kirk Stowell +// Copyright (c) 1998-99 Kirk Stowell // mailto:kstowell@codejockeys.com // http://www.codejockeys.com/kstowell/ // @@ -27,7 +27,7 @@ // notices remain intact. If the source code is used in any commercial // applications then a statement along the lines of: // -// "Portions Copyright © 1998-99 Kirk Stowell" must be included in the +// "Portions Copyright (c) 1998-99 Kirk Stowell" must be included in the // startup banner, "About" box or printed documentation. An email letting // me know that you are using it would be nice as well. That's not much to ask // considering the amount of work that went into this. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp index 3a7ffbf20..b8d27f95e 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/CJ60Lib/hyperlink.cpp @@ -22,7 +22,7 @@ // Copyright (C) 1997, 1998 Chris Maunder // All rights reserved. May not be sold for profit. // -// Thanks to Pål K. Tønder for auto-size and window caption changes. +// Thanks to Pal K. Tonder for auto-size and window caption changes. // // "GotoURL" function by Stuart Patterson // As seen in the August, 1997 Windows Developer's Journal. @@ -297,7 +297,7 @@ BOOL CHyperLink::GetAutoSize() const // then the window is merely shrunk, but if it is centred or right // justified then the window will have to be moved as well. // -// Suggested by Pål K. Tønder +// Suggested by Pal K. Tonder void CHyperLink::PositionWindow() { diff --git a/code/ryzom/client/src/scene_parser.cpp b/code/ryzom/client/src/scene_parser.cpp index 4816459fb..1108f3a19 100644 --- a/code/ryzom/client/src/scene_parser.cpp +++ b/code/ryzom/client/src/scene_parser.cpp @@ -1604,7 +1604,7 @@ void CSceneParser::updateParticlesActor(float difTime, CParticle &particle, UAni return; } - // Matrix 90° + // Matrix 90 degrees CMatrix m90; m90.identity(); m90.rotateZ((float)(Pi/2.0)); diff --git a/code/ryzom/client/src/stage.cpp b/code/ryzom/client/src/stage.cpp index c95b1c0a1..9211f3d6c 100644 --- a/code/ryzom/client/src/stage.cpp +++ b/code/ryzom/client/src/stage.cpp @@ -278,7 +278,7 @@ void CStageSet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) //----------------------------------------------- // removePosWithNoMode : -// Remove ¨Positions except for those with a mode. +// Remove Positions except for those with a mode. //----------------------------------------------- void CStageSet::removePosWithNoMode() { diff --git a/code/ryzom/client/src/stage.h b/code/ryzom/client/src/stage.h index 8f3f1d07e..b86a68cf2 100644 --- a/code/ryzom/client/src/stage.h +++ b/code/ryzom/client/src/stage.h @@ -146,7 +146,7 @@ public: /// Serialize entities. virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); - /// Remove ¨Positions except for those with a mode. + /// Remove Positions except for those with a mode. void removePosWithNoMode(); }; diff --git a/code/ryzom/server/src/ai_service/alias_tree_owner.h b/code/ryzom/server/src/ai_service/alias_tree_owner.h index 0f246a5bd..392a5333a 100644 --- a/code/ryzom/server/src/ai_service/alias_tree_owner.h +++ b/code/ryzom/server/src/ai_service/alias_tree_owner.h @@ -226,7 +226,7 @@ std::string CAliasTreeOwner::getAliasFullName() const if (_AliasTree) return _AliasTree->fullName(); - return getName(); // à upgrader .. + return getName(); // to upgrade... } inline diff --git a/code/ryzom/server/src/ai_service/bot_chat_interface.cpp b/code/ryzom/server/src/ai_service/bot_chat_interface.cpp index ec490c336..4676eac84 100644 --- a/code/ryzom/server/src/ai_service/bot_chat_interface.cpp +++ b/code/ryzom/server/src/ai_service/bot_chat_interface.cpp @@ -18,7 +18,7 @@ #include "stdpch.h" #if 0 -#error "Dêprecated" +#error "Deprecated" //#include "bot_chat_interface.h" #include "game_share/synchronised_message.h" #include "game_share/bot_chat_types.h" diff --git a/code/ryzom/server/src/ai_service/continent.cpp b/code/ryzom/server/src/ai_service/continent.cpp index e009dcf17..4745a19e4 100644 --- a/code/ryzom/server/src/ai_service/continent.cpp +++ b/code/ryzom/server/src/ai_service/continent.cpp @@ -2420,7 +2420,7 @@ bool pathFind(const CNpcZone *const start, const CNpcZone *const end, const CPro if (it == openList.end()) { - //If it isn’t on the open list, add it to the open list. + // If it isn't on the open list, add it to the open list. // Make the current square the parent of this square. // Record the F, G, and H costs of the square. diff --git a/code/ryzom/server/src/ai_service/family_behavior.cpp b/code/ryzom/server/src/ai_service/family_behavior.cpp index 6612d19db..fc0d12a4f 100644 --- a/code/ryzom/server/src/ai_service/family_behavior.cpp +++ b/code/ryzom/server/src/ai_service/family_behavior.cpp @@ -506,9 +506,9 @@ void CFamilyBehavior::update(uint32 nbTicks) const EGSPD::CSeason::TSeason season=CTimeInterface::season(); - if ( seasonisValidForSeason(season) ) - break; // pas de raison de despawner. + break; // no reason to despawn if (!alreadyDespawned) grp->getSpawnObj()->despawnBots(false); // not ok, despawn this group .. diff --git a/code/ryzom/server/src/ai_service/knapsack_solver.cpp b/code/ryzom/server/src/ai_service/knapsack_solver.cpp index 19326ae07..a22477e9c 100644 --- a/code/ryzom/server/src/ai_service/knapsack_solver.cpp +++ b/code/ryzom/server/src/ai_service/knapsack_solver.cpp @@ -77,7 +77,7 @@ void CKnapsackSolver::optimize(float wMax, Algorithm algorithm) } /// Algorithm is taken from http://eleves.ensmp.fr/P00/00rouaul/sacados/sacados_swp.html -/// This algorithm complexity is O(N²) +/// This algorithm complexity is O(N^2) void CKnapsackSolver::optimizeOptimal() { H_AUTO(CKnapsackSolver_optimizeOptimal); @@ -187,7 +187,7 @@ void CKnapsackSolver::optimizeFastAddCheck() } /// First try FullAddCheck, then try to replace the already taken elements with not taken ones. -/// This algorithm complexity is Theta(N²) +/// This algorithm complexity is Theta(N^2) void CKnapsackSolver::optimizeFullSingleReplace() { optimizeFullAddCheck(); @@ -231,7 +231,7 @@ void CKnapsackSolver::optimizeFullSingleReplace() /// First try FastAddCheck, and if it fails optimizing try to replace a not /// taken one with an already taken element (the worst one) until a /// replacement occurs. -/// This algorithm complexity is Theta(N²) and O(N²) for CTargetable +/// This algorithm complexity is Theta(N^2) and O(N^2) for CTargetable void CKnapsackSolver::optimizeSingleReplace() { float vBest = _VBest; @@ -278,7 +278,7 @@ void CKnapsackSolver::optimizeSingleReplace() /// First try FastAddCheck, and if it fails optimizing try to replace the /// first not taken element with an already taken element (the worst one). -/// This algorithm complexity is O(N²) and Theta(N) for CTargetable +/// This algorithm complexity is O(N^2) and Theta(N) for CTargetable void CKnapsackSolver::optimizeFastSingleReplace() { float vBest = _VBest; @@ -326,7 +326,7 @@ void CKnapsackSolver::optimizeFastSingleReplace() /// First try FastAddCheck, and if it fails optimizing try to replace the /// first not taken element with an already taken one (the first worst that /// the not taken one). -/// This algorithm complexity is O(N²) and O(N) for CTargetable +/// This algorithm complexity is O(N^2) and O(N) for CTargetable void CKnapsackSolver::optimizeVeryFastSingleReplace() { float vBest = _VBest; diff --git a/code/ryzom/server/src/ai_service/nf_static.cpp b/code/ryzom/server/src/ai_service/nf_static.cpp index 4be676789..cbdebfba4 100644 --- a/code/ryzom/server/src/ai_service/nf_static.cpp +++ b/code/ryzom/server/src/ai_service/nf_static.cpp @@ -981,7 +981,7 @@ Arguments: s(phraseName),s(phraseContent) -> @param[in] phraseContent is the text associated with the phrase @code -()setSimplePhrase("HELLO", "Salut, ca va ?"); // équivalent à "HELLO(){[Salut, ca va ?]}" +()setSimplePhrase("HELLO", "Hi, how are you?"); // equivalent to "HELLO(){[Hi, how are you?]}" @endcode */ diff --git a/code/ryzom/server/src/ai_service/path_behaviors.cpp b/code/ryzom/server/src/ai_service/path_behaviors.cpp index ae89d9a5c..41d37f704 100644 --- a/code/ryzom/server/src/ai_service/path_behaviors.cpp +++ b/code/ryzom/server/src/ai_service/path_behaviors.cpp @@ -419,7 +419,7 @@ reStartFollowTopo: bool idealIsValid = true; - if (absDeltaIdealAngle>(32768*67.5/180)) // /*97*/ si un peu plus de 95 degrés de difference. + if (absDeltaIdealAngle>(32768*67.5/180)) // /*97*/ if a difference of slightly more than 95 degrees. { idealIsValid = false; } diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp index 8f4b188ee..7fb49008f 100644 --- a/code/ryzom/server/src/ai_service/script_compiler.cpp +++ b/code/ryzom/server/src/ai_service/script_compiler.cpp @@ -42,7 +42,7 @@ using namespace NLMISC; ////////////////////////////////////////////////////////////////////////// // A Small Custom Compiler For AI. // (Token and Grammar are Upgradable, Error returns have to be upgraded). -// Ask to Stéphane Le Dorze for Explanations. +// Ask to Stephane Le Dorze for Explanations. ////////////////////////////////////////////////////////////////////////// namespace AICOMP diff --git a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp index 54b3142cf..1921d43f0 100644 --- a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp +++ b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp @@ -93,7 +93,7 @@ print("Ma position est ", x, ":", y); You can dynamically define function on the group. This function are called script function or user function -(as opposed to the hard coded ‘native function’). +(as opposed to the hard coded "native function"). User functions don't have parameters. @@ -120,7 +120,7 @@ E.g.: mavar =(5*mavar+1)/3; @endcode Note that the negative operator should be used with caution, YOU MUST add a -space after the ‘-‘ symbol. +space after the "-" symbol. You can do comparison with variables and or numbers (can be used for if and while statements). Note that you can't do mathematical computation inside the diff --git a/code/ryzom/server/src/ai_service/script_vm.cpp b/code/ryzom/server/src/ai_service/script_vm.cpp index 52350cf4c..14d0fc933 100644 --- a/code/ryzom/server/src/ai_service/script_vm.cpp +++ b/code/ryzom/server/src/ai_service/script_vm.cpp @@ -1052,7 +1052,7 @@ void CScriptVM::interpretCode( } continue; } - nlassert(false); // must use continue !! Non implementé. + nlassert(false); // must use continue !! Not implemented. } } diff --git a/code/ryzom/server/src/ai_share/world_map.h b/code/ryzom/server/src/ai_share/world_map.h index 070253af2..48dcfee77 100644 --- a/code/ryzom/server/src/ai_share/world_map.h +++ b/code/ryzom/server/src/ai_share/world_map.h @@ -139,7 +139,7 @@ CSlot const& CSlot::operator ++() * \date 2003 */ class CCellLinkage -// passer les paramètres de CCellLinkage en références. (quand meme) et enlever les tests de validité. (grosse mise à jour en perspective). +// pass CCellLinkage parameters by references. (anyway) and remove validation checks. (big update to come). { public: enum diff --git a/code/ryzom/server/src/entities_game_service/client_messages.cpp b/code/ryzom/server/src/entities_game_service/client_messages.cpp index 239f3da4e..6807b6cc8 100644 --- a/code/ryzom/server/src/entities_game_service/client_messages.cpp +++ b/code/ryzom/server/src/entities_game_service/client_messages.cpp @@ -2415,7 +2415,7 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET: msgin.serial( id,opt ); const std::vector * gms = NULL; - // Make sure opt is not like "A(c)" for "é" + // Make sure opt is not like "A(c)" for e acute ucstring ucopt; ucopt.fromUtf8(opt); opt = ucopt.toString(); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp index 4ccde62da..92356286a 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp @@ -318,7 +318,7 @@ void CStaticBrick::readStaticBrick( const NLGEORGES::UFormElm &root, const NLMIS isAIBrick = true; } - /// TODO : converti les strings de paramètres en minuscules à la lecture + /// TODO : convert parameters strings in lowercase when reading // FamilyId //if( root.getValueByName (value, "Basics.FamilyId") ) diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h index 0535bb572..99ebae0dc 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h @@ -776,7 +776,7 @@ public: /** * remove an effect on this entity. The effect is not deleted. * \param effect the effect to remove - * \param activateSpleepîngEffect activate or not sleeping effects of the same family, default = true, only false when clearing all effects + * \param activateSpleepingEffect activate or not sleeping effects of the same family, default = true, only false when clearing all effects * \return true if no other effect of this family is active, false otherwise */ virtual bool removeSabrinaEffect( CSEffect *effect, bool activateSleepingEffect = true ); diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp index 6e7ad5d55..4005974ed 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp @@ -250,8 +250,8 @@ void CMissionStepQueueEnd::onActivation(CMission* inst,uint32 stepIndex, std::li inst->setCriticalPartEndDate(0); } - // dès que ce step est actif il doit etre validé et on passe a la suite - //->genere un event qui valide ce step + // as soon as this step is activated, it must be validated and we go to the next + //->generate an event that validates this step CMissionEventQueueExit *event = new CMissionEventQueueExit(); if (event != NULL) eventList.push_back(event); diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h index 64b6c893d..f08cf4fe2 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h @@ -35,7 +35,7 @@ * \author Nicolas Brigand * \author Olivier Cado * \author Sebastien Guignot - * \author Jérôme Vuarand + * \author Jerome Vuarand * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h index 15e2040fd..f82afae38 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h @@ -26,7 +26,7 @@ * \author Nicolas Brigand * \author Olivier Cado * \author Sebastien Guignot - * \author Jérôme Vuarand + * \author Jerome Vuarand * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.cpp index babce8145..fbb16a296 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.cpp @@ -736,7 +736,7 @@ uint CFgProspectionPhrase::generateSources( CCharacter *player ) pos.z = 0; // to keep consistency with deposit maps bool fromNeighbourhood; fromNeighbourhood = (_ForageRange < 3.0f); - if ( (_ForageRange < 3.0f) && (_ForageAngle < 0.35) ) // <21° + if ( (_ForageRange < 3.0f) && (_ForageAngle < 0.35) ) // <21 degrees _NbAttempts = 1; // Get weather diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_attack.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_attack.cpp index 92b001aaa..368f5f143 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_attack.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_attack.cpp @@ -621,10 +621,10 @@ void CMagicActionBasicDamage::launch( H_AUTO(CMagicActionBasicDamage_launch); ///\todo nico: - // - localisation - // - armure + bouclier - // - degâts sur perso + sur armure - // - behaviour + messages de chat + // - location + // - armor + shield + // - player damages + on armor + // - behaviour + chat messages // - aggro if ( successFactor <= 0.0f ) diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_debuff.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_debuff.cpp index bcd249973..05987a4f6 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_debuff.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_debuff.cpp @@ -86,10 +86,10 @@ protected: { NL_ALLOC_CONTEXT(MADSAPY); ///\todo nico: - // - localisation - // - armure + bouclier - // - degâts sur perso + sur armure - // - behaviour + messages de chat + // - location + // - armor + shield + // - player damages + on armor + // - behaviour + chat messages // - aggro /// test resistance diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_dot.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_dot.cpp index 895e733aa..8b9649730 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_dot.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/magic_action_dot.cpp @@ -176,10 +176,10 @@ protected: return; ///\todo nico: - // - localisation - // - armure + bouclier - // - degâts sur perso + sur armure - // - behaviour + messages de chat + // - location + // - armor + shield + // - player damages + on armor + // - behaviour + chat messages // - aggro if ( successFactor <= 0.0f ) diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h index a75f152b6..bb16436e9 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h @@ -25,7 +25,7 @@ /** * Database Node which contains a set of properties - * \author Stéphane Coutelas, Olivier Cado + * \author Stephane Coutelas, Olivier Cado * \author Nevrax France * \date 2002, 2003 */ diff --git a/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp b/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp index b84b1634a..305adb992 100644 --- a/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp +++ b/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp @@ -858,13 +858,13 @@ void CDistancePrioritizer::arbitrateForageSourceDiscreetProperties(const CPrope inline void CDistancePrioritizer::arbitrateCommonPosAndMode(const CPropertyHistory::CEntityEntry& entry) { // Position if changed enough (if not carried by mode) - // Orientation if changed > 60° (it's head angle only) or in first block (useful for static entities such as bot objects) + // Orientation if changed > 60 degrees (it's head angle only) or in first block (useful for static entities such as bot objects) bool modeIsChanging = GET_VP_NODE(MODE)->BranchHasPayload; bool sheetIsChanging = GET_VP_NODE(SHEET)->BranchHasPayload; bool posIsReady = TVPNodeServer::PrioContext.Sentity->positionIsInitialized(); GET_VP_NODE(POSITION)->BranchHasPayload = (!modeIsChanging) && posIsReady && positionHasChangedEnough(); - GET_VP_NODE(ORIENTATION)->BranchHasPayload = (sheetIsChanging && posIsReady) || orientationHasChangedEnough( entry.Properties[PROPERTY_ORIENTATION], 36.0f ); // 5° + GET_VP_NODE(ORIENTATION)->BranchHasPayload = (sheetIsChanging && posIsReady) || orientationHasChangedEnough( entry.Properties[PROPERTY_ORIENTATION], 36.0f ); // 5 degrees } /* diff --git a/code/ryzom/server/src/input_output_service/string_manager.cpp b/code/ryzom/server/src/input_output_service/string_manager.cpp index f7e966188..04a5f504d 100644 --- a/code/ryzom/server/src/input_output_service/string_manager.cpp +++ b/code/ryzom/server/src/input_output_service/string_manager.cpp @@ -729,7 +729,7 @@ void CStringManager::broadcastSystemMessage(NLNET::CMessage &message, bool debug // { // // In ring shard, it is possible that the client autologin and // // autochoose the character rapidly, and if a string need to be resolved -// // to dîsplay the char summary, it is possible client receive the +// // to display the char summary, it is possible client receive the // // dynamic string from IOS after the EGS has passed the frontend in // // entityId mode. // // So, the IOS receive a stringId request with a Eid not registered yet. diff --git a/code/ryzom/server/src/logger_service/logger_service.cpp b/code/ryzom/server/src/logger_service/logger_service.cpp index e8f7a20ab..245fe4c89 100644 --- a/code/ryzom/server/src/logger_service/logger_service.cpp +++ b/code/ryzom/server/src/logger_service/logger_service.cpp @@ -1707,7 +1707,7 @@ endQuery: li.setTimeStamp(CTime::getSecondsSince1970()-20); li.getParams().push_back(TParamValue(CEntityId(0, 0x1234))); li.getParams().push_back(TParamValue(CEntityId(0, 0x5678))); - li.getParams().push_back(TParamValue(string("Hô mon bateau"))); + li.getParams().push_back(TParamValue(string("Ho mon bateau"))); reportLog(NULL, vector(&li, &li+1)); } diff --git a/code/ryzom/server/src/sabrina/combat_attacker.cpp b/code/ryzom/server/src/sabrina/combat_attacker.cpp index 772f39dbc..1b674ee29 100644 --- a/code/ryzom/server/src/sabrina/combat_attacker.cpp +++ b/code/ryzom/server/src/sabrina/combat_attacker.cpp @@ -34,7 +34,7 @@ NLMISC_COMMAND(UseWeaponDamageFactorModifier,"toggle the use of the item damage return true; } -//--------------------------------------------------------------² +//-------------------------------------------------------------- // CCombatWeapon constructor //-------------------------------------------------------------- CCombatWeapon::CCombatWeapon(CGameItemPtr itemPtr) diff --git a/code/ryzom/server/src/sabrina/magic_action_attack.cpp b/code/ryzom/server/src/sabrina/magic_action_attack.cpp index 04fda991e..53c19c155 100644 --- a/code/ryzom/server/src/sabrina/magic_action_attack.cpp +++ b/code/ryzom/server/src/sabrina/magic_action_attack.cpp @@ -85,10 +85,10 @@ protected: virtual void apply( CMagicPhrase * phrase, float successFactor,MBEHAV::CBehaviour & behav , bool isMad ) { ///\todo nico: - // - localisation - // - armure + bouclier - // - degâts sur perso + sur armure - // - behaviour + messages de chat + // - location + // - armor + shield + // - player damages + on armor + // - behaviour + chat messages // - aggro CEntityBase* actor = CEntityBaseManager::getEntityBasePtr( phrase->getActor() ); diff --git a/code/ryzom/server/src/sabrina/magic_action_debuff.cpp b/code/ryzom/server/src/sabrina/magic_action_debuff.cpp index b5ee4904f..c9f5542f3 100644 --- a/code/ryzom/server/src/sabrina/magic_action_debuff.cpp +++ b/code/ryzom/server/src/sabrina/magic_action_debuff.cpp @@ -80,10 +80,10 @@ protected: virtual void apply( CMagicPhrase * phrase, float successFactor,MBEHAV::CBehaviour & behav ) { ///\todo nico: - // - localisation - // - armure + bouclier - // - degâts sur perso + sur armure - // - behaviour + messages de chat + // - location + // - armor + shield + // - player damages + on armor + // - behaviour + chat messages // - aggro /// test resistance diff --git a/code/ryzom/server/src/sabrina/magic_action_dot.cpp b/code/ryzom/server/src/sabrina/magic_action_dot.cpp index 61f68c53e..6116784bf 100644 --- a/code/ryzom/server/src/sabrina/magic_action_dot.cpp +++ b/code/ryzom/server/src/sabrina/magic_action_dot.cpp @@ -100,10 +100,10 @@ protected: return; ///\todo nico: - // - localisation - // - armure + bouclier - // - degâts sur perso + sur armure - // - behaviour + messages de chat + // - location + // - armor + shield + // - player damages + on armor + // - behaviour + chat messages // - aggro if ( successFactor <= 0.0f ) diff --git a/code/ryzom/server/src/testing_tool_service/testing_tool_service.cpp b/code/ryzom/server/src/testing_tool_service/testing_tool_service.cpp index d4f1da1de..b81886a47 100644 --- a/code/ryzom/server/src/testing_tool_service/testing_tool_service.cpp +++ b/code/ryzom/server/src/testing_tool_service/testing_tool_service.cpp @@ -331,7 +331,7 @@ void CTestingTool::startTest() CUnifiedNetwork::getInstance()->send( "EGS", msgout ); _ActorsDeathFlags.set(i,false); } - string s = string("\n*********** Starting test iteration N°") + toString( _CurrentIteration ) + string("\n"); + string s = string("\n*********** Starting test iteration ") + toString( _CurrentIteration ) + string("\n"); fputs( s.c_str(), _TestSessionReport ); nlinfo( s.c_str() ); diff --git a/code/ryzom/tools/leveldesign/georges_convert/form.h b/code/ryzom/tools/leveldesign/georges_convert/form.h index 6a9718c8e..ceae35c05 100644 --- a/code/ryzom/tools/leveldesign/georges_convert/form.h +++ b/code/ryzom/tools/leveldesign/georges_convert/form.h @@ -26,9 +26,9 @@ namespace NLOLDGEORGES class CFormBodyElt; -// La classe CForm représente une fiche. -// Elle comprend Head et Body. -// Elle comporte des opérateurs qui permettent de l'additionner ou de la soustraire dans le cadre des historiques. +// CForm class represents a sheet. +// It has a Head and a Body. +// It has operators that allows to add or subtract from history. class CForm { public: diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h b/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h index 65c24273a..d001f6668 100644 --- a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h +++ b/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_atom.h @@ -25,8 +25,8 @@ namespace NLOLDGEORGES { -// La classe CFormBodyEltAtom représente l'élément terminal de l'arbre. -// Il est composé de deux string: sxname et sxvalue +// CFormBodyEltAtom class represents terminal item from the tree. +// It's composited from two strings: sxname and sxvalue class CFormBodyEltAtom : public CFormBodyElt { public: diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h b/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h index cc96ecab4..fdf193e52 100644 --- a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h +++ b/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_list.h @@ -25,8 +25,8 @@ namespace NLOLDGEORGES { -// La classe CFormBodyEltList permet d'obtenir un ensemble de CFormBodyElt sous forme de liste. -// Dans l'opérateur +=, l'ensemble des anciens éléments sont éliminés. Les nouveaux les remplacent. +// CFormBodyEltList provides a set of CFormBodyElt in a list form. +// In operator +=, set of old items are removed. New ones replace them. class CFormBodyEltList : public CFormBodyElt { public: diff --git a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h b/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h index d661a36a0..e736bf8b6 100644 --- a/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h +++ b/code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.h @@ -26,8 +26,8 @@ namespace NLOLDGEORGES #define SXCOMMENT "Comment" #define SXPARENTS "Parents" -// La classe CFormBodyEltStruct permet d'obtenir un ensemble de CFormBodyElt. -// Dans l'opérateur +=, les nouveaux élément remplacent les anciens, les anciens non-écrasés restent +// CFormBodyEltStruct provides a set of CFormBodyElt. +// In operator +=, new items replace old ones, not overrided old ones are kept. class CFormBodyEltStruct : public CFormBodyElt { public: diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp b/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp index 9a938eb7c..5ef070cfe 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp @@ -300,7 +300,7 @@ void CSoundPlugin::updateDisplay() } else { - setMinMaxDistances(1, _Sound->getMaxDistance()); // 1m à max dist. + setMinMaxDistances(1, _Sound->getMaxDistance()); // 1m to max dist. } _Dialog.setAngles(uint32(180 * _Sound->getConeInnerAngle() / Pi), uint32(180 * _Sound->getConeOuterAngle() / Pi)); } @@ -433,7 +433,7 @@ void CSoundPlugin::setActiveDocument(IEditDocument *pdoc) } else { - setMinMaxDistances(1, _Sound->getMaxDistance()); // 1m à max dist. + setMinMaxDistances(1, _Sound->getMaxDistance()); // 1m to max dist. } _Dialog.setAngles(uint32(180 * _Sound->getConeInnerAngle() / Pi), uint32(180 * _Sound->getConeOuterAngle() / Pi)); if (!_InvalidSound) diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp index 20e957859..4fdd68869 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp @@ -223,7 +223,7 @@ GenderExtractor::GenderExtractor(const std::string & literal, const std::string& { std::string goodMarkup = isMale ? std::string("") +"<" + h + ">" : std::string("")+"<"+f+">"; std::string badMarkup = isFemale ? std::string("") +"<" + h + ">" : std::string("")+"<"+f+">"; - std::string exceptionText = std::string("La phrase ") + identifier + " qui contient une balise " + goodMarkup + " nécessite aussi les balises " + badMarkup + " même vide."; + std::string exceptionText = std::string("Expression ") + identifier + " that contains a tag " + goodMarkup + " needs also tags " + badMarkup + " even empty."; throw EParseException(0, exceptionText.c_str()); } diff --git a/code/ryzom/tools/leveldesign/mp_generator/moulinette.h b/code/ryzom/tools/leveldesign/mp_generator/moulinette.h index 7c6eae753..adbcd2328 100644 --- a/code/ryzom/tools/leveldesign/mp_generator/moulinette.h +++ b/code/ryzom/tools/leveldesign/mp_generator/moulinette.h @@ -44,16 +44,14 @@ enum // You'll have to look deeper into code }; -// Contient la description d'une Craft Part -// ainsi que les différentes caracteristiques -// qu'elle concerne +// Contains Craft Part description and different stats related struct CraftPart { CSString Desc; bool Carac[NumMPStats]; }; -// Caractéristiques d'une MP relatives au craft +// Raw mats stats for craft struct MPCraftStats { CSString Craft; @@ -72,7 +70,7 @@ struct MPCraftStats } }; -// Permet de trier des chaines de caractères +// Allows to sort strings struct ItemSort : public std::less { bool operator()( const NLMISC::CSString& x, const NLMISC::CSString& y ) const @@ -82,8 +80,7 @@ struct ItemSort : public std::less }; typedef set CSortedStringSet; -// Decrit un des items générés -// pour une MP de créature +// Describe a item generated for a creature raw mat struct CreatureMPItem { char eco; diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp index 608702b18..494641040 100644 --- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp @@ -1694,7 +1694,7 @@ void CExport::transformZone (CZone &zeZone, sint32 nPosX, sint32 nPosY, uint8 nR //============================= // Rotate all tile elements in CW (because zones are turned in CCW) - // If zone flipped rotate tile elements by 180° + // If zone flipped rotate tile elements by 180 degrees set allnames; // Debug for (i = 0; i < PatchInfos.size(); ++i) { diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp index 3cf2a00b7..e14b56ad6 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp @@ -17,16 +17,16 @@ /* Petite documentation sur le fonctionnement du plugin -1) Le WorldEditor se connecte au plugin (config dans WorldEditorPlugin.cfg) +1) WorldEditor connects to plugin (config in WorldEditorPlugin.cfg) -2) Le plugin se connecte au World_Editor_Service +2) Plugin connects to World_Editor_Service -3) Le World_Editor_Service (config dans WorldEditorService.cfg) envoie des paquets contenant au maximum 100 joueurs. -Ces joueurs sont soit nouveaux, soit leurs coordonnées ont changé. +3) World_Editor_Service (config in WorldEditorService.cfg) sends packets containing up to 100 players. +These players are new or their coordinates changed. -4) Les informations des joueurs sont envoyées (voir onIdle) sous forme de primitives "player": +4) Players information are sent (see onIdle) as "player" primitives: -Voici la définition de la primitive "player", dans WORLD_EDITOR_SCRIPT.XML +See "player" primitive definition in WORLD_EDITOR_SCRIPT.XML diff --git a/code/ryzom/tools/sheet_random_generator/sheet_random_generator.cpp b/code/ryzom/tools/sheet_random_generator/sheet_random_generator.cpp index fd139a55a..68a6bff3f 100644 --- a/code/ryzom/tools/sheet_random_generator/sheet_random_generator.cpp +++ b/code/ryzom/tools/sheet_random_generator/sheet_random_generator.cpp @@ -3865,7 +3865,7 @@ int main(int argc, char* argv[]) } -// Impossible to insert game_share/protection_type.h into project because of #@&$£ precompiled headers +// Impossible to insert game_share/protection_type.h into project because of precompiled headers namespace PROTECTION_TYPE { NL_BEGIN_STRING_CONVERSION_TABLE (TProtectionType) diff --git a/code/ryzom/tools/sheet_random_generator/srg_utilities.h b/code/ryzom/tools/sheet_random_generator/srg_utilities.h index 9aabc645a..c4abce34b 100644 --- a/code/ryzom/tools/sheet_random_generator/srg_utilities.h +++ b/code/ryzom/tools/sheet_random_generator/srg_utilities.h @@ -639,7 +639,7 @@ void CFaberCharacteristics::calcQualitativeValues() if ( ActualEnergy > 1.0f ) ActualEnergy = 1.0f; - // Calculate the standard deviation (SQRT(SUM((Ai-Aavg)²)/N)) + // Calculate the standard deviation (SQRT(SUM((Ai-Aavg)^2)/N)) float varianceSum = 0.0f; for ( uint r=0; r!=NbCharacs; ++r ) {