diff --git a/code/nel/include/nel/3d/driver.h b/code/nel/include/nel/3d/driver.h index a4957f8ce..2396d9d62 100644 --- a/code/nel/include/nel/3d/driver.h +++ b/code/nel/include/nel/3d/driver.h @@ -69,7 +69,7 @@ struct IOcclusionQuery; -//**************************************************************************** +// **************************************************************************** /// A Graphic Mode descriptor. struct GfxMode { @@ -94,17 +94,17 @@ struct GfxMode GfxMode(uint16 w, uint16 h, uint8 d, bool windowed = true, bool offscreen = false, uint frequency = 0, sint8 aa = -1); }; -//**************************************************************************** +// **************************************************************************** // Exceptions. struct EBadDisplay : public NLMISC::Exception { EBadDisplay(const std::string &reason) : Exception(reason) { } }; -//**************************************************************************** +// **************************************************************************** typedef void (*emptyProc)(void); -//**************************************************************************** +// **************************************************************************** // *** IMPORTANT ******************** // *** IF YOU MODIFY THE STRUCTURE OF THIS CLASS, PLEASE INCREMENT IDriver::InterfaceVersion TO INVALIDATE OLD DRIVER DLL // ********************************** diff --git a/code/nel/include/nel/3d/init_3d.h b/code/nel/include/nel/3d/init_3d.h index a24dd12be..0a61f36d4 100644 --- a/code/nel/include/nel/3d/init_3d.h +++ b/code/nel/include/nel/3d/init_3d.h @@ -22,7 +22,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** /** * Startup initialisation. * \author Cyril Corvazier diff --git a/code/nel/include/nel/3d/landscape_user.h b/code/nel/include/nel/3d/landscape_user.h index ca5fdf398..68b65c565 100644 --- a/code/nel/include/nel/3d/landscape_user.h +++ b/code/nel/include/nel/3d/landscape_user.h @@ -28,7 +28,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** /** * ULandscape Implementation * \author Lionel Berenguier diff --git a/code/nel/include/nel/3d/particle_system.h b/code/nel/include/nel/3d/particle_system.h index e22bd20b9..4769a7365 100644 --- a/code/nel/include/nel/3d/particle_system.h +++ b/code/nel/include/nel/3d/particle_system.h @@ -75,7 +75,7 @@ public: // the pass that is applied on particles enum TPass { Anim, SolidRender, BlendRender, ToolRender }; public: - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Object //@{ @@ -98,7 +98,7 @@ public: // CParticleSystem *clone(CPSCopyHelper *ch = NULL) ; //@} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Sharing system //@{ @@ -116,7 +116,7 @@ public: bool isSharingEnabled() const { return _Sharing; } //@} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Driver setup //@{ @@ -126,7 +126,7 @@ public: /// return the driver that will be used for rendering IDriver *getDriver(void) { return _Driver; } //@} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Scene setup //@{ @@ -139,7 +139,7 @@ public: CScene *getScene() const { return _Scene; } //@} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Position of the system //@{ @@ -209,7 +209,7 @@ public: //@} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Execution of the system //@{ @@ -228,7 +228,7 @@ public: /// used for benchs. must be reset by the user static uint32 NbParticlesDrawn; - //***************************************************************************************************** + // ***************************************************************************************************** /**\name Process attachment. Most process are located : set of objects of the same type that have a position * in space @@ -287,7 +287,7 @@ public: //@} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Date / Time //@{ @@ -309,7 +309,7 @@ public: } //@} - //***************************************************************************************************** + // ***************************************************************************************************** /**\name User parameters. They may be or not used by the system. Their meaning is defined during the construction * of the system @@ -377,7 +377,7 @@ public: - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Edition methods : provides some tools for an external editor // @{ @@ -430,7 +430,7 @@ public: /// Get the name of the system. std::string getName(void) const { return _Name; } - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Transparency / opacity // @{ @@ -441,7 +441,7 @@ public: bool hasTransparentObjects(void) const; // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Lighting // @{ @@ -449,7 +449,7 @@ public: bool hasLightableObjects() const; // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Integration parameters // @{ @@ -546,7 +546,7 @@ public: // @} - //***************************************************************************************************** + // ***************************************************************************************************** /**\name LOD managment. LOD, when used can be performed in 2 ways : * - Hand tuned LOD (for emission, color, size : this uses LOD as an input for attribute makers). @@ -680,7 +680,7 @@ public: NLMISC::CRGBA getLightingColor() const { return _LightingColor; } // @} - //***************************************************************************************************** + // ***************************************************************************************************** // \name Load balancing // @{ @@ -702,7 +702,7 @@ public: void enableLoadBalancing(bool enabled = true); // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Bounding box managment // @{ @@ -741,7 +741,7 @@ public: void getLastComputedBBox(NLMISC::CAABBox &dest) { dest = _PreComputedBBox; } // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Invalidity flags (no direct effect, just indications for a third party, a model holding the system for example) // @{ @@ -929,7 +929,7 @@ public: // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name sound managment // @{ /// register a Sound server to this system. All systems share the same sound server. @@ -950,7 +950,7 @@ public: // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name external access to locatedBindable. PRIVATE PART (to avoid the use of friend) // @{ /** register a locatedBindable, and allow it to be referenced by the given ID @@ -963,7 +963,7 @@ public: void unregisterLocatedBindableExternID(CPSLocatedBindable *lb); // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name external access to locatedBindable. PUBLIC PART // @{ /// return the number the number of located bindable bound with this ID @@ -983,7 +983,7 @@ public: void getIDs(std::vector &dest) const; // @} - //***************************************************************************************************** + // ***************************************************************************************************** ///\name Misc. options / functions // @{ /** When using an emitter, it is allowed to have a period of '0'. This special value means that the emitter diff --git a/code/nel/include/nel/3d/primitive_profile.h b/code/nel/include/nel/3d/primitive_profile.h index d62cf926a..c385c150b 100644 --- a/code/nel/include/nel/3d/primitive_profile.h +++ b/code/nel/include/nel/3d/primitive_profile.h @@ -23,7 +23,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** /** * A Primitive counter. * \author Lionel Berenguier diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h index 9f90eb32d..c25c051a5 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h @@ -107,13 +107,13 @@ inline NLMISC::CRGBA PSBinOpSubtract(NLMISC::CRGBA t1, NLMISC::CRGBA t2) ///////////////////////////////////////////////////////////////////////////// // CPSAttribMakerBinOp specializations to return the correct min/max value // ///////////////////////////////////////////////////////////////////////////// -//************************************************************************************************************* +// ************************************************************************************************************* /** template specialization implementations * They're useful to get the correct min / max values depending on the type */ -//*********************************************************************** +// *********************************************************************** template <> inline uint32 CPSAttribMakerBinOp::getMinValue(void) const { @@ -138,7 +138,7 @@ inline uint32 CPSAttribMakerBinOp::getMinValue(void) const return 0; } -//*********************************************************************** +// *********************************************************************** template <> inline uint32 CPSAttribMakerBinOp::getMaxValue(void) const { @@ -163,7 +163,7 @@ inline uint32 CPSAttribMakerBinOp::getMaxValue(void) const return 0; } -//*********************************************************************** +// *********************************************************************** template <> inline sint32 CPSAttribMakerBinOp::getMinValue(void) const { @@ -190,7 +190,7 @@ inline sint32 CPSAttribMakerBinOp::getMinValue(void) const return 0; } -//*********************************************************************** +// *********************************************************************** template <> inline sint32 CPSAttribMakerBinOp::getMaxValue(void) const { @@ -217,7 +217,7 @@ inline sint32 CPSAttribMakerBinOp::getMaxValue(void) const return 0; } -//*********************************************************************** +// *********************************************************************** template <> inline float CPSAttribMakerBinOp::getMinValue(void) const { @@ -244,7 +244,7 @@ inline float CPSAttribMakerBinOp::getMinValue(void) const return 0; } -//*********************************************************************** +// *********************************************************************** template <> inline float CPSAttribMakerBinOp::getMaxValue(void) const { diff --git a/code/nel/include/nel/3d/ps_located.h b/code/nel/include/nel/3d/ps_located.h index cc6106897..990e608b1 100644 --- a/code/nel/include/nel/3d/ps_located.h +++ b/code/nel/include/nel/3d/ps_located.h @@ -700,9 +700,9 @@ public: /////////////////////////////////////// -//****************************************************************************************** -//****************************************************************************************** -//****************************************************************************************** +// ****************************************************************************************** +// ****************************************************************************************** +// ****************************************************************************************** @@ -953,9 +953,9 @@ inline bool operator<(const CPSLocatedBindable &lhs, const CPSLocatedBindable &r -//****************************************************************************************** -//****************************************************************************************** -//****************************************************************************************** +// ****************************************************************************************** +// ****************************************************************************************** +// ****************************************************************************************** /** This class is a located bindable that can focus on several target @@ -1030,7 +1030,7 @@ protected: // INLINES // ///////////// -//***************************************************************************************************** +// ***************************************************************************************************** inline const NLMISC::CMatrix &CPSLocated::getConversionMatrix(const CPSLocated *A,const CPSLocated *B) { nlassert(A); @@ -1041,7 +1041,7 @@ inline const NLMISC::CMatrix &CPSLocated::getConversionMatrix(const CPSLocated * return getConversionMatrix(*ps, A->getMatrixMode(), B->getMatrixMode()); } -//***************************************************************************************************** +// ***************************************************************************************************** inline TAnimationTime CPSLocated::getAgeInSeconds(uint elementIndex) const { nlassert(elementIndex < _Size); @@ -1050,14 +1050,14 @@ inline TAnimationTime CPSLocated::getAgeInSeconds(uint elementIndex) const return _Time[elementIndex] * _InitialLife; } -//***************************************************************************************************** +// ***************************************************************************************************** inline void CPSLocated::computeParametricPos(float date, uint indexInLocated, NLMISC::CVector &dest) const { integrateSingle(date, 1.f, 1, indexInLocated, &dest); } -//***************************************************************************************************** +// ***************************************************************************************************** inline const NLMISC::CMatrix &CPSLocatedBindable::getLocalToWorldMatrix() const { nlassert(_Owner); diff --git a/code/nel/include/nel/3d/register_3d.h b/code/nel/include/nel/3d/register_3d.h index e4c5ecb13..eb89168d8 100644 --- a/code/nel/include/nel/3d/register_3d.h +++ b/code/nel/include/nel/3d/register_3d.h @@ -24,7 +24,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** /** * This global function register all Serialisable Polymorphic 3D classes. * \author Lionel Berenguier diff --git a/code/nel/include/nel/3d/texture.h b/code/nel/include/nel/3d/texture.h index 2c4e80602..60222f687 100644 --- a/code/nel/include/nel/3d/texture.h +++ b/code/nel/include/nel/3d/texture.h @@ -39,7 +39,7 @@ using NLMISC::CBitmap; class IDriver; -//**************************************************************************** +// **************************************************************************** // List typedef. class ITextureDrvInfos; @@ -89,7 +89,7 @@ public: }; -//**************************************************************************** +// **************************************************************************** /** * Interface for textures * @@ -405,7 +405,7 @@ public: // get the texture category CTextureCategory *getTextureCategory() const {return _TextureCategory;} -//**************************** +// **************************** // Private part. protected: // Derived texture should set it to true when they are updated. diff --git a/code/nel/include/nel/3d/texture_cube.h b/code/nel/include/nel/3d/texture_cube.h index b87a3e10c..6d68f4202 100644 --- a/code/nel/include/nel/3d/texture_cube.h +++ b/code/nel/include/nel/3d/texture_cube.h @@ -25,7 +25,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** /** * CTextureCube * \author Matthieu Besson diff --git a/code/nel/include/nel/3d/texture_file.h b/code/nel/include/nel/3d/texture_file.h index 62a8672bd..d4ef43e24 100644 --- a/code/nel/include/nel/3d/texture_file.h +++ b/code/nel/include/nel/3d/texture_file.h @@ -25,7 +25,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** /** * CTextureFile * \author Stephane Coutelas diff --git a/code/nel/include/nel/3d/texture_font.h b/code/nel/include/nel/3d/texture_font.h index 934879543..d20bd516a 100644 --- a/code/nel/include/nel/3d/texture_font.h +++ b/code/nel/include/nel/3d/texture_font.h @@ -28,7 +28,7 @@ class CFontGenerator; #define TEXTUREFONT_NBCATEGORY 5 // Config 1 //#define TEXTUREFONT_NBCATEGORY 4 -//**************************************************************************** +// **************************************************************************** /** * CTextureFont */ diff --git a/code/nel/include/nel/3d/texture_mem.h b/code/nel/include/nel/3d/texture_mem.h index f392b0d45..ac31e9ea3 100644 --- a/code/nel/include/nel/3d/texture_mem.h +++ b/code/nel/include/nel/3d/texture_mem.h @@ -26,7 +26,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** /** * CTextureMem */ diff --git a/code/nel/include/nel/3d/u_driver.h b/code/nel/include/nel/3d/u_driver.h index 8201288c6..7641fdb2d 100644 --- a/code/nel/include/nel/3d/u_driver.h +++ b/code/nel/include/nel/3d/u_driver.h @@ -66,7 +66,7 @@ class UWaterEnvMap; typedef void (*emptyProc)(void); -//**************************************************************************** +// **************************************************************************** /// Monitor color properties struct CMonitorColorProperties { diff --git a/code/nel/include/nel/3d/u_scene.h b/code/nel/include/nel/3d/u_scene.h index 0a4b62dd6..663a21fa0 100644 --- a/code/nel/include/nel/3d/u_scene.h +++ b/code/nel/include/nel/3d/u_scene.h @@ -49,7 +49,7 @@ class UPointLight; class UWaterEnvMap; -//**************************************************************************** +// **************************************************************************** // useful callback for createInstanceGroupAndAddToSceneAsync class IAsyncLoadCallback { @@ -80,7 +80,7 @@ public: }; -//**************************************************************************** +// **************************************************************************** /** * Game Interface for Scene. * A UScene create instances, camera lights etc... Those objects are not sharable through different scenes. You diff --git a/code/nel/include/nel/misc/historic.h b/code/nel/include/nel/misc/historic.h index 5cf215fb5..e9deeb6d4 100644 --- a/code/nel/include/nel/misc/historic.h +++ b/code/nel/include/nel/misc/historic.h @@ -61,7 +61,7 @@ private: // IMPLEMENTATION // //////////////////// -//**************************************************************************************************** +// **************************************************************************************************** template inline void CHistoric::push(const T &value) { @@ -74,7 +74,7 @@ inline void CHistoric::push(const T &value) _Historic.push_back(value); } -//**************************************************************************************************** +// **************************************************************************************************** template inline void CHistoric::pop() { @@ -82,7 +82,7 @@ inline void CHistoric::pop() _Historic.pop_back(); } -//**************************************************************************************************** +// **************************************************************************************************** template inline void CHistoric::setMaxSize(uint maxSize) { diff --git a/code/nel/include/nel/misc/inter_window_msg_queue.h b/code/nel/include/nel/misc/inter_window_msg_queue.h index c491fb394..7cc1f754f 100644 --- a/code/nel/include/nel/misc/inter_window_msg_queue.h +++ b/code/nel/include/nel/misc/inter_window_msg_queue.h @@ -31,7 +31,7 @@ namespace NLMISC { -//************************************************************************************************** +// ************************************************************************************************** /** IPC Utility class to enable easy window-window communication * * This enable 2-ways non blocking communication between 2 windows on the same machine (windows @@ -104,7 +104,7 @@ public: uint getReceiveQueueSize() const; -//************************************************************************************************** +// ************************************************************************************************** private: struct CMsg { diff --git a/code/nel/src/3d/debug_vb.cpp b/code/nel/src/3d/debug_vb.cpp index a0fc94561..32799ec79 100644 --- a/code/nel/src/3d/debug_vb.cpp +++ b/code/nel/src/3d/debug_vb.cpp @@ -31,7 +31,7 @@ static void checkRange(const uint8 *min, const uint8 *max, const uint8 *start, u } } -//************************************************************************************ +// ************************************************************************************ void nlCheckVertexBuffer(const CVertexBuffer &vb, const uint8 *ptr) { CVertexBufferRead vba; @@ -39,49 +39,49 @@ void nlCheckVertexBuffer(const CVertexBuffer &vb, const uint8 *ptr) checkRange((uint8 *) vba.getVertexCoordPointer(), (uint8 *) vba.getVertexCoordPointer() + vb.getNumVertices() * vb.getVertexSize(), ptr, 0, vb.getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckVBA(CVertexBufferRead &vba, const uint8 *ptr) { checkRange((uint8 *) vba.getVertexCoordPointer(), (uint8 *) vba.getVertexCoordPointer() + vba.getParent()->getNumVertices() * vba.getParent()->getVertexSize(), ptr, 0, vba.getParent()->getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckVBA(CVertexBufferReadWrite &vba, const uint8 *ptr) { checkRange((uint8 *) vba.getVertexCoordPointer(), (uint8 *) vba.getVertexCoordPointer() + vba.getParent()->getNumVertices() * vba.getParent()->getVertexSize(), ptr, 0, vba.getParent()->getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckVBARange(CVertexBufferRead &vba, const uint8 *ptStart, uint length) { checkRange((uint8 *) vba.getVertexCoordPointer(), (uint8 *) vba.getVertexCoordPointer() + vba.getParent()->getNumVertices() * vba.getParent()->getVertexSize(), ptStart, length, vba.getParent()->getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckVBARange(CVertexBufferReadWrite &vba, const uint8 *ptStart, uint length) { checkRange((uint8 *) vba.getVertexCoordPointer(), (uint8 *) vba.getVertexCoordPointer() + vba.getParent()->getNumVertices() * vba.getParent()->getVertexSize(), ptStart, length, vba.getParent()->getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckIBARange(CIndexBufferReadWrite &iba, const uint8 *ptStart, uint length) { checkRange((uint8 *) iba.getPtr(), (uint8 *) iba.getPtr() + iba.getParent()->getNumIndexes() * iba.getIndexNumBytes(), ptStart, length, iba.getParent()->getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckIBARange(CIndexBufferRead &iba, const uint8 *ptStart, uint length) { checkRange((uint8 *) iba.getPtr(), (uint8 *) iba.getPtr() + iba.getParent()->getNumIndexes() * iba.getIndexNumBytes(), ptStart, length, iba.getParent()->getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckIBA(CIndexBufferReadWrite &iba, const uint8 *ptStart) { checkRange((uint8 *) iba.getPtr(), (uint8 *) iba.getPtr() + iba.getParent()->getNumIndexes() * iba.getIndexNumBytes(), ptStart, 0, iba.getParent()->getName()); } -//************************************************************************************ +// ************************************************************************************ void nlCheckIBA(CIndexBufferRead &iba, const uint8 *ptStart) { checkRange((uint8 *) iba.getPtr(), (uint8 *) iba.getPtr() + iba.getParent()->getNumIndexes() * iba.getIndexNumBytes(), ptStart, 0, iba.getParent()->getName()); diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp index 2eafa4b1a..c22b54f67 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp @@ -179,12 +179,8 @@ void CDriverGLStates::forceDefaults(uint nbStages) // Cull order _CullMode = CCW; glCullFace(GL_BACK); - - } - - // *************************************************************************** void CDriverGLStates::enableBlend(uint enable) { diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp index 69916cc5e..d2d8f5a66 100644 --- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp +++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp @@ -178,10 +178,37 @@ TKey getKeyFromKeycode (uint keycode) case 0x31: return KeyAPOSTROPHE; case 0x33: return KeyBACKSLASH; case 0x5e: return KeyOEM_102; - case 0x3a: return KeyCOMMA; +// case 0x3a: return KeyCOMMA; case 0x3b: return KeyPERIOD; case 0x3c: return KeySLASH; case 0x3d: return KeyPARAGRAPH; + // for non-standard keyboards, maps to QWERTY keys + case 0x18: return KeyQ; + case 0x19: return KeyW; + case 0x1a: return KeyE; + case 0x1b: return KeyR; + case 0x1c: return KeyT; + case 0x1d: return KeyY; + case 0x1e: return KeyU; + case 0x1f: return KeyI; + case 0x20: return KeyO; + case 0x21: return KeyP; + case 0x26: return KeyQ; + case 0x27: return KeyS; + case 0x28: return KeyD; + case 0x29: return KeyF; + case 0x2a: return KeyG; + case 0x2b: return KeyH; + case 0x2c: return KeyJ; + case 0x2d: return KeyK; + case 0x2e: return KeyL; + case 0x34: return KeyZ; + case 0x35: return KeyX; + case 0x36: return KeyC; + case 0x37: return KeyV; + case 0x38: return KeyB; + case 0x39: return KeyN; + case 0x3a: return KeyM; #endif default: // nlwarning("missing keycode 0x%x %d '%c'", keycode, keycode, keycode); diff --git a/code/nel/src/3d/flare_model.cpp b/code/nel/src/3d/flare_model.cpp index 27f26192c..67b8d963c 100644 --- a/code/nel/src/3d/flare_model.cpp +++ b/code/nel/src/3d/flare_model.cpp @@ -41,7 +41,7 @@ CVertexBuffer CFlareModel::_OcclusionQueryVB; using NLMISC::CVector; -//******************************************************************************************************************** +// ******************************************************************************************************************** CFlareModel::CFlareModel() { std::fill(_Intensity, _Intensity + MaxNumContext, 0.f); @@ -56,7 +56,7 @@ CFlareModel::CFlareModel() Next = NULL; } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::resetOcclusionQuerries() { for(uint k = 0; k < MaxNumContext; ++k) @@ -69,7 +69,7 @@ void CFlareModel::resetOcclusionQuerries() } } -//******************************************************************************************************************** +// ******************************************************************************************************************** CFlareModel::~CFlareModel() { // if driver hasn't changed, delete all querries @@ -92,7 +92,7 @@ CFlareModel::~CFlareModel() } } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::registerBasic() { // register the model @@ -117,7 +117,7 @@ static inline void vbWrite(uint8 *&dest, float uCoord, float vCoord) dest += 2 * sizeof(float); } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::traverseRender() { CRenderTrav &renderTrav = getOwnerScene()->getRenderTrav(); @@ -540,7 +540,7 @@ void CFlareModel::traverseRender() } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::initStatics() { if (!_OcclusionQuerySettuped) @@ -560,7 +560,7 @@ void CFlareModel::initStatics() } } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::updateOcclusionQueryBegin(IDriver *drv) { nlassert(drv); @@ -571,13 +571,13 @@ void CFlareModel::updateOcclusionQueryBegin(IDriver *drv) } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::updateOcclusionQueryEnd(IDriver *drv) { drv->setColorMask(true, true, true, true); } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::updateOcclusionQuery(IDriver *drv) { nlassert(drv); @@ -604,7 +604,7 @@ void CFlareModel::updateOcclusionQuery(IDriver *drv) oq->end(); } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::renderOcclusionMeshPrimitives(CMesh &mesh, IDriver &drv) { uint numMatrixBlock = mesh.getNbMatrixBlock(); @@ -620,7 +620,7 @@ void CFlareModel::renderOcclusionMeshPrimitives(CMesh &mesh, IDriver &drv) } } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::setupOcclusionMeshMatrix(IDriver &drv, CScene &scene) const { nlassert(Shape); @@ -638,7 +638,7 @@ void CFlareModel::setupOcclusionMeshMatrix(IDriver &drv, CScene &scene) const } } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::occlusionTest(CMesh &mesh, IDriver &drv) { nlassert(_Scene); @@ -676,7 +676,7 @@ void CFlareModel::occlusionTest(CMesh &mesh, IDriver &drv) drv.setColorMask(true, true, true, true); // restore pixel writes } -//******************************************************************************************************************** +// ******************************************************************************************************************** void CFlareModel::renderOcclusionTestMesh(IDriver &drv) { nlassert(_Scene); diff --git a/code/nel/src/3d/flare_shape.cpp b/code/nel/src/3d/flare_shape.cpp index daca909a3..a9d2001d7 100644 --- a/code/nel/src/3d/flare_shape.cpp +++ b/code/nel/src/3d/flare_shape.cpp @@ -28,7 +28,7 @@ namespace NL3D { -//*************************************************************************************************************** +// *************************************************************************************************************** CFlareShape::CFlareShape() : _Color(NLMISC::CRGBA::White), _DazzleColor(NLMISC::CRGBA::Black), _SizeDisappear(0.f), @@ -59,7 +59,7 @@ CFlareShape::CFlareShape() : _Color(NLMISC::CRGBA::White), } -//*************************************************************************************************************** +// *************************************************************************************************************** void CFlareShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { // Version 4 : - added occlusion test mesh, size reduction, angle modification when object is occluded @@ -112,7 +112,7 @@ void CFlareShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } } -//*************************************************************************************************************** +// *************************************************************************************************************** CTransformShape *CFlareShape::createInstance(CScene &scene) { CFlareModel *fm = NLMISC::safe_cast(scene.createModel(FlareModelClassId) ); @@ -123,7 +123,7 @@ CTransformShape *CFlareShape::createInstance(CScene &scene) return fm; } -//*************************************************************************************************************** +// *************************************************************************************************************** float CFlareShape::getNumTriangles (float distance) { float count = 0; @@ -134,7 +134,7 @@ float CFlareShape::getNumTriangles (float distance) return count; } -//*************************************************************************************************************** +// *************************************************************************************************************** bool CFlareShape::clip(const std::vector &pyramid, const CMatrix &worldMatrix) { // compute flare pos in world basis : @@ -150,7 +150,7 @@ bool CFlareShape::clip(const std::vector &pyramid, const CMatrix &wor return true; } -//*************************************************************************************************************** +// *************************************************************************************************************** void CFlareShape::getAABBox(NLMISC::CAABBox &bbox) const { // the flare himself is a point @@ -158,7 +158,7 @@ void CFlareShape::getAABBox(NLMISC::CAABBox &bbox) const bbox.setHalfSize(CVector::Null); } -//*************************************************************************************************************** +// *************************************************************************************************************** void CFlareShape::flushTextures (IDriver &driver, uint selectedTexture) { // Flush each texture @@ -175,7 +175,7 @@ void CFlareShape::flushTextures (IDriver &driver, uint selectedTexture) } } -//*************************************************************************************************************** +// *************************************************************************************************************** void CFlareShape::setOcclusionTestMeshName(const std::string &shapeName) { if (shapeName == _OcclusionTestMeshName) return; @@ -184,7 +184,7 @@ void CFlareShape::setOcclusionTestMeshName(const std::string &shapeName) } -//*************************************************************************************************************** +// *************************************************************************************************************** CMesh *CFlareShape::getOcclusionTestMesh(CShapeBank &sb) { if (_OcclusionTestMesh) return _OcclusionTestMesh; diff --git a/code/nel/src/3d/landscape_user.cpp b/code/nel/src/3d/landscape_user.cpp index 8496ad74d..d2b0ca2ef 100644 --- a/code/nel/src/3d/landscape_user.cpp +++ b/code/nel/src/3d/landscape_user.cpp @@ -48,20 +48,20 @@ CLandscapeUser::~CLandscapeUser() } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setZonePath(const std::string &zonePath) { NL3D_HAUTO_UI_LANDSCAPE; _ZoneManager.setZonePath(zonePath); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::invalidateAllTiles() { _Landscape->Landscape.invalidateAllTiles(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::loadBankFiles(const std::string &tileBankFile, const std::string &farBankFile) { NL3D_HAUTO_LOAD_LANDSCAPE; @@ -89,7 +89,7 @@ void CLandscapeUser::loadBankFiles(const std::string &tileBankFile, const std::s farbankFile.close(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::flushTiles (NLMISC::IProgressCallback &progress) { @@ -147,7 +147,7 @@ void CLandscapeUser::flushTiles (NLMISC::IProgressCallback &progress) } } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::loadAllZonesAround(const CVector &pos, float radius, std::vector &zonesAdded) { @@ -189,7 +189,7 @@ void CLandscapeUser::loadAllZonesAround(const CVector &pos, float radius, std::v _Landscape->Landscape.checkBinds(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::refreshAllZonesAround(const CVector &pos, float radius, std::vector &zonesAdded, std::vector &zonesRemoved, NLMISC::IProgressCallback &progress, const std::vector *validZoneIds) { @@ -241,7 +241,7 @@ void CLandscapeUser::getAllZoneLoaded(std::vector &zoneLoaded) cons } } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::loadAllZonesAround(const CVector &pos, float radius) { std::vector dummy; @@ -249,7 +249,7 @@ void CLandscapeUser::loadAllZonesAround(const CVector &pos, float radius) } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::refreshZonesAround(const CVector &pos, float radius) { NL3D_HAUTO_LOAD_LANDSCAPE; @@ -257,7 +257,7 @@ void CLandscapeUser::refreshZonesAround(const CVector &pos, float radius) std::string dummy1, dummy2; refreshZonesAround(pos, radius, dummy1, dummy2); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::refreshZonesAround(const CVector &pos, float radius, std::string &zoneAdded, std::string &zoneRemoved, const std::vector *validZoneIds) { NL3D_HAUTO_LOAD_LANDSCAPE; @@ -307,7 +307,7 @@ void CLandscapeUser::refreshZonesAround(const CVector &pos, float radius, std::s _ZoneManager.checkZonesAround((uint)pos.x, (uint)(-pos.y), (uint)radius, validZoneIds); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::removeAllZones() { NL3D_HAUTO_LOAD_LANDSCAPE; @@ -349,7 +349,7 @@ void CLandscapeUser::removeAllZones() _ZoneManager.clear(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setupStaticLight (const CRGBA &diffuse, const CRGBA &ambiant, float multiply) { NL3D_HAUTO_UI_LANDSCAPE; @@ -358,37 +358,37 @@ void CLandscapeUser::setupStaticLight (const CRGBA &diffuse, const CRGBA &ambian -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setThreshold (float thre) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.setThreshold(thre); } -//**************************************************************************** +// **************************************************************************** float CLandscapeUser::getThreshold () const { NL3D_HAUTO_UI_LANDSCAPE; return _Landscape->Landscape.getThreshold(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setTileNear (float tileNear) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.setTileNear(tileNear); } -//**************************************************************************** +// **************************************************************************** float CLandscapeUser::getTileNear () const { NL3D_HAUTO_UI_LANDSCAPE; return _Landscape->Landscape.getTileNear(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setTileMaxSubdivision (uint tileDiv) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.setTileMaxSubdivision(tileDiv); } -//**************************************************************************** +// **************************************************************************** uint CLandscapeUser::getTileMaxSubdivision () { NL3D_HAUTO_UI_LANDSCAPE; @@ -396,7 +396,7 @@ uint CLandscapeUser::getTileMaxSubdivision () } -//**************************************************************************** +// **************************************************************************** std::string CLandscapeUser::getZoneName(const CVector &pos) { NL3D_HAUTO_UI_LANDSCAPE; @@ -404,14 +404,14 @@ std::string CLandscapeUser::getZoneName(const CVector &pos) } -//**************************************************************************** +// **************************************************************************** CVector CLandscapeUser::getHeightFieldDeltaZ(float x, float y) const { NL3D_HAUTO_UI_LANDSCAPE; return _Landscape->Landscape.getHeightFieldDeltaZ(x,y); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setHeightField(const CHeightMap &hf) { NL3D_HAUTO_UI_LANDSCAPE; @@ -419,35 +419,35 @@ void CLandscapeUser::setHeightField(const CHeightMap &hf) } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::enableVegetable(bool enable) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.enableVegetable(enable); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::loadVegetableTexture(const std::string &textureFileName) { NL3D_HAUTO_LOAD_LANDSCAPE; _Landscape->Landscape.loadVegetableTexture(textureFileName); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setupVegetableLighting(const CRGBA &ambient, const CRGBA &diffuse, const CVector &directionalLight) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.setupVegetableLighting(ambient, diffuse, directionalLight); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setVegetableWind(const CVector &windDir, float windFreq, float windPower, float windBendMin) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.setVegetableWind(windDir, windFreq, windPower, windBendMin); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setVegetableUpdateLightingFrequency(float freq) { NL3D_HAUTO_UI_LANDSCAPE; @@ -455,7 +455,7 @@ void CLandscapeUser::setVegetableUpdateLightingFrequency(float freq) } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setUpdateLightingFrequency(float freq) { NL3D_HAUTO_UI_LANDSCAPE; @@ -463,57 +463,57 @@ void CLandscapeUser::setUpdateLightingFrequency(float freq) } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::enableAdditive (bool enable) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->enableAdditive(enable); } -//**************************************************************************** +// **************************************************************************** bool CLandscapeUser::isAdditiveEnabled () const { NL3D_HAUTO_UI_LANDSCAPE; return _Landscape->isAdditive (); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setPointLightDiffuseMaterial(CRGBA diffuse) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.setPointLightDiffuseMaterial(diffuse); } -//**************************************************************************** +// **************************************************************************** CRGBA CLandscapeUser::getPointLightDiffuseMaterial () const { NL3D_HAUTO_UI_LANDSCAPE; return _Landscape->Landscape.getPointLightDiffuseMaterial(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::setDLMGlobalVegetableColor(CRGBA gvc) { NL3D_HAUTO_UI_LANDSCAPE; _Landscape->Landscape.setDLMGlobalVegetableColor(gvc); } -//**************************************************************************** +// **************************************************************************** CRGBA CLandscapeUser::getDLMGlobalVegetableColor() const { NL3D_HAUTO_UI_LANDSCAPE; return _Landscape->Landscape.getDLMGlobalVegetableColor(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::updateLightingAll() { NL3D_HAUTO_LANDSCAPE_UPDATE_LIGHTING_ALL; _Landscape->Landscape.updateLightingAll(); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::postfixTileFilename (const char *postfix) { NL3D_HAUTO_LANDSCAPE_UPDATE_LIGHTING_ALL; _Landscape->Landscape.TileBank.postfixTileFilename (postfix); } -//**************************************************************************** +// **************************************************************************** void CLandscapeUser::postfixTileVegetableDesc (const char *postfix) { NL3D_HAUTO_LANDSCAPE_UPDATE_LIGHTING_ALL; diff --git a/code/nel/src/3d/mesh.cpp b/code/nel/src/3d/mesh.cpp index e61522aaf..40cb58700 100644 --- a/code/nel/src/3d/mesh.cpp +++ b/code/nel/src/3d/mesh.cpp @@ -2429,7 +2429,7 @@ void CMesh::CMeshBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream) }*/ -//************************************ +// ************************************ CMesh::CMeshBuild::CMeshBuild() { for (uint k = 0; k < CVertexBuffer::MaxStage; ++k) diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp index 8a3acbb7c..1f23b65c5 100644 --- a/code/nel/src/3d/packed_world.cpp +++ b/code/nel/src/3d/packed_world.cpp @@ -27,7 +27,7 @@ namespace NL3D { -//************************************************************************************************* +// ************************************************************************************************* void CPackedWorld::build(std::vector &packedZones) { _ZoneGrid.clear(); @@ -77,7 +77,7 @@ void CPackedWorld::build(std::vector &packedZones) _RaytraceCounter = ~0; } -//************************************************************************************************* +// ************************************************************************************************* bool CPackedWorld::raytrace(const NLMISC::CVector &start, const NLMISC::CVector &end, CVector &inter, std::vector *testedTriangles /*= NULL*/, NLMISC::CVector *normal) { if (_ZoneGrid.empty()) return false; @@ -138,7 +138,7 @@ bool CPackedWorld::raytrace(const NLMISC::CVector &start, const NLMISC::CVector return false; } -//************************************************************************************************* +// ************************************************************************************************* void CPackedWorld::getZones(std::vector &zones) { zones.clear(); @@ -148,7 +148,7 @@ void CPackedWorld::getZones(std::vector &zones) } } -//************************************************************************************************* +// ************************************************************************************************* void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialVersion(1); @@ -156,7 +156,7 @@ void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream) f.serialCont(ZoneNames); } -//************************************************************************************************* +// ************************************************************************************************* void CPackedWorld::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { serialZoneNames(f); @@ -166,7 +166,7 @@ void CPackedWorld::serial(NLMISC::IStream &f) throw(NLMISC::EStream) f.serial(_ZoneMinY); } -//************************************************************************************************* +// ************************************************************************************************* void CPackedWorld::select(const NLMISC::CPolygon2D &poly, std::vector &selectedTriangles) const { selectedTriangles.clear(); diff --git a/code/nel/src/3d/particle_system_process.cpp b/code/nel/src/3d/particle_system_process.cpp index 76d78f067..c36ec6c82 100644 --- a/code/nel/src/3d/particle_system_process.cpp +++ b/code/nel/src/3d/particle_system_process.cpp @@ -23,7 +23,7 @@ uint PSEnterLeaveDepth = 0; uint PSEnterLeaveMaxDepth = 1; std::string PSCurrName; -//*********************************************************************************************************** +// *********************************************************************************************************** CPSEnterLeave::CPSEnterLeave(const char *name) { ++ PSEnterLeaveDepth; @@ -35,7 +35,7 @@ CPSEnterLeave::CPSEnterLeave(const char *name) } } -//*********************************************************************************************************** +// *********************************************************************************************************** CPSEnterLeave::~CPSEnterLeave() { if (PSEnterLeaveDepth <= PSEnterLeaveMaxDepth) @@ -54,7 +54,7 @@ namespace NL3D { // CParticleSystemProcess implementation // ///////////////////////////////////////////// -//*********************************************************************************************************** +// *********************************************************************************************************** void CParticleSystemProcess::setOwner(CParticleSystem *ps) { NL_PS_FUNC(CParticleSystemProcess_setOwner) @@ -69,14 +69,14 @@ void CParticleSystemProcess::setOwner(CParticleSystem *ps) } -//*********************************************************************************************************** +// *********************************************************************************************************** uint CParticleSystemProcess::getUserMatrixUsageCount() const { NL_PS_FUNC(CParticleSystemProcess_getUserMatrixUsageCount) return _MatrixMode == PSUserMatrix; } -//*********************************************************************************************************** +// *********************************************************************************************************** void CParticleSystemProcess::setMatrixMode(TPSMatrixMode matrixMode) { NL_PS_FUNC(CParticleSystemProcess_setMatrixMode) @@ -90,7 +90,7 @@ void CParticleSystemProcess::setMatrixMode(TPSMatrixMode matrixMode) } -//*********************************************************************************************************** +// *********************************************************************************************************** CFontGenerator *CParticleSystemProcess::getFontGenerator(void) { NL_PS_FUNC(CParticleSystemProcess_getFontGenerator) @@ -98,7 +98,7 @@ CFontGenerator *CParticleSystemProcess::getFontGenerator(void) return _Owner->getFontGenerator(); } -//*********************************************************************************************************** +// *********************************************************************************************************** const CFontGenerator *CParticleSystemProcess::getFontGenerator(void) const { NL_PS_FUNC(CParticleSystemProcess_getFontGenerator) @@ -106,7 +106,7 @@ const CFontGenerator *CParticleSystemProcess::getFontGenerator(void) const return _Owner->getFontGenerator(); } -//*********************************************************************************************************** +// *********************************************************************************************************** CFontManager *CParticleSystemProcess::getFontManager(void) { NL_PS_FUNC(CParticleSystemProcess_getFontManager) @@ -114,7 +114,7 @@ CFontManager *CParticleSystemProcess::getFontManager(void) return _Owner->getFontManager(); } -//*********************************************************************************************************** +// *********************************************************************************************************** const CFontManager *CParticleSystemProcess::getFontManager(void) const { NL_PS_FUNC(CParticleSystemProcess_getFontManager) @@ -124,7 +124,7 @@ const CFontManager *CParticleSystemProcess::getFontManager(void) const -//*********************************************************************************************************** +// *********************************************************************************************************** void CParticleSystemProcess::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { NL_PS_FUNC(CParticleSystemProcess_serial) diff --git a/code/nel/src/3d/patch.cpp b/code/nel/src/3d/patch.cpp index 81aa3f42b..199202317 100644 --- a/code/nel/src/3d/patch.cpp +++ b/code/nel/src/3d/patch.cpp @@ -2293,7 +2293,7 @@ CTileElement *CPatch::getTileElement(const CUV &uv) return &(Tiles[ts+tt*OrderS]); } -//*************************************************************** +// *************************************************************** uint32 CPatch::countNumTriFar0() const { uint32 numIndex = MasterBlock.Far0FaceVector ? *MasterBlock.Far0FaceVector : 0; @@ -2311,7 +2311,7 @@ uint32 CPatch::countNumTriFar0() const return numIndex; } -//*************************************************************** +// *************************************************************** uint32 CPatch::countNumTriFar1() const { uint32 numIndex = MasterBlock.Far1FaceVector ? *MasterBlock.Far1FaceVector : 0; diff --git a/code/nel/src/3d/ps_attrib_maker_helper.cpp b/code/nel/src/3d/ps_attrib_maker_helper.cpp index 4e6c22d76..6c9a94baa 100644 --- a/code/nel/src/3d/ps_attrib_maker_helper.cpp +++ b/code/nel/src/3d/ps_attrib_maker_helper.cpp @@ -21,7 +21,7 @@ namespace NL3D { -//*********************************************************************************** +// *********************************************************************************** void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { CPSAttribMakerMemoryBase::serial(f); @@ -39,7 +39,7 @@ void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStr } } -//*********************************************************************************** +// *********************************************************************************** void CPSAttribMakerMemory::newElement(const CPSEmitterInfo &info) { CPSAttribMakerMemoryBase::newElement(info); @@ -54,7 +54,7 @@ void CPSAttribMakerMemory::newElement(const CPSEmitterInfo &info) } } -//*********************************************************************************** +// *********************************************************************************** void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { CPSAttribMakerMemoryBase::serial(f); @@ -72,7 +72,7 @@ void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStr } } -//*********************************************************************************** +// *********************************************************************************** void CPSAttribMakerMemory::newElement(const CPSEmitterInfo &info) { CPSAttribMakerMemoryBase::newElement(info); @@ -87,7 +87,7 @@ void CPSAttribMakerMemory::newElement(const CPSEmitterInfo &info) } } -//*********************************************************************************** +// *********************************************************************************** void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { CPSAttribMakerMemoryBase::serial(f); @@ -105,7 +105,7 @@ void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStre } } -//*********************************************************************************** +// *********************************************************************************** void CPSAttribMakerMemory::newElement(const CPSEmitterInfo &info) { CPSAttribMakerMemoryBase::newElement(info); diff --git a/code/nel/src/3d/ps_light.cpp b/code/nel/src/3d/ps_light.cpp index 6b90394a7..5c879742c 100644 --- a/code/nel/src/3d/ps_light.cpp +++ b/code/nel/src/3d/ps_light.cpp @@ -29,7 +29,7 @@ namespace NL3D { -//*************************************************************************************************************** +// *************************************************************************************************************** CPSLight::CPSLight() : _Color(CRGBA::White), _ColorScheme(NULL), _AttenStart(0.1f), @@ -40,7 +40,7 @@ CPSLight::CPSLight() : _Color(CRGBA::White), NL_PS_FUNC(CPSLight_CPSLight) } -//*************************************************************************************************************** +// *************************************************************************************************************** CPSLight::~CPSLight() { NL_PS_FUNC(CPSLight_CPSLight) @@ -67,7 +67,7 @@ CPSLight::~CPSLight() delete _AttenEndScheme; } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { NL_PS_FUNC(CPSLight_serial) @@ -134,14 +134,14 @@ void CPSLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } } -//*************************************************************************************************************** +// *************************************************************************************************************** uint32 CPSLight::getType(void) const { NL_PS_FUNC(CPSLight_getType) return PSLight; } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::onShow(bool shown) { for(uint k = 0; k < _Lights.getSize(); ++k) @@ -160,7 +160,7 @@ void CPSLight::onShow(bool shown) } } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::step(TPSProcessPass pass) { NL_PS_FUNC(CPSLight_step) @@ -287,7 +287,7 @@ void CPSLight::step(TPSProcessPass pass) } } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::setColor(NLMISC::CRGBA color) { NL_PS_FUNC(CPSLight_setColor) @@ -296,7 +296,7 @@ void CPSLight::setColor(NLMISC::CRGBA color) _Color = color; } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::setColorScheme(CPSAttribMaker *scheme) { NL_PS_FUNC(CPSLight_setColorScheme) @@ -308,7 +308,7 @@ void CPSLight::setColorScheme(CPSAttribMaker *scheme) } } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::setAttenStart(float radius) { NL_PS_FUNC(CPSLight_setAttenStart) @@ -318,7 +318,7 @@ void CPSLight::setAttenStart(float radius) _AttenStart = radius; } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::setAttenStartScheme(CPSAttribMaker *scheme) { NL_PS_FUNC(CPSLight_setAttenStartScheme) @@ -330,7 +330,7 @@ void CPSLight::setAttenStartScheme(CPSAttribMaker *scheme) } } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::setAttenEnd(float radius) { NL_PS_FUNC(CPSLight_setAttenEnd) @@ -339,7 +339,7 @@ void CPSLight::setAttenEnd(float radius) _AttenEnd = radius; } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::setAttenEndScheme(CPSAttribMaker *scheme) { NL_PS_FUNC(CPSLight_setAttenEndScheme) @@ -351,7 +351,7 @@ void CPSLight::setAttenEndScheme(CPSAttribMaker *scheme) } } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::newElement(const CPSEmitterInfo &info) { NL_PS_FUNC(CPSLight_newElement) @@ -361,7 +361,7 @@ void CPSLight::newElement(const CPSEmitterInfo &info) _Lights.insert(NULL); // instance is created during step() } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::deleteElement(uint32 index) { NL_PS_FUNC(CPSLight_deleteElement) @@ -376,7 +376,7 @@ void CPSLight::deleteElement(uint32 index) _Lights.remove(index); } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::resize(uint32 size) { NL_PS_FUNC(CPSLight_resize) @@ -387,7 +387,7 @@ void CPSLight::resize(uint32 size) _Lights.resize(size); } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::releaseAllRef() { NL_PS_FUNC(CPSLight_releaseAllRef) @@ -404,7 +404,7 @@ void CPSLight::releaseAllRef() } } -//*************************************************************************************************************** +// *************************************************************************************************************** void CPSLight::show() { NL_PS_FUNC(CPSLight_show) diff --git a/code/nel/src/3d/ps_located.cpp b/code/nel/src/3d/ps_located.cpp index a62162ab9..32816846e 100644 --- a/code/nel/src/3d/ps_located.cpp +++ b/code/nel/src/3d/ps_located.cpp @@ -56,7 +56,7 @@ CPSCollisionInfo *CPSLocated::_FirstCollision = NULL; -///*************************************************************************************** +/// *************************************************************************************** /** * Constructor */ @@ -81,7 +81,7 @@ CPSLocated::CPSLocated() : /*_MaxNumFaces(0),*/ } -//***************************************************************************************************** +// ***************************************************************************************************** const NLMISC::CMatrix &CPSLocated::getLocalToWorldMatrix() const { NL_PS_FUNC(CPSLocated_getLocalToWorldMatrix) @@ -98,7 +98,7 @@ const NLMISC::CMatrix &CPSLocated::getLocalToWorldMatrix() const return NLMISC::CMatrix::Identity; } -//***************************************************************************************************** +// ***************************************************************************************************** const NLMISC::CMatrix &CPSLocated::getWorldToLocalMatrix() const { NL_PS_FUNC(CPSLocated_getWorldToLocalMatrix) @@ -116,7 +116,7 @@ const NLMISC::CMatrix &CPSLocated::getWorldToLocalMatrix() const } -///*************************************************************************************** +/// *************************************************************************************** float CPSLocated::evalMaxDuration() const { NL_PS_FUNC(CPSLocated_evalMaxDuration) @@ -125,7 +125,7 @@ float CPSLocated::evalMaxDuration() const } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::checkIntegrity() const { NL_PS_FUNC(CPSLocated_checkIntegrity) @@ -147,7 +147,7 @@ void CPSLocated::checkIntegrity() const // } -///*************************************************************************************** +/// *************************************************************************************** bool CPSLocated::setLastForever() { NL_PS_FUNC(CPSLocated_setLastForever) @@ -168,7 +168,7 @@ bool CPSLocated::setLastForever() } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::systemDateChanged() { NL_PS_FUNC(CPSLocated_systemDateChanged) @@ -181,7 +181,7 @@ void CPSLocated::systemDateChanged() } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::releaseRefTo(const CParticleSystemProcess *other) { NL_PS_FUNC(CPSLocated_releaseRefTo) @@ -209,7 +209,7 @@ void CPSLocated::releaseRefTo(const CParticleSystemProcess *other) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::releaseAllRef() { NL_PS_FUNC(CPSLocated_releaseAllRef) @@ -241,7 +241,7 @@ void CPSLocated::releaseAllRef() } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::notifyMotionTypeChanged(void) { NL_PS_FUNC(CPSLocated_notifyMotionTypeChanged) @@ -254,7 +254,7 @@ void CPSLocated::notifyMotionTypeChanged(void) } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::integrateSingle(float startDate, float deltaT, uint numStep, uint32 indexInLocated, NLMISC::CVector *destPos, @@ -302,7 +302,7 @@ void CPSLocated::integrateSingle(float startDate, float deltaT, uint numStep, } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::performParametricMotion(TAnimationTime date) { NL_PS_FUNC(CPSLocated_performParametricMotion) @@ -340,7 +340,7 @@ void CPSLocated::performParametricMotion(TAnimationTime date) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** /// allocate parametric infos void CPSLocated::allocateParametricInfos(void) { @@ -364,7 +364,7 @@ void CPSLocated::allocateParametricInfos(void) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** /// release parametric infos void CPSLocated::releaseParametricInfos(void) { @@ -377,7 +377,7 @@ void CPSLocated::releaseParametricInfos(void) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** /// Test whether this located support parametric motion bool CPSLocated::supportParametricMotion(void) const { @@ -385,7 +385,7 @@ bool CPSLocated::supportParametricMotion(void) const return _NonIntegrableForceNbRefs == 0 && _NumIntegrableForceWithDifferentBasis == 0; } -///*************************************************************************************** +/// *************************************************************************************** /** When set to true, this tells the system to use parametric motion. This is needed in a few case only, * and can only work if all the forces that apply to the system are integrable */ @@ -405,7 +405,7 @@ void CPSLocated::enableParametricMotion(bool enable /*= true*/) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::setMatrixMode(TPSMatrixMode matrixMode) { NL_PS_FUNC(CPSLocated_setMatrixMode) @@ -426,7 +426,7 @@ void CPSLocated::setMatrixMode(TPSMatrixMode matrixMode) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** /* void CPSLocated::notifyMaxNumFacesChanged(void) { @@ -448,7 +448,7 @@ void CPSLocated::notifyMaxNumFacesChanged(void) } */ -///*************************************************************************************** +/// *************************************************************************************** uint CPSLocated::getNumWantedTris() const { NL_PS_FUNC(CPSLocated_getNumWantedTris) @@ -488,7 +488,7 @@ bool CPSLocated::hasParticles(void) const return false; } -///*************************************************************************************** +/// *************************************************************************************** /// tells whether there are alive emitters bool CPSLocated::hasEmitters(void) const { @@ -502,7 +502,7 @@ bool CPSLocated::hasEmitters(void) const return false; } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::getLODVect(NLMISC::CVector &v, float &offset, TPSMatrixMode matrixMode) { NL_PS_FUNC(CPSLocated_getLODVect) @@ -512,7 +512,7 @@ void CPSLocated::getLODVect(NLMISC::CVector &v, float &offset, TPSMatrixMode mat CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** float CPSLocated::getUserParam(uint numParam) const { NL_PS_FUNC(CPSLocated_getUserParam) @@ -521,7 +521,7 @@ float CPSLocated::getUserParam(uint numParam) const return _Owner->getUserParam(numParam); } -///*************************************************************************************** +/// *************************************************************************************** CScene *CPSLocated::getScene(void) { NL_PS_FUNC(CPSLocated_getScene) @@ -530,7 +530,7 @@ CScene *CPSLocated::getScene(void) return _Owner->getScene(); } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::incrementNbDrawnParticles(uint num) { NL_PS_FUNC(CPSLocated_incrementNbDrawnParticles) @@ -538,7 +538,7 @@ void CPSLocated::incrementNbDrawnParticles(uint num) CParticleSystem::NbParticlesDrawn += num; // for benchmark purpose } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::setInitialLife(TAnimationTime lifeTime) { NL_PS_FUNC(CPSLocated_setInitialLife) @@ -563,7 +563,7 @@ void CPSLocated::setInitialLife(TAnimationTime lifeTime) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::setLifeScheme(CPSAttribMaker *scheme) { NL_PS_FUNC(CPSLocated_setLifeScheme) @@ -581,7 +581,7 @@ void CPSLocated::setLifeScheme(CPSAttribMaker *scheme) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::setInitialMass(float mass) { NL_PS_FUNC(CPSLocated_setInitialMass) @@ -592,7 +592,7 @@ void CPSLocated::setInitialMass(float mass) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::setMassScheme(CPSAttribMaker *scheme) { NL_PS_FUNC(CPSLocated_setMassScheme) @@ -604,7 +604,7 @@ void CPSLocated::setMassScheme(CPSAttribMaker *scheme) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** /// get a matrix that helps to express located B coordinate in located A basis const NLMISC::CMatrix &CPSLocated::getConversionMatrix(const CParticleSystem &ps, TPSMatrixMode destMode, TPSMatrixMode srcMode) { @@ -648,7 +648,7 @@ const NLMISC::CMatrix &CPSLocated::getConversionMatrix(const CParticleSystem &ps return NLMISC::CMatrix::Identity; } -///*************************************************************************************** +/// *************************************************************************************** NLMISC::CVector CPSLocated::computeI(void) const { NL_PS_FUNC(CPSLocated_computeI) @@ -679,7 +679,7 @@ NLMISC::CVector CPSLocated::computeI(void) const } } -///*************************************************************************************** +/// *************************************************************************************** NLMISC::CVector CPSLocated::computeIWithZAxisAligned(void) const { NL_PS_FUNC(CPSLocated_computeIWithZAxisAligned) @@ -713,7 +713,7 @@ NLMISC::CVector CPSLocated::computeIWithZAxisAligned(void) const } } -///*************************************************************************************** +/// *************************************************************************************** NLMISC::CVector CPSLocated::computeJ(void) const { NL_PS_FUNC(CPSLocated_computeJ) @@ -744,7 +744,7 @@ NLMISC::CVector CPSLocated::computeJ(void) const } } -///*************************************************************************************** +/// *************************************************************************************** NLMISC::CVector CPSLocated::computeK(void) const { NL_PS_FUNC(CPSLocated_computeK) @@ -776,7 +776,7 @@ NLMISC::CVector CPSLocated::computeK(void) const } } -///*************************************************************************************** +/// *************************************************************************************** NLMISC::CVector CPSLocated::computeKWithZAxisAligned(void) const { NL_PS_FUNC(CPSLocated_computeKWithZAxisAligned) @@ -807,7 +807,7 @@ NLMISC::CVector CPSLocated::computeKWithZAxisAligned(void) const } } -///*************************************************************************************** +/// *************************************************************************************** IDriver *CPSLocated::getDriver() const { NL_PS_FUNC(CPSLocated_getDriver) @@ -817,7 +817,7 @@ IDriver *CPSLocated::getDriver() const return _Owner->getDriver(); } -///*************************************************************************************** +/// *************************************************************************************** /// dtor CPSLocated::~CPSLocated() { @@ -852,7 +852,7 @@ CPSLocated::~CPSLocated() CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** /** * sorted insertion (by decreasing priority order) of a bindable (particle e.g an aspect, emitter) in a located */ @@ -915,7 +915,7 @@ bool CPSLocated::bind(CPSLocatedBindable *lb) return true; } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::remove(const CPSLocatedBindable *p) { NL_PS_FUNC(CPSLocated_remove) @@ -932,7 +932,7 @@ void CPSLocated::remove(const CPSLocatedBindable *p) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::registerDtorObserver(CPSLocatedBindable *anObserver) { NL_PS_FUNC(CPSLocated_registerDtorObserver) @@ -943,7 +943,7 @@ void CPSLocated::registerDtorObserver(CPSLocatedBindable *anObserver) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::unregisterDtorObserver(CPSLocatedBindable *anObserver) { NL_PS_FUNC(CPSLocated_unregisterDtorObserver) @@ -956,7 +956,7 @@ void CPSLocated::unregisterDtorObserver(CPSLocatedBindable *anObserver) } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::postNewElement(const NLMISC::CVector &pos, const NLMISC::CVector &speed, CPSLocated &emitterLocated, @@ -1028,7 +1028,7 @@ void CPSLocated::postNewElement(const NLMISC::CVector &pos, } -///*************************************************************************************** +/// *************************************************************************************** sint32 CPSLocated::newElement(const CPSSpawnInfo &si, bool doEmitOnce /* = false */, TAnimationTime ellapsedTime) { NL_PS_FUNC(CPSLocated_newElement) @@ -1236,7 +1236,7 @@ sint32 CPSLocated::newElement(const CPSSpawnInfo &si, bool doEmitOnce /* = false } -///*************************************************************************************** +/// *************************************************************************************** sint32 CPSLocated::newElement(const CVector &pos, const CVector &speed, CPSLocated *emitter, uint32 indexInEmitter, TPSMatrixMode speedCoordSystem, bool doEmitOnce /* = false */) { @@ -1265,7 +1265,7 @@ sint32 CPSLocated::newElement(const CVector &pos, const CVector &speed, CPSLocat } -///*************************************************************************************** +/// *************************************************************************************** static inline uint32 IDToLittleEndian(uint32 input) { NL_PS_FUNC(IDToLittleEndian) @@ -1279,7 +1279,7 @@ static inline uint32 IDToLittleEndian(uint32 input) #endif } -///*************************************************************************************** +/// *************************************************************************************** inline void CPSLocated::deleteElementBase(uint32 index) { NL_PS_FUNC(CPSLocated_deleteElementBase) @@ -1316,7 +1316,7 @@ inline void CPSLocated::deleteElementBase(uint32 index) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::deleteElement(uint32 index) { NL_PS_FUNC(CPSLocated_deleteElement) @@ -1336,7 +1336,7 @@ void CPSLocated::deleteElement(uint32 index) } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::deleteElement(uint32 index, TAnimationTime timeToNextSimStep) { NL_PS_FUNC(CPSLocated_deleteElement) @@ -1355,7 +1355,7 @@ void CPSLocated::deleteElement(uint32 index, TAnimationTime timeToNextSimStep) } /// Resize the located container -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::resize(uint32 newSize) { NL_PS_FUNC(CPSLocated_resize) @@ -1417,7 +1417,7 @@ public: }; }; -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { NL_PS_FUNC(CPSLocated_serial) @@ -1636,7 +1636,7 @@ void CPSLocated::serial(NLMISC::IStream &f) throw(NLMISC::EStream) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** // integrate speed of particles. Makes eventually use of SSE instructions when present static void IntegrateSpeed(uint count, float *src1, const float *src2, float *dest, float ellapsedTime) { @@ -1767,7 +1767,7 @@ static void IntegrateSpeed(uint count, float *src1, const float *src2, float *de } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::computeMotion() { NL_PS_FUNC(CPSLocated_computeMotion) @@ -1797,7 +1797,7 @@ void CPSLocated::computeMotion() -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::computeNewParticleMotion(uint firstInstanceIndex) { NL_PS_FUNC(CPSLocated_computeNewParticleMotion) @@ -1806,7 +1806,7 @@ void CPSLocated::computeNewParticleMotion(uint firstInstanceIndex) computeCollisions(firstInstanceIndex, &CParticleSystem::_SpawnPos[0], &_Pos[0]); } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::resetCollisions(uint numInstances) { NL_PS_FUNC(CPSLocated_resetCollisions) @@ -1828,7 +1828,7 @@ void CPSLocated::resetCollisions(uint numInstances) } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::updateCollisions() { NL_PS_FUNC(CPSLocated_updateCollisions) @@ -1908,7 +1908,7 @@ void CPSLocated::updateCollisions() } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::doLODDegradation() { NL_PS_FUNC(CPSLocated_doLODDegradation) @@ -1940,7 +1940,7 @@ void CPSLocated::doLODDegradation() CParticleSystem::InsideRemoveLoop = false; } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::step(TPSProcessPass pass) { NL_PS_FUNC(CPSLocated_step) @@ -1989,7 +1989,7 @@ void CPSLocated::step(TPSProcessPass pass) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::updateLife() { NL_PS_FUNC(CPSLocated_updateLife) @@ -2086,7 +2086,7 @@ void CPSLocated::updateLife() } -///*************************************************************************************** +/// *************************************************************************************** // When a particle is deleted, it is replaced by the last particle in the array // if this particle is to be deleted to, must update its new index static inline void removeParticleFromRemoveList(uint indexToRemove, uint arraySize) @@ -2131,7 +2131,7 @@ void checkRemoveArray(uint size) } -///*************************************************************************************** +/// *************************************************************************************** #ifndef NL_DEBUG inline #endif @@ -2150,7 +2150,7 @@ TAnimationTime CPSLocated::computeDateFromCollisionToNextSimStep(uint particleIn return std::max(0.f, result); } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::removeOldParticles() { NL_PS_FUNC(CPSLocated_removeOldParticles) @@ -2360,7 +2360,7 @@ void CPSLocated::removeOldParticles() #endif } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::addNewlySpawnedParticles() { NL_PS_FUNC(CPSLocated_addNewlySpawnedParticles) @@ -2418,7 +2418,7 @@ void CPSLocated::addNewlySpawnedParticles() #endif } -///*************************************************************************************** +/// *************************************************************************************** bool CPSLocated::computeBBox(NLMISC::CAABBox &box) const { NL_PS_FUNC(CPSLocated_computeBBox) @@ -2478,7 +2478,7 @@ bool CPSLocated::computeBBox(NLMISC::CAABBox &box) const /// Setup the driver model matrix. It is set accordingly to the basis used for rendering -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::setupDriverModelMatrix(void) { NL_PS_FUNC(CPSLocated_setupDriverModelMatrix) @@ -2487,7 +2487,7 @@ void CPSLocated::setupDriverModelMatrix(void) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::queryCollisionInfo(void) { NL_PS_FUNC(CPSLocated_queryCollisionInfo) @@ -2509,7 +2509,7 @@ void CPSLocated::queryCollisionInfo(void) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::releaseCollisionInfo(void) { NL_PS_FUNC(CPSLocated_releaseCollisionInfo) @@ -2527,7 +2527,7 @@ void CPSLocated::releaseCollisionInfo(void) -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::registerIntegrableForce(CPSForce *f) { NL_PS_FUNC(CPSLocated_registerIntegrableForce) @@ -2543,7 +2543,7 @@ void CPSLocated::registerIntegrableForce(CPSForce *f) } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::unregisterIntegrableForce(CPSForce *f) { NL_PS_FUNC(CPSLocated_unregisterIntegrableForce) @@ -2559,7 +2559,7 @@ void CPSLocated::unregisterIntegrableForce(CPSForce *f) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::addNonIntegrableForceRef(void) { NL_PS_FUNC(CPSLocated_addNonIntegrableForceRef) @@ -2569,7 +2569,7 @@ void CPSLocated::addNonIntegrableForceRef(void) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::releaseNonIntegrableForceRef(void) { NL_PS_FUNC(CPSLocated_releaseNonIntegrableForceRef) @@ -2580,7 +2580,7 @@ void CPSLocated::releaseNonIntegrableForceRef(void) } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::integrableForceBasisChanged(TPSMatrixMode matrixMode) { NL_PS_FUNC(CPSLocated_integrableForceBasisChanged) @@ -2598,7 +2598,7 @@ void CPSLocated::integrableForceBasisChanged(TPSMatrixMode matrixMode) } -///*************************************************************************************** +/// *************************************************************************************** CPSLocatedBindable *CPSLocated::unbind(uint index) { NL_PS_FUNC(CPSLocated_unbind) @@ -2611,7 +2611,7 @@ CPSLocatedBindable *CPSLocated::unbind(uint index) CHECK_PS_INTEGRITY } -///*************************************************************************************** +/// *************************************************************************************** bool CPSLocated::isBound(const CPSLocatedBindable *lb) const { NL_PS_FUNC(CPSLocated_isBound) @@ -2620,7 +2620,7 @@ bool CPSLocated::isBound(const CPSLocatedBindable *lb) const return it != _LocatedBoundCont.end(); } -///*************************************************************************************** +/// *************************************************************************************** uint CPSLocated::getIndexOf(const CPSLocatedBindable *lb) const { NL_PS_FUNC(CPSLocated_getIndexOf) @@ -2640,14 +2640,14 @@ uint CPSLocated::getIndexOf(const CPSLocatedBindable *lb) const /////////////////////////////////////// -///*************************************************************************************** +/// *************************************************************************************** CPSLocatedBindable::CPSLocatedBindable() : _Owner(NULL), _ExternID(0), _LOD(PSLod1n2), _Active(true) { NL_PS_FUNC(CPSLocatedBindable_CPSLocatedBindable) _Owner = NULL; } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocatedBindable::setOwner(CPSLocated *psl) { NL_PS_FUNC(CPSLocatedBindable_setOwner) @@ -2675,7 +2675,7 @@ void CPSLocatedBindable::setOwner(CPSLocated *psl) } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocatedBindable::finalize(void) { NL_PS_FUNC(CPSLocatedBindable_finalize) @@ -2685,7 +2685,7 @@ void CPSLocatedBindable::finalize(void) } } -///*************************************************************************************** +/// *************************************************************************************** CPSLocatedBindable::~CPSLocatedBindable() { NL_PS_FUNC(CPSLocatedBindable_CPSLocatedBindableDtor) @@ -2698,14 +2698,14 @@ CPSLocatedBindable::~CPSLocatedBindable() } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocatedBindable::notifyTargetRemoved(CPSLocated *ptr) { NL_PS_FUNC(CPSLocatedBindable_notifyTargetRemoved) ptr->unregisterDtorObserver(this); } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { NL_PS_FUNC(CPSLocatedBindable_IStream ) @@ -2742,7 +2742,7 @@ void CPSLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocatedBindable::displayIcon2d(const CVector tab[], uint nbSegs, float scale) { NL_PS_FUNC(CPSLocatedBindable_displayIcon2d) @@ -2796,7 +2796,7 @@ void CPSLocatedBindable::displayIcon2d(const CVector tab[], uint nbSegs, float s } -///*************************************************************************************** +/// *************************************************************************************** CFontManager *CPSLocatedBindable::getFontManager(void) { NL_PS_FUNC(CPSLocatedBindable_getFontManager) @@ -2804,7 +2804,7 @@ CFontManager *CPSLocatedBindable::getFontManager(void) return _Owner->getFontManager(); } -///*************************************************************************************** +/// *************************************************************************************** /// Shortcut to get the font manager if one was set (const version) const CFontManager *CPSLocatedBindable::getFontManager(void) const { @@ -2814,7 +2814,7 @@ const CFontManager *CPSLocatedBindable::getFontManager(void) const } -///*************************************************************************************** +/// *************************************************************************************** // Shortcut to get the matrix of the system const NLMISC::CMatrix &CPSLocatedBindable::getSysMat(void) const { @@ -2823,7 +2823,7 @@ const CFontManager *CPSLocatedBindable::getFontManager(void) const return _Owner->getOwner()->getSysMat(); } - ///*************************************************************************************** + /// *************************************************************************************** /// shortcut to get the inverted matrix of the system const NLMISC::CMatrix &CPSLocatedBindable::getInvertedSysMat(void) const { @@ -2833,7 +2833,7 @@ const NLMISC::CMatrix &CPSLocatedBindable::getInvertedSysMat(void) const } -///*************************************************************************************** +/// *************************************************************************************** /// shortcut to get the view matrix const NLMISC::CMatrix &CPSLocatedBindable::getViewMat(void) const { @@ -2843,7 +2843,7 @@ const NLMISC::CMatrix &CPSLocatedBindable::getViewMat(void) const } -///*************************************************************************************** +/// *************************************************************************************** /// shortcut to get the inverted view matrix const NLMISC::CMatrix &CPSLocatedBindable::getInvertedViewMat(void) const { @@ -2852,7 +2852,7 @@ const NLMISC::CMatrix &CPSLocatedBindable::getInvertedViewMat(void) const return _Owner->getOwner()->getInvertedViewMat(); } -///*************************************************************************************** +/// *************************************************************************************** /// shortcut to setup the model matrix (system basis or world basis) void CPSLocatedBindable::setupDriverModelMatrix(void) { @@ -2861,7 +2861,7 @@ void CPSLocatedBindable::setupDriverModelMatrix(void) _Owner->setupDriverModelMatrix(); } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocatedBindable::setExternID(uint32 id) { NL_PS_FUNC(CPSLocatedBindable_setExternID) @@ -2883,7 +2883,7 @@ void CPSLocatedBindable::setExternID(uint32 id) } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocatedBindable::releaseAllRef() { NL_PS_FUNC(CPSLocatedBindable_releaseAllRef) @@ -2897,7 +2897,7 @@ void CPSLocatedBindable::releaseAllRef() // CPSTargetLocatedBindable implementation // ///////////////////////////////////////////// -///*************************************************************************************** +/// *************************************************************************************** void CPSTargetLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { NL_PS_FUNC(CPSTargetLocatedBindable_serial) @@ -2917,7 +2917,7 @@ void CPSTargetLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } -///*************************************************************************************** +/// *************************************************************************************** void CPSTargetLocatedBindable::attachTarget(CPSLocated *ptr) { NL_PS_FUNC(CPSTargetLocatedBindable_attachTarget) @@ -2939,7 +2939,7 @@ void CPSTargetLocatedBindable::attachTarget(CPSLocated *ptr) } -///*************************************************************************************** +/// *************************************************************************************** void CPSTargetLocatedBindable::notifyTargetRemoved(CPSLocated *ptr) { NL_PS_FUNC(CPSTargetLocatedBindable_notifyTargetRemoved) @@ -2955,7 +2955,7 @@ void CPSTargetLocatedBindable::notifyTargetRemoved(CPSLocated *ptr) // dtor -///*************************************************************************************** +/// *************************************************************************************** void CPSTargetLocatedBindable::finalize(void) { NL_PS_FUNC(CPSTargetLocatedBindable_finalize) @@ -2969,7 +2969,7 @@ void CPSTargetLocatedBindable::finalize(void) CPSLocatedBindable::finalize(); } -///*************************************************************************************** +/// *************************************************************************************** CPSTargetLocatedBindable::~CPSTargetLocatedBindable() { NL_PS_FUNC(CPSTargetLocatedBindable_CPSTargetLocatedBindable) @@ -2980,7 +2980,7 @@ CPSTargetLocatedBindable::~CPSTargetLocatedBindable() } } -///*************************************************************************************** +/// *************************************************************************************** void CPSTargetLocatedBindable::releaseRefTo(const CParticleSystemProcess *other) { NL_PS_FUNC(CPSTargetLocatedBindable_releaseRefTo) @@ -2992,7 +2992,7 @@ void CPSTargetLocatedBindable::releaseRefTo(const CParticleSystemProcess *other) nlassert(std::find(_Targets.begin(), _Targets.end(), other) == _Targets.end()); } -///*************************************************************************************** +/// *************************************************************************************** void CPSTargetLocatedBindable::releaseAllRef() { NL_PS_FUNC(CPSTargetLocatedBindable_releaseAllRef) @@ -3005,7 +3005,7 @@ void CPSTargetLocatedBindable::releaseAllRef() CPSLocatedBindable::releaseAllRef(); } -///*************************************************************************************** +/// *************************************************************************************** uint CPSLocated::getUserMatrixUsageCount() const { NL_PS_FUNC(CPSLocated_getUserMatrixUsageCount) @@ -3017,7 +3017,7 @@ uint CPSLocated::getUserMatrixUsageCount() const return count + CParticleSystemProcess::getUserMatrixUsageCount(); } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::enumTexs(std::vector > &dest, IDriver &drv) { NL_PS_FUNC(CPSLocated_enumTexs) @@ -3027,7 +3027,7 @@ void CPSLocated::enumTexs(std::vector > &dest, IDriv } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::setZBias(float value) { NL_PS_FUNC(CPSLocated_setZBias) @@ -3037,7 +3037,7 @@ void CPSLocated::setZBias(float value) } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::computeCollisions(uint firstInstanceIndex, const NLMISC::CVector *posBefore, const NLMISC::CVector *posAfter) { NL_PS_FUNC(CPSLocated_computeCollisions) @@ -3050,7 +3050,7 @@ void CPSLocated::computeCollisions(uint firstInstanceIndex, const NLMISC::CVecto } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::computeSpawns(uint firstInstanceIndex, bool includeEmitOnce) { NL_PS_FUNC(CPSLocated_computeSpawns) @@ -3084,7 +3084,7 @@ void CPSLocated::computeSpawns(uint firstInstanceIndex, bool includeEmitOnce) } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::computeForces() { NL_PS_FUNC(CPSLocated_computeForces) @@ -3099,7 +3099,7 @@ void CPSLocated::computeForces() } } -///*************************************************************************************** +/// *************************************************************************************** void CPSCollisionInfo::update(const CPSCollisionInfo &other) { NL_PS_FUNC(CPSCollisionInfo_update) @@ -3122,7 +3122,7 @@ void CPSCollisionInfo::update(const CPSCollisionInfo &other) } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::checkLife() const { NL_PS_FUNC(CPSLocated_checkLife) @@ -3136,7 +3136,7 @@ void CPSLocated::checkLife() const } } -///*************************************************************************************** +/// *************************************************************************************** void CPSLocated::onShow(bool shown) { for(TLocatedBoundCont::iterator it = _LocatedBoundCont.begin(); it != _LocatedBoundCont.end(); ++it) diff --git a/code/nel/src/3d/ps_particle_basic.cpp b/code/nel/src/3d/ps_particle_basic.cpp index 1a3fb465d..2f0c4fa36 100644 --- a/code/nel/src/3d/ps_particle_basic.cpp +++ b/code/nel/src/3d/ps_particle_basic.cpp @@ -1126,7 +1126,7 @@ void CPSMultiTexturedParticle::enumTexs(std::vector if (_Texture2) dest.push_back(_Texture2); } -//***************************************************************************************************** +// ***************************************************************************************************** bool CPSMultiTexturedParticle::isAlternateTextureUsed(IDriver &driver) const { NL_PS_FUNC(CPSMultiTexturedParticle_isAlternateTextureUsed) diff --git a/code/nel/src/3d/ps_quad.cpp b/code/nel/src/3d/ps_quad.cpp index 903e5a8d3..e88ce29ed 100644 --- a/code/nel/src/3d/ps_quad.cpp +++ b/code/nel/src/3d/ps_quad.cpp @@ -666,7 +666,7 @@ void CPSQuad::updateMatBeforeRendering(IDriver *drv, CVertexBuffer &vb) } } -//***************************************************************************************************** +// ***************************************************************************************************** void CPSQuad::enumTexs(std::vector > &dest, IDriver &drv) { NL_PS_FUNC(CPSQuad_enumTexs) @@ -674,7 +674,7 @@ void CPSQuad::enumTexs(std::vector > &dest, IDriver CPSMultiTexturedParticle::enumTexs(dest, drv); } -//***************************************************************************************************** +// ***************************************************************************************************** void CPSQuad::setZBias(float value) { NL_PS_FUNC(CPSQuad_setZBias) @@ -682,7 +682,7 @@ void CPSQuad::setZBias(float value) } -//***************************************************************************************************** +// ***************************************************************************************************** void CPSQuad::setTexture(CSmartPtr tex) { NL_PS_FUNC(CPSQuad_setTexture) @@ -690,7 +690,7 @@ void CPSQuad::setTexture(CSmartPtr tex) CPSMultiTexturedParticle::touch(); } -//***************************************************************************************************** +// ***************************************************************************************************** void CPSQuad::setTextureGroup(NLMISC::CSmartPtr texGroup) { NL_PS_FUNC(CPSQuad_setTextureGroup) @@ -698,21 +698,21 @@ void CPSQuad::setTextureGroup(NLMISC::CSmartPtr texGroup) CPSMultiTexturedParticle::touch(); } -//***************************************************************************************************** +// ***************************************************************************************************** void CPSQuad::setTexture2(ITexture *tex) { NL_PS_FUNC(CPSQuad_setTexture2) CPSMultiTexturedParticle::setTexture2(tex); } -//***************************************************************************************************** +// ***************************************************************************************************** void CPSQuad::setTexture2Alternate(ITexture *tex) { NL_PS_FUNC(CPSQuad_setTexture2Alternate) CPSMultiTexturedParticle::setTexture2Alternate(tex); } -//***************************************************************************************************** +// ***************************************************************************************************** void CPSQuad::updateTexWrapMode(IDriver &drv) { NL_PS_FUNC(CPSQuad_updateTexWrapMode) diff --git a/code/nel/src/3d/ps_sound.cpp b/code/nel/src/3d/ps_sound.cpp index 0eecfe5dc..e2366708a 100644 --- a/code/nel/src/3d/ps_sound.cpp +++ b/code/nel/src/3d/ps_sound.cpp @@ -29,7 +29,7 @@ namespace NL3D static const uint SoundBufSize = 1024; -//*************************************************************************************************** +// *************************************************************************************************** CPSSound::CPSSound() : _Gain(1.f), _GainScheme(NULL), _Pitch(1.f), @@ -46,7 +46,7 @@ CPSSound::CPSSound() : _Gain(1.f), _SoundName = NLMISC::CStringMapper::emptyId(); } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::stopSound() { NL_PS_FUNC(CPSSound_stopSound) @@ -67,7 +67,7 @@ void CPSSound::stopSound() _SoundStopped = true; } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::reactivateSound() { NL_PS_FUNC(CPSSound_reactivateSound) @@ -75,7 +75,7 @@ void CPSSound::reactivateSound() _SoundReactivated = true; } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::removeAllSources(void) { NL_PS_FUNC(CPSSound_removeAllSources) @@ -87,7 +87,7 @@ void CPSSound::removeAllSources(void) } } -//*************************************************************************************************** +// *************************************************************************************************** CPSSound::~CPSSound() { NL_PS_FUNC(CPSSound_CPSSound) @@ -96,7 +96,7 @@ CPSSound::~CPSSound() delete _PitchScheme; } -//*************************************************************************************************** +// *************************************************************************************************** uint32 CPSSound::getType(void) const { NL_PS_FUNC(CPSSound_getType) @@ -105,7 +105,7 @@ uint32 CPSSound::getType(void) const -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::step(TPSProcessPass pass) { NL_PS_FUNC(CPSSound_step) @@ -212,7 +212,7 @@ void CPSSound::step(TPSProcessPass pass) while (leftToDo); } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::setGain(float Gain) { NL_PS_FUNC(CPSSound_setGain) @@ -221,7 +221,7 @@ void CPSSound::setGain(float Gain) _Gain = Gain; } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::setGainScheme(CPSAttribMaker *Gain) { NL_PS_FUNC(CPSSound_setGainScheme) @@ -233,7 +233,7 @@ void CPSSound::setGainScheme(CPSAttribMaker *Gain) } } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::setPitch(float pitch) { NL_PS_FUNC(CPSSound_setPitch) @@ -242,7 +242,7 @@ void CPSSound::setPitch(float pitch) _Pitch = pitch; } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::setPitchScheme(CPSAttribMaker *pitch) { NL_PS_FUNC(CPSSound_setPitchScheme) @@ -254,7 +254,7 @@ void CPSSound::setPitchScheme(CPSAttribMaker *pitch) } } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { NL_PS_FUNC(CPSSound_serial) @@ -366,7 +366,7 @@ void CPSSound::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::newElement(const CPSEmitterInfo &info) { NL_PS_FUNC(CPSSound_newElement) @@ -414,7 +414,7 @@ void CPSSound::newElement(const CPSEmitterInfo &info) } } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::deleteElement(uint32 index) { NL_PS_FUNC(CPSSound_deleteElement) @@ -428,7 +428,7 @@ void CPSSound::deleteElement(uint32 index) _Sounds.remove(index); } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::resize(uint32 size) { NL_PS_FUNC(CPSSound_resize) @@ -450,7 +450,7 @@ void CPSSound::resize(uint32 size) _Sounds.resize(size); } -//*************************************************************************************************** +// *************************************************************************************************** void CPSSound::setUseOriginalPitchFlag(bool useOriginalPitch) { NL_PS_FUNC(CPSSound_setUseOriginalPitchFlag) diff --git a/code/nel/src/3d/register_3d.cpp b/code/nel/src/3d/register_3d.cpp index 4858ea1a3..6f09aa8e1 100644 --- a/code/nel/src/3d/register_3d.cpp +++ b/code/nel/src/3d/register_3d.cpp @@ -50,7 +50,7 @@ namespace NL3D { -//**************************************************************************** +// **************************************************************************** void registerSerial3d() { static bool bInitialized=false; diff --git a/code/nel/src/3d/texture_blend.cpp b/code/nel/src/3d/texture_blend.cpp index b0130be5e..d3ae19e96 100644 --- a/code/nel/src/3d/texture_blend.cpp +++ b/code/nel/src/3d/texture_blend.cpp @@ -28,14 +28,14 @@ CTextureBlend::CTextureBlend() : _BlendFactor(0), _SharingEnabled(true) } -//************************************************************************ +// ************************************************************************ bool CTextureBlend::supportSharing() const { return _BlendTex[0] && _BlendTex[0]->supportSharing() && _BlendTex[1] && _BlendTex[1]->supportSharing(); } -//************************************************************************ +// ************************************************************************ std::string CTextureBlend::getShareName() const { nlassert(supportSharing()); @@ -48,14 +48,14 @@ std::string CTextureBlend::getShareName() const } -//************************************************************************ +// ************************************************************************ void CTextureBlend::enableSharing(bool enabled /*= false*/) { _SharingEnabled = enabled; } -//************************************************************************ +// ************************************************************************ void CTextureBlend::release() { if (_BlendTex[0] && _BlendTex[0]->getReleasable()) _BlendTex[0]->release(); @@ -63,7 +63,7 @@ void CTextureBlend::release() ITexture::release(); } -//************************************************************************ +// ************************************************************************ bool CTextureBlend::setBlendFactor(uint16 factor) { nlassert(factor <= 256); @@ -77,7 +77,7 @@ bool CTextureBlend::setBlendFactor(uint16 factor) } -//************************************************************************ +// ************************************************************************ void CTextureBlend::setBlendTexture(uint index, ITexture *tex) { nlassert(index < 2); @@ -89,7 +89,7 @@ void CTextureBlend::setBlendTexture(uint index, ITexture *tex) } -//************************************************************************ +// ************************************************************************ void CTextureBlend::doGenerate(bool async) { if (!_BlendTex[0] || !_BlendTex[1]) @@ -107,7 +107,7 @@ void CTextureBlend::doGenerate(bool async) } -//************************************************************************ +// ************************************************************************ void CTextureBlend::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialVersion(0); diff --git a/code/nel/src/3d/texture_emboss.cpp b/code/nel/src/3d/texture_emboss.cpp index 3168bdce8..6068ff0d3 100644 --- a/code/nel/src/3d/texture_emboss.cpp +++ b/code/nel/src/3d/texture_emboss.cpp @@ -19,7 +19,7 @@ namespace NL3D { -//*********************************************************************************************************** +// *********************************************************************************************************** CTextureEmboss::CTextureEmboss() : _Ambient(CRGBA::Black), _Diffuse(CRGBA::White), _DisableSharing(false), @@ -30,7 +30,7 @@ CTextureEmboss::CTextureEmboss() : _Ambient(CRGBA::Black), } -//*********************************************************************************************************** +// *********************************************************************************************************** void CTextureEmboss::setHeightMap(ITexture *heightMap) { if (heightMap != _HeightMap) @@ -40,7 +40,7 @@ void CTextureEmboss::setHeightMap(ITexture *heightMap) } } -//*********************************************************************************************************** +// *********************************************************************************************************** void CTextureEmboss::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialVersion(0); @@ -63,20 +63,20 @@ void CTextureEmboss::serial(NLMISC::IStream &f) throw(NLMISC::EStream) f.serial(_DisableSharing); } -//*********************************************************************************************************** +// *********************************************************************************************************** bool CTextureEmboss::supportSharing() const { return !_DisableSharing && _HeightMap && _HeightMap->supportSharing(); } -//*********************************************************************************************************** +// *********************************************************************************************************** std::string CTextureEmboss::getShareName() const { nlassert(supportSharing()); return "Emboss:" + _HeightMap->getShareName(); } -//*********************************************************************************************************** +// *********************************************************************************************************** void CTextureEmboss::release() { ITexture::release(); @@ -89,7 +89,7 @@ void CTextureEmboss::release() } } -//*********************************************************************************************************** +// *********************************************************************************************************** void CTextureEmboss::doGenerate(bool /* async */) { if (!_HeightMap) diff --git a/code/nel/src/3d/visual_collision_entity_user.cpp b/code/nel/src/3d/visual_collision_entity_user.cpp index 7d9f10f14..965ddc0e2 100644 --- a/code/nel/src/3d/visual_collision_entity_user.cpp +++ b/code/nel/src/3d/visual_collision_entity_user.cpp @@ -33,7 +33,7 @@ H_AUTO_DECL( NL3D_Misc_VisualCollisionEntity_GetLight ) #define NL3D_HAUTO_LIGHT_VCE H_AUTO_USE( NL3D_Misc_VisualCollisionEntity_GetLight ) -//**************************************************************************** +// **************************************************************************** bool CVisualCollisionEntityUser::snapToGround(CVector &pos) { NL3D_HAUTO_SNAP_VCE; diff --git a/code/nel/src/3d/water_env_map.cpp b/code/nel/src/3d/water_env_map.cpp index 364e3068f..59b5f6725 100644 --- a/code/nel/src/3d/water_env_map.cpp +++ b/code/nel/src/3d/water_env_map.cpp @@ -59,7 +59,7 @@ static uint32 inline getFVBVertex(uint section, uint side) const uint NUM_FACES_TO_RENDER = 5; -//******************************************************************************* +// ******************************************************************************* CWaterEnvMap::CWaterEnvMap() { _UpdateTime = 0; @@ -73,7 +73,7 @@ CWaterEnvMap::CWaterEnvMap() _Alpha = 255; } -//******************************************************************************* +// ******************************************************************************* void CWaterEnvMap::init(uint cubeMapSize, uint projection2DSize, TGlobalAnimationTime updateTime, IDriver &driver) { // Allocate cube map @@ -154,7 +154,7 @@ void CWaterEnvMap::init(uint cubeMapSize, uint projection2DSize, TGlobalAnimatio _Env2DSize = projection2DSize; } -//******************************************************************************* +// ******************************************************************************* void CWaterEnvMap::update(TGlobalAnimationTime time, IDriver &driver) { if (_LastRenderTime == time) return; @@ -206,7 +206,7 @@ void CWaterEnvMap::update(TGlobalAnimationTime time, IDriver &driver) driver.setRenderTarget(NULL); } -//******************************************************************************* +// ******************************************************************************* void CWaterEnvMap::doInit() { if (!_FlattenVBInitialized) @@ -241,7 +241,7 @@ static CVertexProgram testMeshVP( -//******************************************************************************* +// ******************************************************************************* void CWaterEnvMap::renderTestMesh(IDriver &driver) { doInit(); @@ -269,7 +269,7 @@ void CWaterEnvMap::renderTestMesh(IDriver &driver) driver.activeVertexProgram(NULL); } -//******************************************************************************* +// ******************************************************************************* void CWaterEnvMap::initFlattenVB() { _FlattenVB.setPreferredMemory(CVertexBuffer::AGPPreferred, true); @@ -336,7 +336,7 @@ void CWaterEnvMap::initFlattenVB() } } -//******************************************************************************* +// ******************************************************************************* void CWaterEnvMap::invalidate() { _LastRenderTime = -1; @@ -352,7 +352,7 @@ void CWaterEnvMap::invalidate() _NumRenderedFaces = 0; } -//******************************************************************************* +// ******************************************************************************* void CWaterEnvMap::initTestVB() { _TestVB.setPreferredMemory(CVertexBuffer::AGPPreferred, true); diff --git a/code/nel/src/3d/water_env_map_user.cpp b/code/nel/src/3d/water_env_map_user.cpp index 403ee10b0..84adf3bee 100644 --- a/code/nel/src/3d/water_env_map_user.cpp +++ b/code/nel/src/3d/water_env_map_user.cpp @@ -25,7 +25,7 @@ namespace NL3D // CWaterEnvMapUser // ////////////////////// -//*********************************************************************************** +// *********************************************************************************** void CWaterEnvMapUser::init(uint cubeMapSize, uint projection2DSize, TGlobalAnimationTime updateTime) { EnvMap.init(cubeMapSize, projection2DSize, updateTime, *(EnvMap.Driver->getDriver())); @@ -36,7 +36,7 @@ void CWaterEnvMapUser::init(uint cubeMapSize, uint projection2DSize, TGlobalAnim ////////////////////////////// -//*********************************************************************************** +// *********************************************************************************** void CWaterEnvMapRenderHelper::render(TFace face, TGlobalAnimationTime time, UDriver &drv) { CMatrix mat; @@ -61,7 +61,7 @@ void CWaterEnvMapRenderHelper::render(TFace face, TGlobalAnimationTime time, UDr // CWaterEnvMapRenderFromUScene // ////////////////////////////////// -//*********************************************************************************** +// *********************************************************************************** CWaterEnvMapRenderFromUScene::CWaterEnvMapRenderFromUScene() { _Scene = NULL; @@ -70,7 +70,7 @@ CWaterEnvMapRenderFromUScene::CWaterEnvMapRenderFromUScene() _RenderPart = UScene::RenderAll; } -//*********************************************************************************** +// *********************************************************************************** void CWaterEnvMapRenderFromUScene::setScene(UScene *scene, UCamera cam) { _Scene = scene; @@ -82,7 +82,7 @@ void CWaterEnvMapRenderFromUScene::setScene(UScene *scene, UCamera cam) } -//*********************************************************************************** +// *********************************************************************************** void CWaterEnvMapRenderFromUScene::doRender(const CMatrix &camMatrix, TGlobalAnimationTime time, UDriver &drv) { if (!_Scene) return; @@ -108,7 +108,7 @@ void CWaterEnvMapRenderFromUScene::doRender(const CMatrix &camMatrix, TGlobalAni postRender(time, drv); } -//*********************************************************************************** +// *********************************************************************************** void CWaterEnvMapUser::invalidate() { EnvMap.invalidate(); diff --git a/code/nel/src/3d/water_height_map.cpp b/code/nel/src/3d/water_height_map.cpp index caaf4ba76..f230ce57b 100644 --- a/code/nel/src/3d/water_height_map.cpp +++ b/code/nel/src/3d/water_height_map.cpp @@ -699,7 +699,7 @@ void CWaterHeightMap::serial(NLMISC::IStream &f) throw(NLMISC::EStream) -//*** perform a bilinear on 4 values +// *** perform a bilinear on 4 values // 0---1 // | | // 3---2 diff --git a/code/nel/src/3d/water_model.cpp b/code/nel/src/3d/water_model.cpp index f7dd19e55..95af19e7c 100644 --- a/code/nel/src/3d/water_model.cpp +++ b/code/nel/src/3d/water_model.cpp @@ -208,7 +208,7 @@ static void inline FillWaterVB(uint8 *&vbPointer, float x, float y, float z, flo } */ -//*************************************************************************************************************** +// *************************************************************************************************************** /* #ifdef NL_OS_WINDOWS __forceinline @@ -331,7 +331,7 @@ static void SetupWaterVertex( sint qLeft, */ -//***************************************************************************************************** +// ***************************************************************************************************** /* static void DrawPoly2D(CVertexBuffer &vb, IDriver *drv, const NLMISC::CMatrix &mat, const NLMISC::CPolygon &p) { @@ -366,7 +366,7 @@ static void DrawPoly2D(CVertexBuffer &vb, IDriver *drv, const NLMISC::CMatrix &m */ -//*************************************************************************************************************** +// *************************************************************************************************************** /* void CWaterModel::traverseRender() { @@ -740,9 +740,9 @@ void CWaterModel::traverseRender() } */ -//*********************** +// *********************** // Water MATERIAL SETUP // -//*********************** +// *********************** /* void CWaterModel::setupMaterialNVertexShader(IDriver *drv, CWaterShape *shape, const NLMISC::CVector &obsPos, bool above, float maxDist, float zHeight) { @@ -1169,7 +1169,7 @@ void CWaterModel::computeClippedPoly() _ClippedPoly.clip(tp); } -//*********************************************************************************************************** +// *********************************************************************************************************** void CWaterModel::unlink() { if (!_Prev) @@ -1186,7 +1186,7 @@ void CWaterModel::unlink() _Prev = NULL; } -//*********************************************************************************************************** +// *********************************************************************************************************** void CWaterModel::link() { nlassert(_Next == NULL); @@ -1204,7 +1204,7 @@ void CWaterModel::link() -//*********************************************************************************************************** +// *********************************************************************************************************** uint CWaterModel::getNumWantedVertices() { H_AUTO( NL3D_Water_Render ); @@ -1359,7 +1359,7 @@ uint CWaterModel::getNumWantedVertices() return totalNumVertices; } -//*********************************************************************************************************** +// *********************************************************************************************************** uint CWaterModel::fillVB(void *datas, uint startTri, IDriver &drv) { H_AUTO( NL3D_Water_Render ); @@ -1416,7 +1416,7 @@ void computeWaterVertexSoft(float px, float py, CVector &pos, CVector2f &envMapT } } -//*********************************************************************************************************** +// *********************************************************************************************************** uint CWaterModel::fillVBSoft(void *datas, uint startTri) { _StartTri = (uint32) startTri; @@ -1531,7 +1531,7 @@ void computeWaterVertexHard(float px, float py, CVector &pos, const CVector &cam pos.z = 0.f; } -//*********************************************************************************************************** +// *********************************************************************************************************** uint CWaterModel::fillVBHard(void *datas, uint startTri) { _StartTri = (uint32) startTri; @@ -1609,7 +1609,7 @@ uint CWaterModel::fillVBHard(void *datas, uint startTri) -//*************************************************************************************************************** +// *************************************************************************************************************** void CWaterModel::traverseRender() { H_AUTO( NL3D_Water_Render ); @@ -1677,7 +1677,7 @@ void CWaterModel::traverseRender() -//*********************************************************************************************************** +// *********************************************************************************************************** bool CWaterModel::clip() { H_AUTO( NL3D_Water_Render ); @@ -1707,7 +1707,7 @@ struct CSimpleVertexInfo }; */ -//*********************************************************************************************************** +// *********************************************************************************************************** /* void CWaterModel::doSimpleRender(IDriver *drv) { @@ -1915,7 +1915,7 @@ void CWaterModel::doSimpleRender(IDriver *drv) } */ -//*********************************************************************************************************** +// *********************************************************************************************************** void CWaterModel::updateDiffuseMapMatrix(bool force /* = false*/) { if (compareMatrixDate(_MatrixUpdateDate) ||force) diff --git a/code/nel/src/misc/contiguous_block_allocator.cpp b/code/nel/src/misc/contiguous_block_allocator.cpp index 725d81de8..77986fa7b 100644 --- a/code/nel/src/misc/contiguous_block_allocator.cpp +++ b/code/nel/src/misc/contiguous_block_allocator.cpp @@ -20,7 +20,7 @@ namespace NLMISC { -//********************************************************************************************************* +// ********************************************************************************************************* CContiguousBlockAllocator::CContiguousBlockAllocator() { _BlockStart = NULL; @@ -33,13 +33,13 @@ CContiguousBlockAllocator::CContiguousBlockAllocator() #endif } -//********************************************************************************************************* +// ********************************************************************************************************* CContiguousBlockAllocator::~CContiguousBlockAllocator() { init(0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CContiguousBlockAllocator::init(uint numBytes /*=0*/) { if (_BlockStart) _DefaultAlloc.deallocate(_BlockStart, _BlockEnd - _BlockStart); @@ -60,7 +60,7 @@ void CContiguousBlockAllocator::init(uint numBytes /*=0*/) #endif } -//********************************************************************************************************* +// ********************************************************************************************************* void *CContiguousBlockAllocator::alloc(uint numBytes) { if (numBytes == 0) return NULL; @@ -84,7 +84,7 @@ void *CContiguousBlockAllocator::alloc(uint numBytes) return _DefaultAlloc.allocate(numBytes); } -//********************************************************************************************************* +// ********************************************************************************************************* void CContiguousBlockAllocator::free(void *block, uint numBytes) { if (!block) return; diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp index 93cb5be2c..4f4e0866a 100644 --- a/code/nel/src/misc/displayer.cpp +++ b/code/nel/src/misc/displayer.cpp @@ -230,7 +230,7 @@ void CStdDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mess printf ("%s", str.c_str()); if (!args.CallstackAndLog.empty()) - printf (args.CallstackAndLog.c_str()); + printf ("%s", args.CallstackAndLog.c_str()); fflush(stdout); } diff --git a/code/nel/src/misc/dummy_window.cpp b/code/nel/src/misc/dummy_window.cpp index 51e682dae..4c285de25 100644 --- a/code/nel/src/misc/dummy_window.cpp +++ b/code/nel/src/misc/dummy_window.cpp @@ -31,12 +31,12 @@ static LRESULT CALLBACK nlDefaultWinProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP } -//*************************************************************** +// *************************************************************** CDummyWindow::CDummyWindow() : _HWnd(NULL) { } -//*************************************************************** +// *************************************************************** bool CDummyWindow::init(HINSTANCE hInstance, WNDPROC winProc) { release(); @@ -72,7 +72,7 @@ bool CDummyWindow::init(HINSTANCE hInstance, WNDPROC winProc) return false; } -//*************************************************************** +// *************************************************************** void CDummyWindow::release() { if (_HWnd) @@ -82,7 +82,7 @@ void CDummyWindow::release() } } -//*************************************************************** +// *************************************************************** CDummyWindow::~CDummyWindow() { release(); diff --git a/code/nel/src/misc/fixed_size_allocator.cpp b/code/nel/src/misc/fixed_size_allocator.cpp index 387b9ba6c..c182f81ce 100644 --- a/code/nel/src/misc/fixed_size_allocator.cpp +++ b/code/nel/src/misc/fixed_size_allocator.cpp @@ -21,7 +21,7 @@ namespace NLMISC { -//***************************************************************************************************************** +// ***************************************************************************************************************** CFixedSizeAllocator::CFixedSizeAllocator(uint numBytesPerBlock, uint numBlockPerChunk) { _FreeSpace = NULL; @@ -32,7 +32,7 @@ CFixedSizeAllocator::CFixedSizeAllocator(uint numBytesPerBlock, uint numBlockPer _NumAlloc = 0; } -//***************************************************************************************************************** +// ***************************************************************************************************************** CFixedSizeAllocator::~CFixedSizeAllocator() { if (_NumAlloc != 0) @@ -50,7 +50,7 @@ CFixedSizeAllocator::~CFixedSizeAllocator() } } -//***************************************************************************************************************** +// ***************************************************************************************************************** void *CFixedSizeAllocator::alloc() { if (!_FreeSpace) @@ -62,7 +62,7 @@ void *CFixedSizeAllocator::alloc() return _FreeSpace->unlink(); } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CFixedSizeAllocator::free(void *block) { if (!block) return; @@ -76,20 +76,20 @@ void CFixedSizeAllocator::free(void *block) node->link(); } -//***************************************************************************************************************** +// ***************************************************************************************************************** uint CFixedSizeAllocator::CChunk::getBlockSizeWithOverhead() const { return std::max((uint)(sizeof(CNode) - offsetof(CNode, Next)),(uint)(Allocator->getNumBytesPerBlock())) + offsetof(CNode, Next); } -//***************************************************************************************************************** +// ***************************************************************************************************************** CFixedSizeAllocator::CChunk::CChunk() { NumFreeObjs = 0; Allocator = NULL; } -//***************************************************************************************************************** +// ***************************************************************************************************************** CFixedSizeAllocator::CChunk::~CChunk() { nlassert(Allocator != NULL); @@ -103,7 +103,7 @@ CFixedSizeAllocator::CChunk::~CChunk() delete Mem; } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CFixedSizeAllocator::CChunk::init(CFixedSizeAllocator *alloc) { nlassert(!Allocator); @@ -134,7 +134,7 @@ void CFixedSizeAllocator::CChunk::init(CFixedSizeAllocator *alloc) ++(alloc->_NumChunks); } -//***************************************************************************************************************** +// ***************************************************************************************************************** CFixedSizeAllocator::CNode &CFixedSizeAllocator::CChunk::getNode(uint index) { nlassert(Allocator != NULL); @@ -142,7 +142,7 @@ CFixedSizeAllocator::CNode &CFixedSizeAllocator::CChunk::getNode(uint index) return *(CNode *) ((uint8 *) Mem + index * getBlockSizeWithOverhead()); } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CFixedSizeAllocator::CChunk::add() { nlassert(Allocator); @@ -158,7 +158,7 @@ void CFixedSizeAllocator::CChunk::add() } } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CFixedSizeAllocator::CChunk::grab() { // a node of this chunk has been given back @@ -166,7 +166,7 @@ void CFixedSizeAllocator::CChunk::grab() -- NumFreeObjs; } -//***************************************************************************************************************** +// ***************************************************************************************************************** void *CFixedSizeAllocator::CNode::unlink() { nlassert(Prev != NULL); @@ -177,7 +177,7 @@ void *CFixedSizeAllocator::CNode::unlink() return (void *) &Next; } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CFixedSizeAllocator::CNode::link() { // destroy the obj to get back uninitialized memory diff --git a/code/nel/src/misc/grid_traversal.cpp b/code/nel/src/misc/grid_traversal.cpp index 0f23da364..e55ea9a58 100644 --- a/code/nel/src/misc/grid_traversal.cpp +++ b/code/nel/src/misc/grid_traversal.cpp @@ -22,14 +22,14 @@ namespace NLMISC { -//******************************************************************************************************************************** +// ******************************************************************************************************************************** void CGridTraversal::startTraverse(const NLMISC::CVector2f &start, sint &nextX, sint &nextY) { nextX = (sint) floorf(start.x); nextY = (sint) floorf(start.y); } -//******************************************************************************************************************************** +// ******************************************************************************************************************************** bool CGridTraversal::traverse(const NLMISC::CVector2f &start, const NLMISC::CVector2f &dir, sint &x, sint &y) { if (dir.x > 0.f) diff --git a/code/nel/src/misc/inter_window_msg_queue.cpp b/code/nel/src/misc/inter_window_msg_queue.cpp index fa63c9069..abdb84338 100644 --- a/code/nel/src/misc/inter_window_msg_queue.cpp +++ b/code/nel/src/misc/inter_window_msg_queue.cpp @@ -33,13 +33,13 @@ namespace NLMISC - //************************************************************************************************** + // ************************************************************************************************** //////////////////////////////////////// // CInterWindowMsgQueue::CProtagonist // //////////////////////////////////////// - //************************************************************************************************** + // ************************************************************************************************** CInterWindowMsgQueue::CProtagonist::CProtagonist() : _Id(0), _Wnd(0), _SharedMemMutex(0), @@ -48,13 +48,13 @@ namespace NLMISC } - //************************************************************************************************** + // ************************************************************************************************** CInterWindowMsgQueue::CProtagonist::~CProtagonist() { release(); } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::CProtagonist::release() { CloseHandle(_SharedMemMutex); @@ -69,7 +69,7 @@ namespace NLMISC // unhook window } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::CProtagonist::acquireSMMutex() { nlassert(_SharedMemMutex); @@ -77,14 +77,14 @@ namespace NLMISC nlassert(result != WAIT_FAILED); } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::CProtagonist::releaseSMMutex() { nlassert(_SharedMemMutex); ReleaseMutex(_SharedMemMutex); } - //************************************************************************************************** + // ************************************************************************************************** bool CInterWindowMsgQueue::CProtagonist::init(uint32 id) { nlassert(id != 0); @@ -98,7 +98,7 @@ namespace NLMISC return true; } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::CProtagonist::setWnd(HWND wnd) { nlassert(wnd != 0); @@ -114,7 +114,7 @@ namespace NLMISC _Wnd = wnd; } - //************************************************************************************************** + // ************************************************************************************************** HWND CInterWindowMsgQueue::CProtagonist::getWnd() { if (!_SharedMemMutex) @@ -145,20 +145,20 @@ namespace NLMISC } - //************************************************************************************************** + // ************************************************************************************************** ///////////////////////////////////// // CInterWindowMsgQueue::CSendTask // ///////////////////////////////////// - //************************************************************************************************** + // ************************************************************************************************** CInterWindowMsgQueue::CSendTask::CSendTask(CInterWindowMsgQueue *parent) : _StopAsked(false) { nlassert(parent); _Parent = parent; } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::CSendTask::run() { while(!_StopAsked) @@ -209,39 +209,39 @@ namespace NLMISC } } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::CSendTask::stop() { _StopAsked = true; } - //************************************************************************************************** + // ************************************************************************************************** ////////////////////////// // CInterWindowMsgQueue // ////////////////////////// - //************************************************************************************************** + // ************************************************************************************************** CInterWindowMsgQueue::CInterWindowMsgQueue() : _SendTask(NULL), _SendThread(NULL), _OutMessageQueue("CInterWindowMsgQueue::_OutMessageQueue") { } - //************************************************************************************************** + // ************************************************************************************************** bool CInterWindowMsgQueue::init(HWND ownerWindow, uint32 localId, uint32 foreignId) { return initInternal(NULL, ownerWindow, localId, foreignId); } - //************************************************************************************************** + // ************************************************************************************************** bool CInterWindowMsgQueue::init(HINSTANCE hInstance, uint32 localId, uint32 foreignId) { return initInternal(hInstance, NULL, localId, foreignId); } - //************************************************************************************************** + // ************************************************************************************************** bool CInterWindowMsgQueue::initInternal(HINSTANCE hInstance, HWND ownerWindow, uint32 localId, uint32 foreignId) { if (!ownerWindow) @@ -307,7 +307,7 @@ namespace NLMISC return true; } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::release() { if (_LocalWindow.getWnd() != 0) @@ -458,13 +458,13 @@ namespace NLMISC return DefWindowProc(hwnd, uMsg, wParam, lParam); } - //************************************************************************************************** + // ************************************************************************************************** CInterWindowMsgQueue::~CInterWindowMsgQueue() { release(); } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::clearOutQueue() { CSynchronized::CAccessor outMessageQueue(&_OutMessageQueue); @@ -474,7 +474,7 @@ namespace NLMISC } } - //************************************************************************************************** + // ************************************************************************************************** void CInterWindowMsgQueue::sendMessage(CMemStream &msg) { if (!msg.isReading()) @@ -491,7 +491,7 @@ namespace NLMISC } - //************************************************************************************************** + // ************************************************************************************************** bool CInterWindowMsgQueue::pumpMessage(CMemStream &dest) { if (_InMessageQueue.empty()) return false; @@ -509,20 +509,20 @@ namespace NLMISC return true; } - //************************************************************************************************** + // ************************************************************************************************** bool CInterWindowMsgQueue::connected() const { return const_cast(_ForeignWindow).getWnd() != NULL; } - //************************************************************************************************** + // ************************************************************************************************** uint CInterWindowMsgQueue::getSendQueueSize() const { CSynchronized::CAccessor outMessageQueue(&const_cast &>(_OutMessageQueue)); return (uint)outMessageQueue.value().size(); } - //************************************************************************************************** + // ************************************************************************************************** uint CInterWindowMsgQueue::getReceiveQueueSize() const { return (uint)_InMessageQueue.size(); diff --git a/code/nel/src/misc/mouse_smoother.cpp b/code/nel/src/misc/mouse_smoother.cpp index cc6afb06d..43821149a 100644 --- a/code/nel/src/misc/mouse_smoother.cpp +++ b/code/nel/src/misc/mouse_smoother.cpp @@ -20,7 +20,7 @@ namespace NLMISC { -//******************************************************************************************* +// ******************************************************************************************* /// build some hermite spline value, with the given points and tangents static inline void BuildHermiteVector(const NLMISC::CVector2f &P0, const NLMISC::CVector2f &P1, @@ -41,7 +41,7 @@ static inline void BuildHermiteVector(const NLMISC::CVector2f &P0, h1 * P0.y + h2 * P1.y + h3 * T0.y + h4 * T1.y); } -//******************************************************************************************* +// ******************************************************************************************* CMouseSmoother::CMouseSmoother(double samplingPeriod /*=0.2f*/) { nlassert(samplingPeriod > 0); @@ -50,7 +50,7 @@ CMouseSmoother::CMouseSmoother(double samplingPeriod /*=0.2f*/) } -//******************************************************************************************* +// ******************************************************************************************* void CMouseSmoother::setSamplingPeriod(double period) { if (period == _SamplingPeriod) return; @@ -60,7 +60,7 @@ void CMouseSmoother::setSamplingPeriod(double period) } -//******************************************************************************************* +// ******************************************************************************************* NLMISC::CVector2f CMouseSmoother::samplePos(const CVector2f &wantedPos, double date) { if (!_Init) @@ -124,7 +124,7 @@ NLMISC::CVector2f CMouseSmoother::samplePos(const CVector2f &wantedPos, double d return result; } -//******************************************************************************************* +// ******************************************************************************************* void CMouseSmoother::reset() { _Init = false; diff --git a/code/nel/src/misc/object_arena_allocator.cpp b/code/nel/src/misc/object_arena_allocator.cpp index 1876f6417..385e0dedb 100644 --- a/code/nel/src/misc/object_arena_allocator.cpp +++ b/code/nel/src/misc/object_arena_allocator.cpp @@ -25,7 +25,7 @@ namespace NLMISC CObjectArenaAllocator *CObjectArenaAllocator::_DefaultAllocator = NULL; -//***************************************************************************************************************** +// ***************************************************************************************************************** CObjectArenaAllocator::CObjectArenaAllocator(uint maxAllocSize, uint granularity /* = 4*/) { nlassert(granularity > 0); @@ -40,7 +40,7 @@ CObjectArenaAllocator::CObjectArenaAllocator(uint maxAllocSize, uint granularity #endif } -//***************************************************************************************************************** +// ***************************************************************************************************************** CObjectArenaAllocator::~CObjectArenaAllocator() { for(uint k = 0; k < _ObjectSizeToAllocator.size(); ++k) @@ -49,7 +49,7 @@ CObjectArenaAllocator::~CObjectArenaAllocator() } } -//***************************************************************************************************************** +// ***************************************************************************************************************** void *CObjectArenaAllocator::alloc(uint size) { #ifdef NL_DEBUG @@ -90,7 +90,7 @@ void *CObjectArenaAllocator::alloc(uint size) return (void *) ((uint8 *) block + sizeof(uint)); } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CObjectArenaAllocator::free(void *block) { if (!block) return; @@ -127,7 +127,7 @@ void CObjectArenaAllocator::free(void *block) #endif } -//***************************************************************************************************************** +// ***************************************************************************************************************** uint CObjectArenaAllocator::getNumAllocatedBlocks() const { uint numObjs = 0; @@ -138,7 +138,7 @@ uint CObjectArenaAllocator::getNumAllocatedBlocks() const return numObjs; } -//***************************************************************************************************************** +// ***************************************************************************************************************** CObjectArenaAllocator &CObjectArenaAllocator::getDefaultAllocator() { if (!_DefaultAllocator) @@ -151,7 +151,7 @@ CObjectArenaAllocator &CObjectArenaAllocator::getDefaultAllocator() #ifdef NL_DEBUG -//***************************************************************************************************************** +// ***************************************************************************************************************** void CObjectArenaAllocator::dumpUnreleasedBlocks() { for(std::map::iterator it = _MemBlockToAllocID.begin(); it != _MemBlockToAllocID.end(); ++it) @@ -160,7 +160,7 @@ void CObjectArenaAllocator::dumpUnreleasedBlocks() } } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CObjectArenaAllocator::setBreakForAllocID(bool enabled, uint id) { _WantBreakOnAlloc = enabled; diff --git a/code/nel/src/misc/win_thread.cpp b/code/nel/src/misc/win_thread.cpp index 2655d4ddc..4192e927b 100644 --- a/code/nel/src/misc/win_thread.cpp +++ b/code/nel/src/misc/win_thread.cpp @@ -301,7 +301,7 @@ bool CWinProcess::setCPUMask(uint64 mask) return SetProcessAffinityMask((HANDLE)_ProcessHandle, processAffinityMask)!=0; } -//**************************************************************************************************************** +// **************************************************************************************************************** /** * Simple wrapper around the PSAPI library * \author Nicolas Vizerie @@ -327,7 +327,7 @@ private: bool _LoadFailed; }; -//**************************************************************************************************************** +// **************************************************************************************************************** CPSAPILib::CPSAPILib() { _LoadFailed = false; @@ -337,7 +337,7 @@ CPSAPILib::CPSAPILib() EnumProcessModules = NULL; } -//**************************************************************************************************************** +// **************************************************************************************************************** CPSAPILib::~CPSAPILib() { if (_PSAPILibHandle) @@ -346,7 +346,7 @@ CPSAPILib::~CPSAPILib() } } -//**************************************************************************************************************** +// **************************************************************************************************************** bool CPSAPILib::init() { // @@ -381,7 +381,7 @@ static CPSAPILib PSAPILib; -//**************************************************************************************************************** +// **************************************************************************************************************** bool CWinProcess::enumProcessesId(std::vector &processesId) { if (!PSAPILib.init()) return false; @@ -407,7 +407,7 @@ bool CWinProcess::enumProcessesId(std::vector &processesId) return true; } -//**************************************************************************************************************** +// **************************************************************************************************************** bool CWinProcess::enumProcessModules(uint32 processId, std::vector &moduleNames) { if (!PSAPILib.init()) return false; @@ -445,7 +445,7 @@ bool CWinProcess::enumProcessModules(uint32 processId, std::vector return true; } -//**************************************************************************************************************** +// **************************************************************************************************************** uint32 CWinProcess::getProcessIdFromModuleFilename(const std::string &moduleFileName) { std::vector processesId; @@ -467,7 +467,7 @@ uint32 CWinProcess::getProcessIdFromModuleFilename(const std::string &moduleFile return 0; } -//**************************************************************************************************************** +// **************************************************************************************************************** bool CWinProcess::terminateProcess(uint32 processId, uint exitCode) { if (!processId) return false; @@ -478,7 +478,7 @@ bool CWinProcess::terminateProcess(uint32 processId, uint exitCode) return ok != FALSE; } -//**************************************************************************************************************** +// **************************************************************************************************************** bool CWinProcess::terminateProcessFromModuleName(const std::string &moduleName, uint exitCode) { return terminateProcess(getProcessIdFromModuleFilename(moduleName), exitCode); diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 763433c9a..0f0df597f 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -44,22 +44,22 @@ if(APPLE) SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0") SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community") - ADD_EXECUTABLE(client MACOSX_BUNDLE ${SRC}) + ADD_EXECUTABLE(ryzom_client MACOSX_BUNDLE ${SRC}) # TODO: in release mode, cmake could copy all the dylibs into the .app # bundle for redistribution... should some part of cpack handle that? - # ADD_CUSTOM_COMMAND(TARGET client POST_BUILD + # ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD # # make frameworks directory in app bundle # COMMAND ${CMAKE_COMMAND} -E make_directory - # ${CMAKE_CURRENT_BINARY_DIR}/client.app/Contents/Frameworks + # ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks # # copy framework into app bundle # COMMAND ${CMAKE_COMMAND} -E copy ${SOME_LIBRARY} - # ${CMAKE_CURRENT_BINARY_DIR}/client.app/Contents/Frameworks + # ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks # # ... # # install_name_tool the lib pathes ELSE(APPLE) - ADD_EXECUTABLE(client ${SRC}) + ADD_EXECUTABLE(ryzom_client ${SRC}) ENDIF(APPLE) INCLUDE_DIRECTORIES( @@ -70,10 +70,10 @@ INCLUDE_DIRECTORIES( ${CURL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS} +TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} - game_share + ryzom_gameshare ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} @@ -82,18 +82,17 @@ TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS} ${CURL_LIBRARIES} ${NELSOUND_LIBRARY} ${NELSNDDRV_LIBRARY} - client_sheets + ryzom_clientsheets ${NELPACS_LIBRARY} ${LIBWWW_LIBRARY} - ${Boost_LIBRARIES} - seven_zip + ryzom_sevenzip luabind # TODO: find luabind and expat cleanly using a find script expat) IF(NOT WITH_COCOA) - TARGET_LINK_LIBRARIES(client ${X11_LIBRARIES}) + TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES}) ENDIF(NOT WITH_COCOA) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -INSTALL(TARGETS client RUNTIME DESTINATION bin COMPONENT client BUNDLE DESTINATION /Applications) +INSTALL(TARGETS ryzom_client RUNTIME DESTINATION bin COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/client/src/animation_fx.cpp b/code/ryzom/client/src/animation_fx.cpp index a869c366a..92bc34c16 100644 --- a/code/ryzom/client/src/animation_fx.cpp +++ b/code/ryzom/client/src/animation_fx.cpp @@ -124,9 +124,9 @@ NL3D::UParticleSystemInstance CAnimationFX::createMatchingInstance(const float * return fx; }// createMatchingInstance // -//******************************************************************************* +// ******************************************************************************* // CAnimationFXSet -//******************************************************************************* +// ******************************************************************************* //----------------------------------------------- // init diff --git a/code/ryzom/client/src/animation_fx_id_array.cpp b/code/ryzom/client/src/animation_fx_id_array.cpp index ac3e6ffed..c95f54495 100644 --- a/code/ryzom/client/src/animation_fx_id_array.cpp +++ b/code/ryzom/client/src/animation_fx_id_array.cpp @@ -25,13 +25,13 @@ extern NL3D::UScene *Scene; -//********************************************************************* +// ********************************************************************* CAnimationFXIDArray::CAnimationFXIDArray() { _AnimSet = NULL; } -//********************************************************************* +// ********************************************************************* void CAnimationFXIDArray::release() { _IDToFXArray.clear(); @@ -42,7 +42,7 @@ void CAnimationFXIDArray::release() _AnimSet = NULL; } -//********************************************************************* +// ********************************************************************* void CAnimationFXIDArray::init(const CIDToStringArraySheet &sheet, NL3D::UAnimationSet *animSet, bool mustDeleteAnimSet /* = false*/) { release(); @@ -66,7 +66,7 @@ void CAnimationFXIDArray::init(const CIDToStringArraySheet &sheet, NL3D::UAnimat } } -//********************************************************************* +// ********************************************************************* void CAnimationFXIDArray::init(const std::string &sheetName, NL3D::UAnimationSet *animSet, bool mustDeleteAnimSet /*= false*/) { CIDToStringArraySheet *array = dynamic_cast(SheetMngr.get(NLMISC::CSheetId(sheetName))); @@ -77,7 +77,7 @@ void CAnimationFXIDArray::init(const std::string &sheetName, NL3D::UAnimationSet } -//********************************************************************* +// ********************************************************************* const CAnimationFX *CAnimationFXIDArray::getFX(uint32 id) const { // after init, element are sorted by ids diff --git a/code/ryzom/client/src/attached_fx.cpp b/code/ryzom/client/src/attached_fx.cpp index a2715826d..e54476ac8 100644 --- a/code/ryzom/client/src/attached_fx.cpp +++ b/code/ryzom/client/src/attached_fx.cpp @@ -35,19 +35,19 @@ using namespace NL3D; extern CUserEntity *UserEntity; -//************************************************************************************* +// ************************************************************************************* CAttachedFX::CAttachedFX() { clear(); } -//************************************************************************************* +// ************************************************************************************* CAttachedFX::~CAttachedFX() { clear(); } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CAttachedFX::clear() { if (!FX.empty()) @@ -70,7 +70,7 @@ void CAttachedFX::clear() TargeterUserBoneID = 0xff; } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CAttachedFX::create(CCharacterCL &parent, const CBuildInfo &buildInfo, const CTargeterInfo &targeterInfo @@ -84,7 +84,7 @@ void CAttachedFX::create(CCharacterCL &parent, create(parent, instance, buildInfo, targeterInfo); } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CAttachedFX::create(CCharacterCL &parent, NL3D::UParticleSystemInstance instance, const CBuildInfo &buildInfo, @@ -216,7 +216,7 @@ void CAttachedFX::create(CCharacterCL &parent, } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CAttachedFX::evalTargeterStickPos(NLMISC::CVector &dest) const { CEntityCL *targeter = EntitiesMngr.entity(TargeterInfo.Slot); @@ -256,7 +256,7 @@ void CAttachedFX::evalTargeterStickPos(NLMISC::CVector &dest) const }; } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CAttachedFX::update(CCharacterCL &parent, const NLMISC::CMatrix &alignMatrix) { if (AniFX && !FX.empty()) diff --git a/code/ryzom/client/src/attack_list.cpp b/code/ryzom/client/src/attack_list.cpp index 829cb78ac..08c2f3581 100644 --- a/code/ryzom/client/src/attack_list.cpp +++ b/code/ryzom/client/src/attack_list.cpp @@ -66,13 +66,13 @@ static void buildAttackPart(const std::string &sheetName, CAnimationFXSet &fxSet } } -//*********************************************************************************************** +// *********************************************************************************************** CAttack::CAttack() { Sheet = NULL; } -//*********************************************************************************************** +// *********************************************************************************************** void CAttack::init(const CAttackSheet *sheet, NL3D::UAnimationSet *as) { nlassert(!Sheet); // init already done @@ -88,7 +88,7 @@ void CAttack::init(const CAttackSheet *sheet, NL3D::UAnimationSet *as) buildAttackPart(Sheet->ImpactFX, ImpactFX, as); } -//*********************************************************************************************** +// *********************************************************************************************** void CAttackList::init(const CAttackListSheet *attackList, NL3D::UAnimationSet *as) { nlassert(_Attacks.empty()); @@ -125,7 +125,7 @@ struct CAttackEntryComp2 } }; -//*********************************************************************************************** +// *********************************************************************************************** const CAttack *CAttackList::getAttackFromID(const CAttackIDSheet &id) const { H_AUTO_USE(RZ_AttackList); @@ -139,7 +139,7 @@ const CAttack *CAttackList::getAttackFromID(const CAttackIDSheet &id) const return &(it->Attack); } -//*********************************************************************************************** +// *********************************************************************************************** CAttackListManager &CAttackListManager::getInstance() { H_AUTO_USE(RZ_AttackList) @@ -148,7 +148,7 @@ CAttackListManager &CAttackListManager::getInstance() return *_Instance; } -//*********************************************************************************************** +// *********************************************************************************************** void CAttackListManager::releaseInstance() { if( _Instance ) @@ -156,7 +156,7 @@ void CAttackListManager::releaseInstance() _Instance = NULL; } -//*********************************************************************************************** +// *********************************************************************************************** void CAttackListManager::init() { if (_AnimationSet) return; // init already done @@ -185,7 +185,7 @@ void CAttackListManager::init() buildLinkFXs(); } -//*********************************************************************************************** +// *********************************************************************************************** void CAttackListManager::release() { if (!_AnimationSet) return; @@ -197,7 +197,7 @@ void CAttackListManager::release() _Instance = NULL; } -//*********************************************************************************************** +// *********************************************************************************************** const CAttackList *CAttackListManager::getAttackList(const std::string &name) const { H_AUTO_USE(RZ_AttackList) @@ -206,19 +206,19 @@ const CAttackList *CAttackListManager::getAttackList(const std::string &name) co return NULL; } -//*********************************************************************************************** +// *********************************************************************************************** CAttackListManager::CAttackListManager() { _AnimationSet = NULL; } -//******************************************************************************************* +// ******************************************************************************************* void CAttackListManager::buildAurasFXs() { _Auras.init("auras.id_to_string_array", _AnimationSet, false /* must not delete animset, owned by this object */); } -//******************************************************************************************* +// ******************************************************************************************* void CAttackListManager::buildLinkFXs() { _Links.init("links.id_to_string_array", _AnimationSet, false /* must not delete animset, owned by this object */); diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index a32db185f..c9e4c87da 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -2291,6 +2291,8 @@ void CCharacterCL::endAnimTransition() dir(front()); */ break; + default: + break; } // Change the current mode. if ( _ModeWanted != MBEHAV::UNKNOWN_MODE ) @@ -2658,6 +2660,8 @@ KeyChosen: else nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnMoveRight '%s' is not valid.", _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnMoveRight).c_str()); break; + default: + break; } // On Rotation/About Face @@ -2684,6 +2688,8 @@ KeyChosen: else nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnRightRotation '%s' is not valid.", _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnRightRotation).c_str()); break; + default: + break; } // Max Loop @@ -2729,6 +2735,8 @@ KeyChosen: else nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnBigBendRight '%s' is not valid.", _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnBigBendRight).c_str()); break; + default: + break; } // If the animation change according to a high speed and speed high enough or oo. @@ -3084,6 +3092,7 @@ KeyChosen: case MAGICFX::CastLoop: afs = &_CurrentAttack->AttackLoopFX; break; case MAGICFX::CastEnd: afs = &_CurrentAttack->AttackEndFX; break; case MAGICFX::CastFail: afs = &_CurrentAttack->AttackFailFX; break; + default: break; } playCastFX(afs, _CurrentAttackInfo.Intensity); } @@ -3444,6 +3453,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState()) case OnMoveRight: setAnim(_CurrentState->OnMoveRight); return; + default: + break; } // ON ROTATION @@ -3458,6 +3469,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState()) case OnRotRight: setAnim(CAnimationStateSheet::Idle); return; + default: + break; } // ON BAD HEADING @@ -3475,6 +3488,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState()) case OnBendRight: setAnim(_CurrentState->MoveState); return; + default: + break; } // \todo GUIGUI : changer de place cette partie je pense. @@ -3640,6 +3655,8 @@ void CCharacterCL::beginCast(const MBEHAV::CBehaviour &behaviour) case MBEHAV::CAST_STUN: setAnim(CAnimationStateSheet::StunCastInit); break; + default: + break; } }// beginCast // @@ -3746,6 +3763,8 @@ void CCharacterCL::endCast(const MBEHAV::CBehaviour &behaviour, const MBEHAV::CB case MBEHAV::CAST_MIX_LINK: setAnim(CAnimationStateSheet::MixedCastLink); break; + default: + break; } } break; @@ -3754,7 +3773,7 @@ void CCharacterCL::endCast(const MBEHAV::CBehaviour &behaviour, const MBEHAV::CB }// endCast // -//************************************************************************************************* +// ************************************************************************************************* void CCharacterCL::updateCurrentAttack() { // This is a behaviour for the magic. @@ -3842,7 +3861,7 @@ inline static void getResistAndDistance(uint8 packedInfo, bool isDirectAttack, b resist = (packedInfo & 128) != 0; } -//********************************************************************************************* +// ********************************************************************************************* void CCharacterCL::performCurrentAttackEnd(const CBehaviourContext &bc, bool directOffensifSpell, vector &targetHitDates, TAnimStateKey animForCombat) { if (!_CurrentAttack) return; @@ -4213,7 +4232,7 @@ void CCharacterCL::performCurrentAttackEnd(const CBehaviourContext &bc, bool dir */ } -//********************************************************************************************* +// ********************************************************************************************* void CCharacterCL::buildStaticObjectCastFX(const NLMISC::CVector &castWorldOrigin, NLMISC::CVector &castWorldPos, const CAttackSheet &/* sheet */, uint intensity) { if (intensity == 0) return; @@ -4250,7 +4269,7 @@ void CCharacterCL::buildStaticObjectCastFX(const NLMISC::CVector &castWorldOrigi } } -//********************************************************************************************* +// ********************************************************************************************* void CCharacterCL::computeTargetStickMode(const CAttackSheet &sheet, const CAttackInfo &attackInfo, CFXStickMode &dest, CEntityCL &target) { bool hasPhysicalImpact = false; @@ -4290,7 +4309,7 @@ void CCharacterCL::computeTargetStickMode(const CAttackSheet &sheet, const CAtta } -//********************************************************************************************* +// ********************************************************************************************* bool CCharacterCL::createCurrentAttackEndPart(CProjectileBuild &destPB, const CAttack *currentAttack, const CCharacterCL &target, @@ -4393,7 +4412,7 @@ bool CCharacterCL::createCurrentAttackEndPart(CProjectileBuild &destPB, } -//********************************************************************************************* +// ********************************************************************************************* void CCharacterCL::computeBestCastRay(CEntityCL &targetEntity, const CFXStickMode &targetStickMode, NLMISC::CVector &castWorldOrigin, @@ -4425,7 +4444,7 @@ void CCharacterCL::computeBestCastRay(CEntityCL &targetEntity, } } -//********************************************************************************************* +// ********************************************************************************************* bool CCharacterCL::isCurrentBehaviourAttackEnd() const { switch(_CurrentBehaviour.Behaviour) @@ -4443,8 +4462,9 @@ bool CCharacterCL::isCurrentBehaviourAttackEnd() const case MBEHAV::POWERFUL_ATTACK: case MBEHAV::AREA_ATTACK: return true; + default: + return false; } - return false; } @@ -4627,6 +4647,8 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc) // virtual case RANGE_ATTACK: combatAnimState= CAnimationStateSheet::Attack1; break; + default: + break; } } } @@ -8928,7 +8950,7 @@ void CCharacterCL::attachFX(const CAttachedFX::TSmartPtr fx) -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::setAuraFX(uint index, const CAnimationFX *sheet) { nlassert(index < MaxNumAura); @@ -8959,7 +8981,7 @@ void CCharacterCL::setAuraFX(uint index, const CAnimationFX *sheet) } } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::setLinkFX(const CAnimationFX *fx, const CAnimationFX *dispell) { // no-op if same link @@ -8989,7 +9011,7 @@ void CCharacterCL::setLinkFX(const CAnimationFX *fx, const CAnimationFX *dispell -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::startItemAttackFXs(bool activateTrails, uint intensity) { uint numItems = (uint)_Items.size(); @@ -9000,7 +9022,7 @@ void CCharacterCL::startItemAttackFXs(bool activateTrails, uint intensity) } } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::stopItemAttackFXs() { uint numItems = (uint)_Items.size(); @@ -9083,7 +9105,7 @@ void CCharacterCL::applyVisualFX(sint64 prop) setLinkFX(linkFX, dispellFX); } -//********************************************************************************************* +// ********************************************************************************************* const char *CCharacterCL::getBoneNameFromBodyPart(BODY::TBodyPart part, BODY::TSide side) const { if (!_Sheet) return CEntityCL::getBoneNameFromBodyPart(part, side); @@ -9091,14 +9113,14 @@ const char *CCharacterCL::getBoneNameFromBodyPart(BODY::TBodyPart part, BODY::TS } -//********************************************************************************************* +// ********************************************************************************************* const CItemSheet *CCharacterCL::getRightHandItemSheet() const { if (_RHandInstIdx == CEntityCL::BadIndex) return NULL; return _Items[_RHandInstIdx].Sheet; } -//********************************************************************************************* +// ********************************************************************************************* const CItemSheet *CCharacterCL::getLeftHandItemSheet() const { if (_LHandInstIdx == CEntityCL::BadIndex) return NULL; @@ -9120,7 +9142,7 @@ void CCharacterCL::resetAllSoundAnimId() ///////////////////////////// -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::CWornItem::startAttackFX(NL3D::USkeleton skeleton, uint intensity, SLOTTYPE::EVisualSlot visualSlot, bool activateTrail) { if (intensity < 1 || intensity > 5) return; @@ -9151,6 +9173,8 @@ void CCharacterCL::CWornItem::startAttackFX(NL3D::USkeleton skeleton, uint inten else stickPoint = "box_arme_gauche"; break; + default: + break; } } if (stickPoint) @@ -9203,13 +9227,13 @@ void CCharacterCL::CWornItem::startAttackFX(NL3D::USkeleton skeleton, uint inten } } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::CWornItem::stopAttackFX() { if (!Trail.empty()) Trail.stop(); } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::CWornItem::initFXs(SLOTTYPE::EVisualSlot /* visualSlot */, NL3D::UInstance parent) { releaseFXs(); @@ -9236,7 +9260,7 @@ void CCharacterCL::CWornItem::initFXs(SLOTTYPE::EVisualSlot /* visualSlot */, NL } } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::CWornItem::enableAdvantageFX(NL3D::UInstance parent) { if (!Sheet) return; @@ -9278,7 +9302,7 @@ void CCharacterCL::CWornItem::enableAdvantageFX(NL3D::UInstance parent) } } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::CWornItem::releaseFXs() { if (Scene) @@ -9290,7 +9314,7 @@ void CCharacterCL::CWornItem::releaseFXs() } } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::CWornItem::setTrailSize(uint size) { if (Trail.empty()) return; @@ -9308,14 +9332,14 @@ void CCharacterCL::CWornItem::setTrailSize(uint size) } -//*********************************************************************************************************************** +// *********************************************************************************************************************** const CAttack *CCharacterCL::getAttack(const CAttackIDSheet &id) const { if (!_Sheet) return NULL; return getAttack(id, _Sheet->AttackLists); } -//*********************************************************************************************************************** +// *********************************************************************************************************************** const CAttack *CCharacterCL::getAttack(const CAttackIDSheet &id, const std::vector &attackList) const { for(std::vector::const_reverse_iterator it = attackList.rbegin(); it != attackList.rend(); ++it) @@ -9331,7 +9355,7 @@ const CAttack *CCharacterCL::getAttack(const CAttackIDSheet &id, const std::vect } -//*********************************************************************************************************************** +// *********************************************************************************************************************** void CCharacterCL::initStaticFX() { _StaticFX = NULL; diff --git a/code/ryzom/client/src/client_sheets/CMakeLists.txt b/code/ryzom/client/src/client_sheets/CMakeLists.txt index 775a3fd1c..541fd6852 100644 --- a/code/ryzom/client/src/client_sheets/CMakeLists.txt +++ b/code/ryzom/client/src/client_sheets/CMakeLists.txt @@ -5,26 +5,23 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) IF(NOT WIN32) - ADD_LIBRARY(client_sheets SHARED ${SRC}) + ADD_LIBRARY(ryzom_clientsheets SHARED ${SRC}) ELSE(NOT WIN32) - ADD_LIBRARY(client_sheets STATIC ${SRC}) + ADD_LIBRARY(ryzom_clientsheets STATIC ${SRC}) ENDIF(NOT WIN32) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(client_sheets game_share ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(client_sheets PROPERTIES VERSION ${NL_VERSION}) +INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(ryzom_clientsheets ryzom_gameshare ${NELMISC_LIBRARY}) +SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) - SET_TARGET_PROPERTIES(client_sheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h") + SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h") SET_SOURCE_FILES_PROPERTIES(stdpch.cpp PROPERTIES COMPILE_FLAGS "/Ycstdpch.h") - SET_TARGET_PROPERTIES(client_sheets + SET_TARGET_PROPERTIES(ryzom_clientsheets PROJECT_LABEL "Library: Client Sheets" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") + LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt" ENDIF(WIN32) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - -INSTALL(TARGETS client_sheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) +INSTALL(TARGETS ryzom_clientsheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) diff --git a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp index 199cd8266..11df8c4ca 100644 --- a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp @@ -20,7 +20,7 @@ #include "animation_fx_set_sheet.h" #include "nel/georges/u_form_elm.h" -//**************************************************************************************************** +// **************************************************************************************************** CAnimationFXSetSheet::CAnimationFXSetSheet() { Type = ANIMATION_FX_SET; @@ -31,13 +31,13 @@ CAnimationFXSetSheet::CAnimationFXSetSheet() } } -//**************************************************************************************************** +// **************************************************************************************************** void CAnimationFXSetSheet::build(const NLGEORGES::UFormElm &item) { buildWithPrefix(item); } -//**************************************************************************************************** +// **************************************************************************************************** void CAnimationFXSetSheet::buildWithPrefix(const NLGEORGES::UFormElm &item, const std::string &prefix /*=""*/) { FX.clear(); @@ -55,7 +55,7 @@ void CAnimationFXSetSheet::buildWithPrefix(const NLGEORGES::UFormElm &item, cons } } -//**************************************************************************************************** +// **************************************************************************************************** void CAnimationFXSetSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont(FX); diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp index 76a34a9e0..0780d76d2 100644 --- a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp @@ -22,7 +22,7 @@ #include "nel/georges/u_form_elm.h" -//***************************************************************************************** +// ***************************************************************************************** void CAttackIDSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { uint32 attackType = 0; @@ -57,7 +57,7 @@ void CAttackIDSheet::build(const NLGEORGES::UFormElm &item, const std::string &p } } -//***************************************************************************************** +// ***************************************************************************************** void CAttackIDSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialEnum(Type); @@ -84,7 +84,7 @@ void CAttackIDSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } } -//***************************************************************************************** +// ***************************************************************************************** void CAttackIDSheet::CSpellInfo::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { uint32 spellID = 0; @@ -95,14 +95,14 @@ void CAttackIDSheet::CSpellInfo::build(const NLGEORGES::UFormElm &item, const st Mode = (MAGICFX::TSpellMode) spellMode; } -//***************************************************************************************** +// ***************************************************************************************** void CAttackIDSheet::CSpellInfo::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialEnum(Mode); f.serialEnum(ID); } -//***************************************************************************************** +// ***************************************************************************************** bool operator == (const CAttackIDSheet &lhs, const CAttackIDSheet &rhs) { if (lhs.Type != rhs.Type) return false; @@ -117,7 +117,7 @@ bool operator == (const CAttackIDSheet &lhs, const CAttackIDSheet &rhs) } } -//***************************************************************************************** +// ***************************************************************************************** bool operator < (const CAttackIDSheet &lhs, const CAttackIDSheet &rhs) { if (lhs.Type != rhs.Type) return lhs.Type < rhs.Type; @@ -132,13 +132,13 @@ bool operator < (const CAttackIDSheet &lhs, const CAttackIDSheet &rhs) } } -//***************************************************************************************** +// ***************************************************************************************** bool operator == (const CAttackIDSheet::CSpellInfo &lhs, const CAttackIDSheet::CSpellInfo &rhs) { return lhs.Mode == rhs.Mode && lhs.ID == rhs.ID; } -//***************************************************************************************** +// ***************************************************************************************** bool operator < (const CAttackIDSheet::CSpellInfo &lhs, const CAttackIDSheet::CSpellInfo &rhs) { if (lhs.Mode != rhs.Mode) return lhs.Mode < rhs.Mode; diff --git a/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp index 02b281f36..4003e3c7b 100644 --- a/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp @@ -23,27 +23,27 @@ using namespace NLGEORGES; -//******************************************************************************************* +// ******************************************************************************************* CAttackListSheet::CAttackListSheet() { Type = ATTACK_LIST; } -//******************************************************************************************* +// ******************************************************************************************* void CAttackListSheetEntry::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { ID.build(item, prefix + "ID." ); Attack.build(item, prefix + "Attack."); } -//******************************************************************************************* +// ******************************************************************************************* void CAttackListSheetEntry::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(ID); f.serial(Attack); } -//******************************************************************************************* +// ******************************************************************************************* void CAttackListSheet::build(const NLGEORGES::UFormElm &item) { const UFormElm *attacks = NULL; @@ -64,7 +64,7 @@ void CAttackListSheet::build(const NLGEORGES::UFormElm &item) } } -//******************************************************************************************* +// ******************************************************************************************* void CAttackListSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont(Attacks); diff --git a/code/ryzom/client/src/client_sheets/attack_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_sheet.cpp index c63d5ef4a..80732e759 100644 --- a/code/ryzom/client/src/client_sheets/attack_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/attack_sheet.cpp @@ -24,7 +24,7 @@ #include "nel/georges/u_form_loader.h" -//********************************************************************************************************* +// ********************************************************************************************************* CAttackSheet::CAttackSheet() { ProjectileDelay = 0.f; @@ -37,7 +37,7 @@ CAttackSheet::CAttackSheet() AdditionnalStartOffset.set(0.f, 0.f, 0.f); } -//********************************************************************************************************* +// ********************************************************************************************************* void CAttackSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { bool ok = true; @@ -71,7 +71,7 @@ void CAttackSheet::build(const NLGEORGES::UFormElm &item, const std::string &pre } } -//********************************************************************************************************* +// ********************************************************************************************************* void CAttackSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialEnum(ProjectileMode); diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp index a841ec7b5..105378b26 100644 --- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp @@ -29,7 +29,7 @@ static void build(NLMISC::TSStringId &result, const NLGEORGES::UFormElm &item, c result = ClientSheetsStrings.add(str); } -//********************************************************************************************* +// ********************************************************************************************* CBodyToBoneSheet::CBodyToBoneSheet() { Head = 0; @@ -44,7 +44,7 @@ CBodyToBoneSheet::CBodyToBoneSheet() RightFoot = 0; } -//********************************************************************************************* +// ********************************************************************************************* void CBodyToBoneSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { ::build(Head, item, prefix, "Head"); @@ -59,7 +59,7 @@ void CBodyToBoneSheet::build(const NLGEORGES::UFormElm &item, const std::string ::build(RightFoot, item, prefix, "RightFoot"); } -//********************************************************************************************* +// ********************************************************************************************* void CBodyToBoneSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { ClientSheetsStrings.serial(f, Head); @@ -74,7 +74,7 @@ void CBodyToBoneSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) ClientSheetsStrings.serial(f, RightFoot); } -//********************************************************************************************* +// ********************************************************************************************* const char *CBodyToBoneSheet::getBoneName(BODY::TBodyPart part, BODY::TSide side) const { BODY::TBodyPart hominPart = BODY::getMatchingHominBodyPart(part); diff --git a/code/ryzom/client/src/client_sheets/flora_sheet.cpp b/code/ryzom/client/src/client_sheets/flora_sheet.cpp index a8bdf72f9..431017431 100644 --- a/code/ryzom/client/src/client_sheets/flora_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/flora_sheet.cpp @@ -23,14 +23,14 @@ using namespace NLGEORGES; -//*************************************************************************************************** +// *************************************************************************************************** CFloraSheet::CFloraSheet() { Type = FLORA; _TotalWeight = 0; } -//*************************************************************************************************** +// *************************************************************************************************** void CFloraSheet::build(const NLGEORGES::UFormElm &item) { const UFormElm *plantArray = NULL; @@ -55,7 +55,7 @@ void CFloraSheet::build(const NLGEORGES::UFormElm &item) item.getValueByName(MicroLifeThreshold, "MicroLifeThreshold"); } -//*************************************************************************************************** +// *************************************************************************************************** void CFloraSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont(_Plants); @@ -63,7 +63,7 @@ void CFloraSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) f.serial(_TotalWeight); } -//*************************************************************************************************** +// *************************************************************************************************** void CPlantInfo::build(const NLGEORGES::UFormElm &item) { item.getValueByName(SheetName, "File name"); @@ -74,14 +74,14 @@ void CPlantInfo::build(const NLGEORGES::UFormElm &item) } } -//*************************************************************************************************** +// *************************************************************************************************** void CPlantInfo::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(SheetName); f.serial(CumulatedWeight); } -//*************************************************************************************************** +// *************************************************************************************************** const CPlantInfo *CFloraSheet::getPlantInfoFromWeightedIndex(uint64 index) const { if (_TotalWeight == 0) return NULL; diff --git a/code/ryzom/client/src/client_sheets/id_to_string_array.cpp b/code/ryzom/client/src/client_sheets/id_to_string_array.cpp index 016d0ac3f..4ea38f7d1 100644 --- a/code/ryzom/client/src/client_sheets/id_to_string_array.cpp +++ b/code/ryzom/client/src/client_sheets/id_to_string_array.cpp @@ -22,13 +22,13 @@ using namespace NLGEORGES; -//**************************************************************************************** +// **************************************************************************************** CIDToStringArraySheet::CIDToStringArraySheet() { Type = ID_TO_STRING_ARRAY; } -//******************************************************************************************* +// ******************************************************************************************* void CIDToStringArraySheet::build(const NLGEORGES::UFormElm &item) { const UFormElm *stringArray = NULL; @@ -50,20 +50,20 @@ void CIDToStringArraySheet::build(const NLGEORGES::UFormElm &item) } } -//******************************************************************************************* +// ******************************************************************************************* void CIDToStringArraySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont(Array); } -//******************************************************************************************* +// ******************************************************************************************* void CIDToString::build(const NLGEORGES::UFormElm &item) { item.getValueByName(String, "String"); item.getValueByName(ID, "ID"); } -//******************************************************************************************* +// ******************************************************************************************* void CIDToString::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(ID); diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp index 26c1a145c..4e81fea65 100644 --- a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp @@ -20,7 +20,7 @@ #include "item_fx_sheet.h" #include "nel/georges/u_form_elm.h" -//******************************************************************************************* +// ******************************************************************************************* CItemFXSheet::CItemFXSheet() { _Trail = 0; @@ -32,7 +32,7 @@ CItemFXSheet::CItemFXSheet() AttackFXRot.set(0.f, 0.f, 0.f); } -//******************************************************************************************* +// ******************************************************************************************* void CItemFXSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { std::string trail; @@ -72,7 +72,7 @@ void CItemFXSheet::build(const NLGEORGES::UFormElm &item, const std::string &pre } } -//******************************************************************************************* +// ******************************************************************************************* void CItemFXSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(TrailMinSliceTime); @@ -86,25 +86,25 @@ void CItemFXSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) f.serialCont(_StaticFXs); } -//******************************************************************************************* +// ******************************************************************************************* const char *CItemFXSheet::getTrail() const { return _Trail ? ClientSheetsStrings.get(_Trail) : ""; } -//******************************************************************************************* +// ******************************************************************************************* const char *CItemFXSheet::getAdvantageFX() const { return _AdvantageFX ? ClientSheetsStrings.get(_AdvantageFX) : ""; } -//******************************************************************************************* +// ******************************************************************************************* const char *CItemFXSheet::getAttackFX() const { return _AttackFX ? ClientSheetsStrings.get(_AttackFX) : ""; } -//******************************************************************************************* +// ******************************************************************************************* void CItemFXSheet::CStaticFX::build(const NLGEORGES::UFormElm &item) { std::string name; @@ -118,7 +118,7 @@ void CItemFXSheet::CStaticFX::build(const NLGEORGES::UFormElm &item) item.getValueByName(Offset.z, "OffsetZ"); } -//******************************************************************************************* +// ******************************************************************************************* void CItemFXSheet::CStaticFX::serial(NLMISC::IStream &f) throw(NLMISC::EStream) { ClientSheetsStrings.serial(f, Name); @@ -126,21 +126,21 @@ void CItemFXSheet::CStaticFX::serial(NLMISC::IStream &f) throw(NLMISC::EStream) f.serial(Offset); } -//******************************************************************************************* +// ******************************************************************************************* const char *CItemFXSheet::getStaticFXName(uint index) const { nlassert(index < _StaticFXs.size()); return _StaticFXs[index].Name ? ClientSheetsStrings.get(_StaticFXs[index].Name) : ""; } -//******************************************************************************************* +// ******************************************************************************************* const char *CItemFXSheet::getStaticFXBone(uint index) const { nlassert(index < _StaticFXs.size()); return _StaticFXs[index].Bone ? ClientSheetsStrings.get(_StaticFXs[index].Bone) : ""; } -//******************************************************************************************* +// ******************************************************************************************* const NLMISC::CVector &CItemFXSheet::getStaticFXOffset(uint index) const { nlassert(index < _StaticFXs.size()); diff --git a/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp b/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp index 47c385f88..06f967fb9 100644 --- a/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp @@ -21,7 +21,7 @@ // CSkyObjectSheet::CColorInfo // ///////////////////////////////// -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::CColorInfoSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { item.getValueByName(MapName, (prefix + "MapName").c_str()); @@ -30,7 +30,7 @@ void CSkyObjectSheet::CColorInfoSheet::build(const NLGEORGES::UFormElm &item, co Mode = (TSkyColorMode) mode; } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::CColorInfoSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(MapName); @@ -41,7 +41,7 @@ void CSkyObjectSheet::CColorInfoSheet::serial(class NLMISC::IStream &f) throw(NL // CSkyObjectSheet::CColorGradientInfo // ///////////////////////////////////////// -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::CColorGradientInfoSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { item.getValueByName(TargetTextureStage, (prefix + "TargetTextureStage").c_str()); @@ -59,7 +59,7 @@ void CSkyObjectSheet::CColorGradientInfoSheet::build(const NLGEORGES::UFormElm & } } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::CColorGradientInfoSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(TargetTextureStage); @@ -70,7 +70,7 @@ void CSkyObjectSheet::CColorGradientInfoSheet::serial(class NLMISC::IStream &f) // CSkyObjectSheet::CVersion // /////////////////////////////// -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::CVersionSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { item.getValueByName(ShapeName, (prefix + "ShapeName").c_str()); @@ -101,7 +101,7 @@ void CSkyObjectSheet::CVersionSheet::build(const NLGEORGES::UFormElm &item, cons } } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::CVersionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(ShapeName); @@ -125,14 +125,14 @@ void CSkyObjectSheet::CVersionSheet::serial(class NLMISC::IStream &f) throw(NLMI // CSkyObjectSheet // ///////////////////// -//***************************************************************************************************** +// ***************************************************************************************************** CSkyObjectSheet::CSkyObjectSheet() { VisibleInMainScene = true; VisibleInEnvMap = true; } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { Std.build(item, prefix + "StdVersion."); @@ -142,7 +142,7 @@ void CSkyObjectSheet::build(const NLGEORGES::UFormElm &item, const std::string & item.getValueByName(VisibleInEnvMap, (prefix + "VisibleInEnvMap").c_str()); } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkyObjectSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(Std); diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.cpp b/code/ryzom/client/src/client_sheets/sky_sheet.cpp index cfd434687..f0f492038 100644 --- a/code/ryzom/client/src/client_sheets/sky_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/sky_sheet.cpp @@ -17,7 +17,7 @@ #include "stdpch.h" #include "sky_sheet.h" -//***************************************************************************************************** +// ***************************************************************************************************** CSkySheet::CSkySheet() { AnimLengthInSeconds = 3; // by default, anim last 3 secconds (over 90 frames) @@ -26,7 +26,7 @@ CSkySheet::CSkySheet() WaterEnvMapAlpha = 255; } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkySheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix) { item.getValueByName(InstanceGroupName, (prefix + "InstanceGroupName").c_str()); @@ -55,7 +55,7 @@ void CSkySheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix item.getValueByName(WaterEnvMapAlpha, (prefix + "WaterEnvMapAlpha").c_str()); } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial(InstanceGroupName); @@ -69,7 +69,7 @@ void CSkySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) f.serial(WaterEnvMapAlpha); } -//***************************************************************************************************** +// ***************************************************************************************************** void CSkySheet::build(const NLGEORGES::UFormElm &item) { build(item, ""); diff --git a/code/ryzom/client/src/continent_manager.cpp b/code/ryzom/client/src/continent_manager.cpp index fd59a5ffe..6e2f655f6 100644 --- a/code/ryzom/client/src/continent_manager.cpp +++ b/code/ryzom/client/src/continent_manager.cpp @@ -397,22 +397,24 @@ void CContinentManager::select(const CVectorD &pos, NLMISC::IProgressCallback &p CContinent *pCont = it->second; nlinfo("Looking into %s", pCont->SheetName.c_str()); if (pCont->Zone.VPoints.size() > 0) // Patch because some continent have not been done yet - if (pCont->Zone.contains(fPos)) { - // load the continent selected. - select (it->first, pos, progress); - return; - } - else - { - /* - nlwarning("**********************************************"); - nlwarning("Start position (%s) not found in continent %s", NLMISC::toString(pos.asVector()).c_str(), it->first.c_str()); - for(uint k = 0; k < pCont->Zone.VPoints.size(); ++k) + if (pCont->Zone.contains(fPos)) { - nlwarning("zone point %d = %s", (int)k, NLMISC::toString(pCont->Zone.VPoints[k]).c_str()); + // load the continent selected. + select (it->first, pos, progress); + return; + } + else + { + /* + nlwarning("**********************************************"); + nlwarning("Start position (%s) not found in continent %s", NLMISC::toString(pos.asVector()).c_str(), it->first.c_str()); + for(uint k = 0; k < pCont->Zone.VPoints.size(); ++k) + { + nlwarning("zone point %d = %s", (int)k, NLMISC::toString(pCont->Zone.VPoints[k]).c_str()); + } + */ } - */ } it++; } diff --git a/code/ryzom/client/src/custom_matrix.cpp b/code/ryzom/client/src/custom_matrix.cpp index 0e2b0aa47..b0d166cba 100644 --- a/code/ryzom/client/src/custom_matrix.cpp +++ b/code/ryzom/client/src/custom_matrix.cpp @@ -19,7 +19,7 @@ -//********************************************************* +// ********************************************************* bool CCustomMatrix::set(bool newOn, const NLMISC::CMatrix &newMat) { if (newOn) diff --git a/code/ryzom/client/src/decal.cpp b/code/ryzom/client/src/decal.cpp index a992eb9d9..6d7020bcb 100644 --- a/code/ryzom/client/src/decal.cpp +++ b/code/ryzom/client/src/decal.cpp @@ -89,7 +89,7 @@ static NL3D::CVertexProgram DecalAttenuationVertexProgram(DecalAttenuationVertex typedef CShadowPolyReceiver::CRGBAVertex CRGBAVertex; -//**************************************************************************** +// **************************************************************************** CDecal::CDecal() { _ShadowMap = new CShadowMap(&(((CSceneUser *) Scene)->getScene().getRenderTrav().getShadowMapManager())); @@ -134,7 +134,7 @@ CDecal::CDecal() _TopBlendZMax = 10100.f; } -//**************************************************************************** +// **************************************************************************** void CDecal::setCustomUVMatrix(bool on, const NLMISC::CMatrix &matrix) { if (_CustomUVMatrix.set(on, matrix)) @@ -143,7 +143,7 @@ void CDecal::setCustomUVMatrix(bool on, const NLMISC::CMatrix &matrix) } } -//**************************************************************************** +// **************************************************************************** const std::string &CDecal::getTextureFileName() const { CTextureFile *tf = dynamic_cast(_Material.getTexture(0)); @@ -152,39 +152,39 @@ const std::string &CDecal::getTextureFileName() const return emptyString; } -//**************************************************************************** +// **************************************************************************** void CDecal::setupMaterialColor() { _Material.texConstantColor(1, NLMISC::CRGBA(_Emissive.R, _Emissive.G, _Emissive.B, _Diffuse.A)); } -//**************************************************************************** +// **************************************************************************** void CDecal::setEmissive(NLMISC::CRGBA emissive) { _Emissive = emissive; setupMaterialColor(); } -//**************************************************************************** +// **************************************************************************** void CDecal::setDiffuse(NLMISC::CRGBA diffuse) { _Diffuse = diffuse; setupMaterialColor(); } -//**************************************************************************** +// **************************************************************************** CRGBA CDecal::getDiffuse() const { return _Diffuse; } -//**************************************************************************** +// **************************************************************************** CDecal::~CDecal() { delete _ShadowMap; } -//**************************************************************************** +// **************************************************************************** void CDecal::setTexture(const std::string &fileName, bool clampU, bool clampV, bool filtered) { if (getTextureFileName() != fileName) @@ -225,7 +225,7 @@ void CDecal::setTexture(const std::string &fileName, bool clampU, bool clamp } } -//**************************************************************************** +// **************************************************************************** void CDecal::setWorldMatrix(const NLMISC::CMatrix &matrix) { float newMat[16]; @@ -253,7 +253,7 @@ void CDecal::setWorldMatrix(const NLMISC::CMatrix &matrix) } } -//**************************************************************************** +// **************************************************************************** bool CDecal::clipFront(const NLMISC::CPlane &p) const { for(uint k = 0; k < 8; ++k) @@ -263,7 +263,7 @@ bool CDecal::clipFront(const NLMISC::CPlane &p) const return true; } -//**************************************************************************** +// **************************************************************************** void CDecal::setWorldMatrixForArrow(const NLMISC::CVector2f &start, const NLMISC::CVector2f &end, float halfWidth) { CMatrix matrix; @@ -274,7 +274,7 @@ void CDecal::setWorldMatrixForArrow(const NLMISC::CVector2f &start, const NLM setWorldMatrix(matrix); } -//**************************************************************************** +// **************************************************************************** void CDecal::setWorldMatrixForSpot(const NLMISC::CVector2f &pos, float radius, float angleInRadians) { CMatrix matrix; @@ -288,7 +288,7 @@ void CDecal::setWorldMatrixForSpot(const NLMISC::CVector2f &pos, float radius, NLMISC::CVector r2MaskOffset(1.f / 4.f, 1.f / 4.f, 0.f); -//**************************************************************************** +// **************************************************************************** void CDecal::renderTriCache(NL3D::IDriver &drv, NL3D::CShadowPolyReceiver &/* receiver */, bool useVertexProgram) { if (_TriCache.empty()) return; @@ -400,7 +400,7 @@ void CDecal::renderTriCache(NL3D::IDriver &drv, NL3D::CShadowPolyReceiver &/* } } -//**************************************************************************** +// **************************************************************************** void CDecal::render(NL3D::UDriver &/* drv */, NL3D::CShadowPolyReceiver &receiver, const std::vector &worldPyramid, @@ -534,7 +534,7 @@ void CDecal::render(NL3D::UDriver &/* drv */, renderTriCache(*drvInternal, receiver, useVertexProgram); } -//**************************************************************************** +// **************************************************************************** void CDecalRenderList::renderAllDecals() { if (_Empty) return; @@ -588,7 +588,7 @@ void CDecalRenderList::renderAllDecals() } } -//**************************************************************************** +// **************************************************************************** void CDecalRenderList::clearRenderList() { for(uint k = 0; k < DECAL_NUM_PRIORITIES; ++k) @@ -598,7 +598,7 @@ void CDecalRenderList::clearRenderList() _Empty = true; } -//**************************************************************************** +// **************************************************************************** void CDecal::addToRenderList(uint priority /*=0*/) { if( !Landscape) @@ -611,14 +611,14 @@ void CDecal::addToRenderList(uint priority /*=0*/) drl._Empty = false; } -//**************************************************************************** +// **************************************************************************** bool CDecal::contains(const NLMISC::CVector2f &pos) const { CVector posIn = _InvertedWorldMatrix * CVector(pos.x, pos.y, 0.f); return posIn.x >= 0.f && posIn.x <= 1.f && posIn.y >= 0.f && posIn.y <= 1.f; } -//**************************************************************************** +// **************************************************************************** void CDecal::setClipDownFacing(bool clipDownFacing) { if (clipDownFacing != _ClipDownFacing) @@ -628,7 +628,7 @@ void CDecal::setClipDownFacing(bool clipDownFacing) } } -//**************************************************************************** +// **************************************************************************** void CDecal::setBottomBlend(float zMin, float zMax) { if (zMin > zMax) std::swap(zMin, zMax); @@ -636,7 +636,7 @@ void CDecal::setBottomBlend(float zMin, float zMax) _BottomBlendZMax = zMax; } -//**************************************************************************** +// **************************************************************************** void CDecal::setTopBlend(float zMin, float zMax) { if (zMin > zMax) std::swap(zMin, zMax); diff --git a/code/ryzom/client/src/decal_anim.cpp b/code/ryzom/client/src/decal_anim.cpp index 8ee2601bd..3e3b43172 100644 --- a/code/ryzom/client/src/decal_anim.cpp +++ b/code/ryzom/client/src/decal_anim.cpp @@ -27,7 +27,7 @@ using namespace NLMISC; -//***************************************************************************** +// ***************************************************************************** CDecalAnim::CDecalAnim() { DurationInMs = 1000; @@ -39,7 +39,7 @@ CDecalAnim::CDecalAnim() EndEmissive = CRGBA::Black; } -//***************************************************************************** +// ***************************************************************************** void CDecalAnim::updateDecal(const NLMISC::CVector2f &pos, float animRatio, CDecal &dest, float refScale) const { dest.setTexture(Texture); @@ -51,7 +51,7 @@ void CDecalAnim::updateDecal(const NLMISC::CVector2f &pos, float animRatio, CDec -//***************************************************************************** +// ***************************************************************************** void CDecalAnim::buildFromLuaTable(CLuaObject &table) { // retrieve a value from a lua table or affect a default value if not found diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp index 46a31e595..f215af2ff 100644 --- a/code/ryzom/client/src/entity_cl.cpp +++ b/code/ryzom/client/src/entity_cl.cpp @@ -1583,7 +1583,7 @@ void CEntityCL::setClusterSystem(UInstanceGroup *cluster) } }// setCluster // -//***************************************************************************************************** +// ***************************************************************************************************** NL3D::UInstanceGroup *CEntityCL::getClusterSystem() { if (!_Skeleton.empty()) return _Skeleton.getClusterSystem(); diff --git a/code/ryzom/client/src/entity_cl.h b/code/ryzom/client/src/entity_cl.h index 18e7a2afa..21402ee0d 100644 --- a/code/ryzom/client/src/entity_cl.h +++ b/code/ryzom/client/src/entity_cl.h @@ -233,7 +233,7 @@ public: void sheetId(const NLMISC::CSheetId &id) {_SheetId = id;} /// Return the persistent NPC alias of entity (0 if N/A). - const uint32 npcAlias() const {return _NPCAlias; } + uint32 npcAlias() const {return _NPCAlias; } /// Set the persistent NPC alias of the entity. void npcAlias(uint32 alias) {_NPCAlias = alias; } @@ -411,7 +411,7 @@ public: /// Return the entity current behaviour. - const MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;} + MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;} /** * Show or Hide the entity. diff --git a/code/ryzom/client/src/events_listener.cpp b/code/ryzom/client/src/events_listener.cpp index 82b01271d..eb21e0f0e 100644 --- a/code/ryzom/client/src/events_listener.cpp +++ b/code/ryzom/client/src/events_listener.cpp @@ -209,7 +209,7 @@ void CEventsListener::operator()(const CEvent& event) -//*********************************************************************** +// *********************************************************************** void CEventsListener::smoothMouseCoordinates(float &x, float &y, float smoothingPeriod) { if (smoothingPeriod > 0.001f) @@ -222,7 +222,7 @@ void CEventsListener::smoothMouseCoordinates(float &x, float &y, float smoothing } -//************************************************************* +// ************************************************************* void CEventsListener::updateMouseSmoothing() { if (_LastFreeLookUpdateDate != TimeInSec) @@ -240,7 +240,7 @@ void CEventsListener::updateMouseSmoothing() } } -//*************************************************************** +// *************************************************************** void CEventsListener::enableMouseSmoothing(bool on) { if (on == _MouseSmoothingOn) return; @@ -258,7 +258,7 @@ void CEventsListener::enableMouseSmoothing(bool on) } -//*************************************************************** +// *************************************************************** void CEventsListener::updateFreeLookPos(float x, float y) { @@ -324,7 +324,7 @@ void CEventsListener::updateFreeLookPos(float x, float y) } } -//*************************************************************** +// *************************************************************** void CEventsListener::updateCursorPos(float x, float y) { // Backup mouse diff --git a/code/ryzom/client/src/ground_fx_manager.cpp b/code/ryzom/client/src/ground_fx_manager.cpp index b96d80442..9b96aa356 100644 --- a/code/ryzom/client/src/ground_fx_manager.cpp +++ b/code/ryzom/client/src/ground_fx_manager.cpp @@ -59,7 +59,7 @@ static const float MAX_DIST_TO_REUSE_OLD_FX = 1.5f; using namespace NLMISC; -//***************************************************************************** +// ***************************************************************************** CGroundFXManager::CGroundFXManager() : _MinSpeed(1.5f), _MaxSpeed(6.f), @@ -77,7 +77,7 @@ CGroundFXManager::CGroundFXManager() : // Construct } -//***************************************************************************** +// ***************************************************************************** CGroundFXManager::~CGroundFXManager() { H_AUTO_USE(RZ_GroundFXManager) @@ -85,7 +85,7 @@ CGroundFXManager::~CGroundFXManager() CHECK_INTEGRITY } -//***************************************************************************** +// ***************************************************************************** void CGroundFXManager::reset() { H_AUTO_USE(RZ_GroundFXManager) @@ -124,7 +124,7 @@ void CGroundFXManager::reset() _Scene = NULL; } -//***************************************************************************** +// ***************************************************************************** void CGroundFXManager::init(NL3D::UScene *scene, float maxDist, uint maxNumFX, uint fxCacheSize) { H_AUTO_USE(RZ_GroundFXManager) @@ -135,7 +135,7 @@ void CGroundFXManager::init(NL3D::UScene *scene, float maxDist, uint maxNumFX, u _MaxNumCachedFX = fxCacheSize; } -//***************************************************************************** +// ***************************************************************************** CGroundFXManager::TEntityHandle CGroundFXManager::add(CEntityCL *entity) { H_AUTO_USE(RZ_GroundFXManager) @@ -162,7 +162,7 @@ CGroundFXManager::TEntityHandle CGroundFXManager::add(CEntityCL *entity) return _InstancesList.begin(); } -//***************************************************************************** +// ***************************************************************************** void CGroundFXManager::remove(TEntityHandle handle) { H_AUTO_USE(RZ_GroundFXManager) @@ -195,7 +195,7 @@ void CGroundFXManager::remove(TEntityHandle handle) // predicate to test a ground id -//***************************************************************************** +// ***************************************************************************** // Predicate for binary search in a vector of sorted ground fx sheets struct CCmpGroundIDPred { @@ -205,7 +205,7 @@ struct CCmpGroundIDPred } }; -//***************************************************************************** +// ***************************************************************************** void CGroundFXManager::CInstance::getFXNameFromGroundType(uint32 groundID, std::string &fxName) const { H_AUTO_USE(RZ_GroundFXManager) @@ -224,7 +224,7 @@ void CGroundFXManager::CInstance::getFXNameFromGroundType(uint32 groundID, std:: fxName= it->getFXName(); } -//***************************************************************************** +// ***************************************************************************** /** Predicate to sort instances by distances. */ struct CSortInstancePred @@ -235,7 +235,7 @@ struct CSortInstancePred } }; -//***************************************************************************** +// ***************************************************************************** void CGroundFXManager::invalidateFX(TEntityHandle instance) { H_AUTO_USE(RZ_GroundFXManager) @@ -272,7 +272,7 @@ void CGroundFXManager::invalidateFX(TEntityHandle instance) } -//***************************************************************************** +// ***************************************************************************** void CGroundFXManager::moveFXInCache(TGroundFXList &ownerList, TGroundFXHandle fx) { H_AUTO_USE(RZ_GroundFXManager) @@ -295,7 +295,7 @@ void CGroundFXManager::moveFXInCache(TGroundFXList &ownerList, TGroundFXHandle f } -//******************************************************************************************* +// ******************************************************************************************* void CGroundFXManager::checkIntegrity() { H_AUTO_USE(RZ_GroundFXManager) @@ -330,7 +330,7 @@ void CGroundFXManager::checkIntegrity() } -//***************************************************************************** +// ***************************************************************************** void CGroundFXManager::update(const NLMISC::CVectorD &camPos) { H_AUTO_USE(RZ_GroundFXManager) @@ -759,7 +759,7 @@ using NLMISC::toString; CTestGroundFX TestGroundFX; -//*********************************************************************************************** +// *********************************************************************************************** void CTestGroundFX::update() { H_AUTO_USE(RZ_GroundFXManager) @@ -796,7 +796,7 @@ void CTestGroundFX::update() -//*********************************************************************************************** +// *********************************************************************************************** void CTestGroundFX::displayFXBoxes() const { H_AUTO_USE(RZ_GroundFXManager) @@ -832,7 +832,7 @@ void CTestGroundFX::displayFXBoxes() const } -//******************************************************************************************* +// ******************************************************************************************* void CGroundFXManager::setMinSpeed(float minSpeed) { H_AUTO_USE(RZ_GroundFXManager) @@ -840,7 +840,7 @@ void CGroundFXManager::setMinSpeed(float minSpeed) _MinSpeed = minSpeed; } -//******************************************************************************************* +// ******************************************************************************************* void CGroundFXManager::setMaxSpeed(float maxSpeed) { H_AUTO_USE(RZ_GroundFXManager) @@ -848,7 +848,7 @@ void CGroundFXManager::setMaxSpeed(float maxSpeed) _MaxSpeed = maxSpeed; } -//******************************************************************************************* +// ******************************************************************************************* void CGroundFXManager::setSpeedWaterWalkFast(float speed) { H_AUTO_USE(RZ_GroundFXManager) @@ -856,7 +856,7 @@ void CGroundFXManager::setSpeedWaterWalkFast(float speed) _SpeedWaterWalkFast = speed; } -//******************************************************************************************* +// ******************************************************************************************* void CGroundFXManager::setSpeedWaterSwimFast(float speed) { H_AUTO_USE(RZ_GroundFXManager) @@ -866,7 +866,7 @@ void CGroundFXManager::setSpeedWaterSwimFast(float speed) -//******************************************************************************************* +// ******************************************************************************************* // temp, for debug // add an entity for test diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index c03bfcce5..a232b835f 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -152,7 +152,7 @@ extern CContinentManager ContinentMngr; ucstring TipsOfTheDay; uint TipsOfTheDayIndex; -// includes pour les register class qui suivent (grrrr !!!!) +// includes for following register classes #include "entities.h" #include "character_cl.h" #include "player_cl.h" @@ -578,7 +578,6 @@ void checkDriverDepth () } } - void addSearchPaths(IProgressCallback &progress) { // Add search path of UI addon. Allow only a subset of files. @@ -744,7 +743,6 @@ void prelogInit() CLoginProgressPostThread::getInstance().init(ClientCfg.ConfigFile); - // tmp for patcher debug extern void tmpFlagMainlandPatchCategories(NLMISC::CConfigFile &cf); extern void tmpFlagRemovedPatchCategories(NLMISC::CConfigFile &cf); @@ -790,7 +788,6 @@ void prelogInit() FPU_CHECKER_ONCE - switch (getCurrentColorDepth()) { case 16: CustomMouse.setColorDepth(CCustomMouse::ColorDepth16); break; @@ -801,7 +798,6 @@ void prelogInit() break; } - // Check driver version checkDriverVersion(); @@ -835,8 +831,6 @@ void prelogInit() } Driver = UDriver::createDriver ((uint)LoadIcon (HInstance, MAKEINTRESOURCE(IDI_MAIN_ICON)), direct3D); - - #else // NL_OS_WINDOWS Driver = UDriver::createDriver (); #endif // NL_OS_WINDOWS diff --git a/code/ryzom/client/src/input.cpp b/code/ryzom/client/src/input.cpp index 483abdd0c..368ffa98d 100644 --- a/code/ryzom/client/src/input.cpp +++ b/code/ryzom/client/src/input.cpp @@ -33,6 +33,7 @@ // Misc #include "nel/misc/mouse_device.h" #include "nel/misc/mouse_smoother.h" +#include "nel/misc/system_utils.h" // Game Share @@ -74,13 +75,13 @@ bool MouseCapture = false; // FUNCTION // ////////////// -//********************************************************************************* +// ********************************************************************************* uint GetMouseButtonsState() { return DownMouseButtons; } -//********************************************************************************* +// ********************************************************************************* // Initialize the mouse bool InitMouseWithCursor (bool hardware) { @@ -181,14 +182,14 @@ bool InitMouseWithCursor (bool hardware) return true; } -//********************************************************************************* +// ********************************************************************************* // Is mouse cursor hardware ? bool IsMouseCursorHardware () { return MouseHardware; } -//********************************************************************************* +// ********************************************************************************* // Set the mouse mode. Call this method once per frame to update window size void UpdateMouse () { @@ -237,7 +238,7 @@ void UpdateMouse () } } -//********************************************************************************* +// ********************************************************************************* // Use this method to toggle the mouse (freelook <- cursor) void SetMouseFreeLook () { @@ -260,14 +261,14 @@ void SetMouseFreeLook () } } -//********************************************************************************* +// ********************************************************************************* bool IsMouseFreeLook() { return MouseFreeLook; } -//********************************************************************************* +// ********************************************************************************* // Use this method to toggle the mouse (freelook -> cursor) void SetMouseCursor (bool updatePos) { @@ -350,7 +351,7 @@ void SetMouseCursor (bool updatePos) } } -//********************************************************************************* +// ********************************************************************************* // Use this method to set the cursor speed void SetMouseSpeed (float speed) { @@ -358,7 +359,7 @@ void SetMouseSpeed (float speed) UpdateMouse (); } -//********************************************************************************* +// ********************************************************************************* // Use this method to set the cursor acceleration void SetMouseAcceleration (uint accel) { @@ -366,7 +367,7 @@ void SetMouseAcceleration (uint accel) UpdateMouse (); } -//********************************************************************************* +// ********************************************************************************* void CaptureSystemCursor() { if (IsSystemCursorCaptured()) return; @@ -380,7 +381,7 @@ void CaptureSystemCursor() #endif } -//********************************************************************************* +// ********************************************************************************* void ReleaseSystemCursor() { if (!IsSystemCursorCaptured()) return; @@ -399,7 +400,7 @@ void ReleaseSystemCursor() #endif } -//********************************************************************************* +// ********************************************************************************* bool IsSystemCursorCaptured() { if (!Driver) return false; @@ -413,7 +414,7 @@ bool IsSystemCursorCaptured() #endif } -//********************************************************************************* +// ********************************************************************************* void HandleSystemCursorCapture(const CEvent &event) { if (event == EventMouseDownId) @@ -445,7 +446,7 @@ void HandleSystemCursorCapture(const CEvent &event) } -//********************************************************************************* +// ********************************************************************************* bool IsSystemCursorInClientArea() { if (!Driver) return false; diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/code/ryzom/client/src/interface_v3/action_handler_item.cpp index f2b1002cf..009829b9e 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_item.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_item.cpp @@ -49,14 +49,14 @@ using namespace NLMISC; CInterfaceItemEdition *CInterfaceItemEdition::_Instance = NULL; -//******************************************************************************************** +// ******************************************************************************************** CInterfaceItemEdition *CInterfaceItemEdition::getInstance() { if (!_Instance) _Instance = new CInterfaceItemEdition; return _Instance; } -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::releaseInstance() { if( _Instance ) @@ -66,7 +66,7 @@ void CInterfaceItemEdition::releaseInstance() } } -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::setCurrWindow(CDBCtrlSheet* ctrlSheet, const std::string &windowName, const bool &isInEditionMode) { _CurrWindow.end(); @@ -84,19 +84,19 @@ void CInterfaceItemEdition::setCurrWindow(CDBCtrlSheet* ctrlSheet, const std::st } -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::update() { _CurrWindow.update(); } -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::validate() { _CurrWindow.validate(); setCurrWindow(NULL); } -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::CItemEditionWindow::infoReceived() { if(_CurrItemSheet && !WindowName.empty()) @@ -164,15 +164,15 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived() -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::CItemEditionWindow::update() { - if(_CurrItemSheet && (ItemSheet != _CurrItemSheet->getSheetId())) + if(_CurrItemSheet && ((sint32)ItemSheet != _CurrItemSheet->getSheetId())) { end(); } } -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::CItemEditionWindow::begin() { if(_CurrItemSheet && !WindowName.empty()) @@ -291,7 +291,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin() } } } -//******************************************************************************************** +// ******************************************************************************************** void CInterfaceItemEdition::CItemEditionWindow::end() { diff --git a/code/ryzom/client/src/interface_v3/action_handler_misc.cpp b/code/ryzom/client/src/interface_v3/action_handler_misc.cpp index 5c0a53c9b..9a4f5f232 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_misc.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_misc.cpp @@ -502,7 +502,7 @@ struct CCameraBackup }; -//********************************************************* +// ********************************************************* CCameraBackup setupCameraForScreenshot(UScene &scene, uint left, uint right, uint top, uint bottom, uint screenShotWidth, uint screenShotHeight) { CCameraBackup cb; @@ -530,7 +530,7 @@ CCameraBackup setupCameraForScreenshot(UScene &scene, uint left, uint right, uin } -//********************************************************* +// ********************************************************* static void restoreCamera(UScene &scene, const CCameraBackup &backup) { scene.getCam().setFrustum (backup.Frustum); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp b/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp index cdde9994c..984e05700 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp @@ -34,7 +34,7 @@ using namespace NLNET; CBotChatManager *CBotChatManager::_Instance = NULL; -//******************************************************************************************** +// ******************************************************************************************** CBotChatManager::CBotChatManager() { _CurrPage = NULL; @@ -42,21 +42,21 @@ CBotChatManager::CBotChatManager() //_ChosenMissionFlags = 0; } -//******************************************************************************************** +// ******************************************************************************************** CBotChatManager::~CBotChatManager() { // Destruct nlassert(_CurrPage == NULL); // should have called setCurrPage(NULL) before quitting (and before releasing the interface) ! } -//******************************************************************************************** +// ******************************************************************************************** CBotChatManager *CBotChatManager::getInstance() { if (!_Instance) _Instance = new CBotChatManager; return _Instance; } -//******************************************************************************************** +// ******************************************************************************************** void CBotChatManager::releaseInstance() { if( _Instance ) @@ -66,7 +66,7 @@ void CBotChatManager::releaseInstance() } } -//******************************************************************************************** +// ******************************************************************************************** void CBotChatManager::setCurrPage(CBotChatPage *page) { if (_CurrPage) @@ -85,13 +85,13 @@ void CBotChatManager::setCurrPage(CBotChatPage *page) _CurrPage = page; } -//******************************************************************************************** +// ******************************************************************************************** void CBotChatManager::update() { if (_CurrPage) _CurrPage->update(); } -//******************************************************************************************** +// ******************************************************************************************** void CBotChatManager::endDialog() { NLMISC::CBitMemStream out; @@ -212,7 +212,7 @@ void CBotChatManager::debugLocalReceiveMissionInfo() } -//******************************************************************************************** +// ******************************************************************************************** /*void CBotChatManager::processMissionHelpInfos(uint8 index, CPrerequisitInfos &infos) { std::map::iterator it = _MissionHelpWindowsWaiting.find(index); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_manager.h b/code/ryzom/client/src/interface_v3/bot_chat_manager.h index dab99170e..e3dd73d79 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_manager.h +++ b/code/ryzom/client/src/interface_v3/bot_chat_manager.h @@ -76,7 +76,7 @@ public: void setChosenMissionFlags(uint flag) { _ChosenMissionFlags = flag; } */ - //*** + // *** // Add a Waiter on mission prereq info (MissionHelp opening). no-op if here, but reorder void addMissionInfoWaiter(IMissionPrereqInfosWaiter *waiter); // remove a Waiter on mission prereq info (MissionHelp closing). no-op if not here. NB: no delete @@ -95,7 +95,7 @@ private: static CBotChatManager *_Instance; //uint _ChosenMissionFlags; - //*** keep infos on opened mission help windows (for prerequisits) + // *** keep infos on opened mission help windows (for prerequisits) typedef std::list TMissionPrereqInfosWaiter; TMissionPrereqInfosWaiter _MissionInfoWaiters; diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page.cpp index 519a08bbe..5714afffa 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page.cpp @@ -23,7 +23,7 @@ #include "../user_entity.h" -//***************************************************************************** +// ***************************************************************************** void CBotChatPage::activateWindow(const char *windowName, bool active) { CInterfaceManager *im = CInterfaceManager::getInstance(); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_all.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_all.cpp index 38d021760..220737296 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_all.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_all.cpp @@ -37,7 +37,7 @@ CBotChatPageAll *BotChatPageAll = NULL; -//******************************************************************* +// ******************************************************************* CBotChatPageAll::CBotChatPageAll() { Trade = NULL; @@ -50,7 +50,7 @@ CBotChatPageAll::CBotChatPageAll() RingSessions = NULL; } -//******************************************************************* +// ******************************************************************* CBotChatPageAll::~CBotChatPageAll() { delete Trade; @@ -63,7 +63,7 @@ CBotChatPageAll::~CBotChatPageAll() delete RingSessions; } -//******************************************************************* +// ******************************************************************* void CBotChatPageAll::init() { Trade = new CBotChatPageTrade; diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp index 60c0097ed..4efa1067a 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_create_guild.cpp @@ -32,7 +32,7 @@ using namespace std; static const char *WIN_BOT_CHAT_PAGE_CREATE_GUILD = "ui:interface:bot_chat_create_guild"; -//*************************************************************************** +// *************************************************************************** void CBotChatPageCreateGuild::begin() { CBotChatPage::begin(); @@ -43,7 +43,7 @@ void CBotChatPageCreateGuild::begin() activateWindow(WIN_BOT_CHAT_PAGE_CREATE_GUILD, true); } -//*************************************************************************** +// *************************************************************************** void CBotChatPageCreateGuild::end() { activateWindow(WIN_BOT_CHAT_PAGE_CREATE_GUILD, false); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp index 5859b3fd2..af39d7d8d 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_dynamic_mission.cpp @@ -47,7 +47,7 @@ static const char *DM_VALID_DB_PATH = "UI:TEMP:DYNAMIC_MISSION_VALID"; using namespace STRING_MANAGER; using NLMISC::toString; -//************************************************************************************************* +// ************************************************************************************************* CBotChatPageDynamicMission::CBotChatPageDynamicMission() { std::fill(_ChoiceCB, _ChoiceCB + DYNAMIC_MISSION_NUM_CHOICES, (CDBGroupComboBox *) NULL); @@ -62,7 +62,7 @@ CBotChatPageDynamicMission::CBotChatPageDynamicMission() _MissionValid = false; } -//************************************************************************************************* +// ************************************************************************************************* void CBotChatPageDynamicMission::invalidateMission() { CInterfaceManager *im = CInterfaceManager::getInstance(); @@ -72,7 +72,7 @@ void CBotChatPageDynamicMission::invalidateMission() _MissionValid = false; } -//************************************************************************************************* +// ************************************************************************************************* void CBotChatPageDynamicMission::begin() { CBotChatPage::begin(); @@ -119,7 +119,7 @@ void CBotChatPageDynamicMission::begin() } } -//************************************************************************************************* +// ************************************************************************************************* void CBotChatPageDynamicMission::end() { // if a menu is currently poped, disable it @@ -128,13 +128,13 @@ void CBotChatPageDynamicMission::end() activateWindow(WIN_BOT_CHAT_PAGE_DYNAMIC_MISSION, false); } -//************************************************************************************************* +// ************************************************************************************************* void CBotChatPageDynamicMission::init() { } -//************************************************************************************************* +// ************************************************************************************************* void CBotChatPageDynamicMission::update() { CInterfaceManager *im = CInterfaceManager::getInstance(); @@ -223,7 +223,7 @@ void CBotChatPageDynamicMission::update() } } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageDynamicMission::sendChoices() { uint k; @@ -250,7 +250,7 @@ void CBotChatPageDynamicMission::sendChoices() } } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageDynamicMission::selectionChanged(uint choice) { if (choice > DYNAMIC_MISSION_NUM_CHOICES) @@ -268,7 +268,7 @@ void CBotChatPageDynamicMission::selectionChanged(uint choice) sendChoices(); } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageDynamicMission::regen() { if (!_MissionValid) return; @@ -282,7 +282,7 @@ void CBotChatPageDynamicMission::regen() // ACTION HANDLERS // ///////////////////// -//*************************************************************************************** +// *************************************************************************************** // the player has clicked on an item to buy it class CAHChangeDMOption : public IActionHandler { @@ -301,7 +301,7 @@ class CAHChangeDMOption : public IActionHandler }; REGISTER_ACTION_HANDLER(CAHChangeDMOption, "change_dm_option"); -//*************************************************************************************** +// *************************************************************************************** // regenerate current mission class CAHRegenDM : public IActionHandler { @@ -313,7 +313,7 @@ class CAHRegenDM : public IActionHandler REGISTER_ACTION_HANDLER(CAHRegenDM, "regen_dm"); -//*************************************************************************************** +// *************************************************************************************** // the player accepted the mission class CAHAcceptDM : public IActionHandler { diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp index 23328b569..66d98277d 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp @@ -39,14 +39,14 @@ static const char *WIN_BOT_CHAT_PAGE_MISSION = "ui:interface:bot_chat_missions"; static const char *WIN_BOT_CHAT_ACCEPT_MISSION = "ui:interface:bot_chat_accept_mission"; -//*************************************************************************************** +// *************************************************************************************** CBotChatPageMission::CBotChatPageMission() { _MissionPagesObs.setListType(CHugeListObs::Missions); _CurrSel = NULL; } -//******************************************************************************************* +// ******************************************************************************************* void CBotChatPageMission::init() { CInterfaceManager *im = CInterfaceManager::getInstance(); @@ -55,7 +55,7 @@ void CBotChatPageMission::init() } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageMission::begin() { CBotChatPage::begin(); @@ -83,14 +83,14 @@ void CBotChatPageMission::begin() } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageMission::end() { activateWindow(WIN_BOT_CHAT_PAGE_MISSION, false); activateWindow(WIN_BOT_CHAT_ACCEPT_MISSION, false); } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageMission::selectMission(CDBCtrlSheet *missionSheet) { if (!missionSheet) return; @@ -132,7 +132,7 @@ void CBotChatPageMission::selectMission(CDBCtrlSheet *missionSheet) _CurrSel = missionSheet; } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageMission::acceptMission() { if (!_CurrSel) return; diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp index fdfab21a2..b6361a5ca 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_mission_end.cpp @@ -31,7 +31,7 @@ static const char *WIN_BOT_CHAT_PAGE_MISSION_END = "ui:interface:bot_chat_missio // Context help extern void contextHelp (const std::string &help); -//*************************************************************************** +// *************************************************************************** void CBotChatPageMissionEnd::begin() { return; @@ -71,7 +71,7 @@ void CBotChatPageMissionEnd::begin() */ } -//*************************************************************************** +// *************************************************************************** void CBotChatPageMissionEnd::end() { activateWindow(WIN_BOT_CHAT_PAGE_MISSION_END, false); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_news.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_news.cpp index fce05163c..5ec5631b6 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_news.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_news.cpp @@ -23,7 +23,7 @@ static const char *WIN_BOT_CHAT_PAGE_NEWS = "ui:interface:bot_chat_news"; -//*************************************************************************** +// *************************************************************************** void CBotChatPageNews::begin() { CBotChatPage::begin(); @@ -34,7 +34,7 @@ void CBotChatPageNews::begin() activateWindow(WIN_BOT_CHAT_PAGE_NEWS, true); } -//*************************************************************************** +// *************************************************************************** void CBotChatPageNews::end() { activateWindow(WIN_BOT_CHAT_PAGE_NEWS, false); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp index 66270baf5..1c16a68cc 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp @@ -29,7 +29,7 @@ static const char *WIN_BOT_CHAT_PAGE_PLAYER_GIFT = "ui:interface:bot_chat_player_gift"; -//************************************************************************************* +// ************************************************************************************* void CBotChatPagePlayerGift::begin() { CBotChatPage::begin(); @@ -55,7 +55,7 @@ void CBotChatPagePlayerGift::begin() PlayerTrade.BotChatGiftContext= true; } -//************************************************************************************* +// ************************************************************************************* void CBotChatPagePlayerGift::end() { // If the player gift was not validated, restore all items. else must not! diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp index 42a92da70..66a9add5e 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_ring_sessions.cpp @@ -25,14 +25,14 @@ #define WIN_BOT_CHAT_PAGE_RING_SESSION "ui:interface:ring_sessions" -//************************************************* +// ************************************************* CBotChatPageRingSessions::CBotChatPageRingSessions() { RingAccessPointPos.set(0.f, 0.f, 0.f); } -//************************************************* +// ************************************************* void CBotChatPageRingSessions::begin() { CBotChatPage::begin(); @@ -43,7 +43,7 @@ void CBotChatPageRingSessions::begin() } } -//************************************************* +// ************************************************* void CBotChatPageRingSessions::end() { activateWindow(WIN_BOT_CHAT_PAGE_RING_SESSION, false); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp index cadb717eb..1073d89b0 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp @@ -503,7 +503,7 @@ uint32 CBotChatPageTrade::getUserFactionPoints(PVP_CLAN::TPVPClan clan) const return pLeaf->getValue32(); } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageTrade::notifyDownloadComplete(bool completed) { CInterfaceManager *im = CInterfaceManager::getInstance(); @@ -527,7 +527,7 @@ void CBotChatPageTrade::notifyDownloadComplete(bool completed) gc->visit(&visitor); } -//*************************************************************************************** +// *************************************************************************************** void CBotChatPageTrade::updateTradeModal() { // if loading is finished, then signal it to all sheet list, so they can display an help message if they diff --git a/code/ryzom/client/src/interface_v3/chat_filter.h b/code/ryzom/client/src/interface_v3/chat_filter.h index 31c4d1268..d288d9867 100644 --- a/code/ryzom/client/src/interface_v3/chat_filter.h +++ b/code/ryzom/client/src/interface_v3/chat_filter.h @@ -81,7 +81,7 @@ private: virtual void chatWindowRemoved(CChatWindow *cw); // // copy not supported - CChatInputFilter(const CChatInputFilter &/* other */) { nlassert(0); } + CChatInputFilter(const CChatInputFilter &/* other */):NLMISC::CRefCount() { nlassert(0); } CChatInputFilter &operator=(const CChatInputFilter &/* other */) { nlassert(0); return *this; } }; @@ -157,7 +157,7 @@ private: void chatWindowRemoved(CChatWindow *cw); void msgEntered(const ucstring &msg, CChatWindow *chatWindow); // copy not supported - CChatTargetFilter(const CChatTargetFilter &/* other */) { nlassert(0); } + CChatTargetFilter(const CChatTargetFilter &/* other */):NLMISC::CRefCount() { nlassert(0); } CChatTargetFilter& operator=(const CChatTargetFilter &/* other */) { nlassert(0); return *this; } }; diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp index ae674a368..a842de29b 100644 --- a/code/ryzom/client/src/interface_v3/chat_window.cpp +++ b/code/ryzom/client/src/interface_v3/chat_window.cpp @@ -1225,7 +1225,7 @@ CChatWindow *CChatWindowManager::getChatWindowByIndex(uint index) ///////////////////// -//*************************************************************************************** +// *************************************************************************************** class CHandlerChatBoxEntry : public IActionHandler { public: @@ -1298,7 +1298,7 @@ static ucstring getFreeTellerName(CInterfaceElement *pCaller) return cgw->getFreeTellerName(freeTeller->getId()); } -//*************************************************************************************** +// *************************************************************************************** class CHandlerAddTellerToFriendList : public IActionHandler { public: @@ -1323,7 +1323,7 @@ public: REGISTER_ACTION_HANDLER(CHandlerAddTellerToFriendList, "add_teller_to_friend_list"); -//*************************************************************************************** +// *************************************************************************************** class CHandlerAddTellerToIgnoreList : public IActionHandler { public: @@ -1358,7 +1358,7 @@ public: }; REGISTER_ACTION_HANDLER(CHandlerAddTellerToIgnoreList, "add_teller_to_ignore_list"); -//*************************************************************************************** +// *************************************************************************************** class CHandlerInviteToRingSession : public IActionHandler { public: diff --git a/code/ryzom/client/src/interface_v3/ctrl_polygon.cpp b/code/ryzom/client/src/interface_v3/ctrl_polygon.cpp index b46c2014f..459851037 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_polygon.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_polygon.cpp @@ -24,7 +24,7 @@ using namespace NLMISC; -//********************************************************************************* +// ********************************************************************************* CCtrlPolygon::CCtrlPolygon() : CCtrlBase(TCtorParam()) { // Construct @@ -33,7 +33,7 @@ CCtrlPolygon::CCtrlPolygon() : CCtrlBase(TCtorParam()) _Valid = true; } -//********************************************************************************* +// ********************************************************************************* void CCtrlPolygon::updateBoudingRect() { H_AUTO(Rz_CCtrlPolygon_updateBoudingRect) @@ -68,7 +68,7 @@ void CCtrlPolygon::updateBoudingRect() setH(ymax - ymin); } -//********************************************************************************* +// ********************************************************************************* bool CCtrlPolygon::contains(const CVector2f &pos) const { H_AUTO(Rz_CCtrlPolygon_contains) @@ -76,7 +76,7 @@ bool CCtrlPolygon::contains(const CVector2f &pos) const return _XFormPoly.contains(pos, false); } -//********************************************************************************* +// ********************************************************************************* void CCtrlPolygon::setVertices(const std::vector &vertices) { H_AUTO(Rz_CCtrlPolygon_setVertices) @@ -132,7 +132,7 @@ static inline bool totallyOutside(const CVector &minCorner, const CVector &maxCo } -//********************************************************************************* +// ********************************************************************************* /*void CCtrlPolygon::setMatrix(const NLMISC::CMatrix &mat) { const float *lhs = mat.get(); @@ -144,7 +144,7 @@ static inline bool totallyOutside(const CVector &minCorner, const CVector &maxCo }*/ -//********************************************************************************* +// ********************************************************************************* void CCtrlPolygon::draw() { H_AUTO(Rz_CCtrlPolygon_draw) @@ -262,7 +262,7 @@ void CCtrlPolygon::draw() vr.drawUnclippedTriangles(_RenderLayer, _RealTris, col); } -//********************************************************************************* +// ********************************************************************************* void CCtrlPolygon::updateCoords() { H_AUTO(Rz_CCtrlPolygon_updateCoords) @@ -272,21 +272,21 @@ void CCtrlPolygon::updateCoords() _Touched = true; } -//********************************************************************************* +// ********************************************************************************* void CCtrlPolygon::setAlpha(sint32 a) { H_AUTO(Rz_CCtrlPolygon_setAlpha) _Color.A = (uint8) a; } -//********************************************************************************* +// ********************************************************************************* bool CCtrlPolygon::handleEvent(const CEventDescriptor &/* event */) { H_AUTO(Rz_CCtrlPolygon_handleEvent) return false; } -//********************************************************************************* +// ********************************************************************************* // TMP TMP void CCtrlPolygon::computeScaledVertex(NLMISC::CVector2f &dest, const NLMISC::CVector2f &src) { @@ -294,7 +294,7 @@ void CCtrlPolygon::computeScaledVertex(NLMISC::CVector2f &dest, const NLMISC::CV dest.set(src.x, src.y); } -//********************************************************************************* +// ********************************************************************************* // TMP TMP void CCtrlPolygon::touch() { diff --git a/code/ryzom/client/src/interface_v3/ctrl_quad.cpp b/code/ryzom/client/src/interface_v3/ctrl_quad.cpp index b8b4455eb..5eb8f1597 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_quad.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_quad.cpp @@ -23,7 +23,7 @@ using namespace NLMISC; -//********************************************************************************* +// ********************************************************************************* CCtrlQuad::CCtrlQuad() : CCtrlBase(TCtorParam()), _Color(CRGBA::White), _Additif(false), _Filtered(true), @@ -39,14 +39,14 @@ CCtrlQuad::CCtrlQuad() : CCtrlBase(TCtorParam()), _Color(CRGBA::White), _RealQuad.Uv3.set(0.f, 1.f); } -//********************************************************************************* +// ********************************************************************************* bool CCtrlQuad::parse(xmlNodePtr /* cur */, CInterfaceGroup * /* parentGroup */) { nlassert(0); // NOT IMPLEMENTED (only created dynamically at this time) return false; } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::updateCoords() { H_AUTO(Rz_CCtrlQuad_updateCoords) @@ -57,7 +57,7 @@ void CCtrlQuad::updateCoords() _RealQuad.set(_Quad.V0 + delta, _Quad.V1 + delta, _Quad.V2 + delta, _Quad.V3 + delta); } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::draw() { H_AUTO(Rz_CCtrlQuad_draw) @@ -287,14 +287,14 @@ void CCtrlQuad::draw() } } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setAlpha(sint32 a) { H_AUTO(Rz_CCtrlQuad_setAlpha) _Color.A = (uint8) a; } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setTexture(const std::string &texName) { H_AUTO(Rz_CCtrlQuad_setTexture) @@ -303,7 +303,7 @@ void CCtrlQuad::setTexture(const std::string &texName) _TextureId.setTexture(texName.c_str()); } -//********************************************************************************* +// ********************************************************************************* std::string CCtrlQuad::getTexture() const { H_AUTO(Rz_CCtrlQuad_getTexture) @@ -312,7 +312,7 @@ std::string CCtrlQuad::getTexture() const return rVR.getTextureNameFromId (_TextureId); } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setQuad(const CQuad &quad) { H_AUTO(Rz_CCtrlQuad_setQuad) @@ -328,7 +328,7 @@ void CCtrlQuad::setQuad(const CQuad &quad) _Quad = quad; } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setQuad(const NLMISC::CVector &start, const NLMISC::CVector &end, float thickness) { H_AUTO(Rz_CCtrlQuad_setQuad) @@ -338,7 +338,7 @@ void CCtrlQuad::setQuad(const NLMISC::CVector &start, const NLMISC::CVector &end setQuad(CQuad(start + up, end + up, end - up, start - up)); } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setQuad(const NLMISC::CVector &pos, float radius, float angle /*=0.f*/) { H_AUTO(Rz_CCtrlQuad_setQuad) @@ -353,7 +353,7 @@ void CCtrlQuad::setQuad(const NLMISC::CVector &pos, float radius, float angle /* } } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setQuad(const std::string &texName, const NLMISC::CVector &srcPos, float angle /*= 0.f*/, float offCenter /* = 0.f*/) { H_AUTO(Rz_CCtrlQuad_setQuad) @@ -379,21 +379,21 @@ void CCtrlQuad::setQuad(const std::string &texName, const NLMISC::CVector &srcPo } } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setAdditif(bool additif) { H_AUTO(Rz_CCtrlQuad_setAdditif) _Additif = additif; } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setFiltered(bool filtered) { H_AUTO(Rz_CCtrlQuad_setFiltered) _Filtered = filtered; } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setPattern(float umin, float umax, TWrapMode wrapMode) { H_AUTO(Rz_CCtrlQuad_setPattern) @@ -403,7 +403,7 @@ void CCtrlQuad::setPattern(float umin, float umax, TWrapMode wrapMode) _WrapMode = wrapMode; } -//********************************************************************************* +// ********************************************************************************* void CCtrlQuad::setCustomUVs(const CUV uvs[4]) { H_AUTO(Rz_CCtrlQuad_setCustomUVs) @@ -411,14 +411,14 @@ void CCtrlQuad::setCustomUVs(const CUV uvs[4]) _WrapMode = CustomUVs; } -//********************************************************************************* +// ********************************************************************************* bool CCtrlQuad::handleEvent(const CEventDescriptor &/* event */) { H_AUTO(Rz_CCtrlQuad_handleEvent) return false; } -//********************************************************************************* +// ********************************************************************************* bool CCtrlQuad::contains(const NLMISC::CVector2f &pos) const { H_AUTO(Rz_CCtrlQuad_contains) diff --git a/code/ryzom/client/src/interface_v3/custom_mouse.cpp b/code/ryzom/client/src/interface_v3/custom_mouse.cpp index 183c7e761..84db66c68 100644 --- a/code/ryzom/client/src/interface_v3/custom_mouse.cpp +++ b/code/ryzom/client/src/interface_v3/custom_mouse.cpp @@ -30,7 +30,7 @@ using namespace NL3D; #ifdef NL_OS_WINDOWS -//************************************************************************************* +// ************************************************************************************* CCustomMouse::CCursor::CCursor() : ColorDepth(CCustomMouse::ColorDepth32), OrigHeight(32), HotspotScale(1.f), @@ -44,7 +44,7 @@ CCustomMouse::CCursor::CCursor() : ColorDepth(CCustomMouse::ColorDepth32), { } -//************************************************************************************* +// ************************************************************************************* CCustomMouse::CCursor::~CCursor() { if (Icon) @@ -53,7 +53,7 @@ CCustomMouse::CCursor::~CCursor() } } -//************************************************************************************* +// ************************************************************************************* CCustomMouse::CCustomMouse() { _ColorDepth = CCustomMouse::ColorDepth32; @@ -68,7 +68,7 @@ CCustomMouse::CCustomMouse() -//************************************************************************************* +// ************************************************************************************* bool CCustomMouse::isAlphaBlendedCursorSupported() { if (!_AlphaBlendedCursorSupportRetrieved) @@ -96,7 +96,7 @@ namespace NLMISC extern bool TempMaxVerboseResample; } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::addCursor(const std::string &name, const NLMISC::CBitmap &cursorBitmap) { if (!isAlphaBlendedCursorSupported()) return; @@ -279,7 +279,7 @@ void CCustomMouse::addCursor(const std::string &name, const NLMISC::CBitmap &cur } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::release() { if (!isAlphaBlendedCursorSupported()) return; @@ -292,7 +292,7 @@ void CCustomMouse::release() _Cursors.clear(); } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::setColorDepth(TColorDepth colorDepth) { if (colorDepth == _ColorDepth) return; @@ -300,14 +300,14 @@ void CCustomMouse::setColorDepth(TColorDepth colorDepth) updateCursor(true); } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::updateCursor(bool forceRebuild) { if (!Driver) return; setCursor(_CurrName, _CurrCol, _CurrRot, _CurrHotSpotX, _CurrHotSpotY, forceRebuild); } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::setCursor(const std::string &name, NLMISC::CRGBA col, uint8 rot, sint hotSpotX, sint hotSpotY, bool forceRebuild) { if (!isAlphaBlendedCursorSupported()) return; @@ -363,7 +363,7 @@ void CCustomMouse::setCursor(const std::string &name, NLMISC::CRGBA col, uint8 r } -//************************************************************************************* +// ************************************************************************************* HICON CCustomMouse::buildCursor(const CBitmap &src, NLMISC::CRGBA col, uint8 rot, sint hotSpotX, sint hotSpotY) { nlassert(isAlphaBlendedCursorSupported()); @@ -440,7 +440,7 @@ HICON CCustomMouse::buildCursor(const CBitmap &src, NLMISC::CRGBA col, uint8 rot } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::setSystemArrow() { extern HINSTANCE HInstance; @@ -460,31 +460,31 @@ void CCustomMouse::setSystemArrow() // not implemented yet for other OS -//************************************************************************************* +// ************************************************************************************* CCustomMouse::CCustomMouse() { // NOT IMPLEMENTED } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::setCursor(const std::string &name, NLMISC::CRGBA col, uint8 rot, sint hotSpotX, sint hotSpotY, bool forceRebuild) { // NOT IMPLEMENTED } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::release() { // NOT IMPLEMENTED } -//************************************************************************************* +// ************************************************************************************* bool CCustomMouse::isAlphaBlendedCursorSupported() { return false; } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::setSystemArrow() { // @@ -495,13 +495,13 @@ void CCustomMouse::addCursor(const std::string &name, const NLMISC::CBitmap &cur // TODO for Linux } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::setColorDepth(TColorDepth colorDepth) { // TODO for Linux } -//************************************************************************************* +// ************************************************************************************* void CCustomMouse::updateCursor(bool forceRebuild) { // TODO for Linux diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp index f0c6d3263..fb8db2b74 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp @@ -29,7 +29,7 @@ using namespace NLMISC; NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupListSheetMission, std::string, "list_sheet_mission"); -//********************************************************************************** +// ********************************************************************************** void CDBGroupListSheetMission::CSheetChildMission::init(CDBGroupListSheetText *pFather, uint index) { // init my parent @@ -46,7 +46,7 @@ void CDBGroupListSheetMission::CSheetChildMission::init(CDBGroupListSheetText *p } -//********************************************************************************** +// ********************************************************************************** CViewText *CDBGroupListSheetMission::CSheetChildMission::createViewText() const { // create a view text id because mission text is send by the server @@ -57,7 +57,7 @@ CViewText *CDBGroupListSheetMission::CSheetChildMission::createViewText() const return vti; } -//********************************************************************************** +// ********************************************************************************** bool CDBGroupListSheetMission::CSheetChildMission::isInvalidated(CDBGroupListSheetText * /* pFather */) { uint8 newPreReqState = (uint8)CurrentPreReqState.getSInt32(); @@ -78,7 +78,7 @@ void CDBGroupListSheetMission::CSheetChildMission::update(CDBGroupListSheetText CSheetChild::update(pFather); } -//********************************************************************************** +// ********************************************************************************** void CDBGroupListSheetMission::CSheetChildMission::updateViewText(CDBGroupListSheetText *pFather) { CSheetChild::updateViewText(pFather); @@ -130,7 +130,7 @@ void CDBGroupListSheetMission::CSheetChildMission::updateViewText(CDBGroupListSh } -//********************************************************************************** +// ********************************************************************************** bool CDBGroupListSheetMission::CSheetChildMission::isSheetValid(CDBGroupListSheetText * /* pFather */) { if (!Ctrl) return false; diff --git a/code/ryzom/client/src/interface_v3/group_compas.cpp b/code/ryzom/client/src/interface_v3/group_compas.cpp index e642fa456..098e33b6a 100644 --- a/code/ryzom/client/src/interface_v3/group_compas.cpp +++ b/code/ryzom/client/src/interface_v3/group_compas.cpp @@ -230,7 +230,7 @@ void CGroupCompas::draw() // const NLMISC::CVectorD &userPosD = UserEntity->pos(); NLMISC::CVector userPos((float) userPosD.x, (float) userPosD.y, (float) userPosD.z); - NLMISC::CVector2f targetPos; + NLMISC::CVector2f targetPos(0.f, 0.f); // if a position tracker is provided, use it CCompassTarget displayedTarget = _Target; @@ -807,7 +807,7 @@ void CGroupCompasMenu::setActive (bool state) uint nbUserLandMarks = std::min( uint(currCont->UserLandMarks.size()), CContinent::getMaxNbUserLandMarks() ); for(k = 0; k < nbUserLandMarks; ++k) { - if (currCont->UserLandMarks[k].Type >= 0 && currCont->UserLandMarks[k].Type < CUserLandMark::UserLandMarkTypeCount) + if (currCont->UserLandMarks[k].Type < CUserLandMark::UserLandMarkTypeCount) { CCompassTarget ct; ct.setType(CCompassTarget::UserLandMark); diff --git a/code/ryzom/client/src/interface_v3/group_header.cpp b/code/ryzom/client/src/interface_v3/group_header.cpp index 52a1dceb6..7526fcd02 100644 --- a/code/ryzom/client/src/interface_v3/group_header.cpp +++ b/code/ryzom/client/src/interface_v3/group_header.cpp @@ -32,12 +32,12 @@ using namespace NLMISC; // CGroupHeader // ////////////////// -//***************************************************************************************************************** +// ***************************************************************************************************************** CGroupHeader::CGroupHeader(const TCtorParam ¶m) : CGroupList(param), _HeaderMaxSize(32767) { } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CGroupHeader::enlargeColumns(sint32 margin) { std::vector entries; @@ -115,7 +115,7 @@ void CGroupHeader::enlargeColumns(sint32 margin) invalidateCoords(); } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CGroupHeader::resizeColumnsAndContainer(sint32 margin) { std::vector entries; @@ -182,7 +182,7 @@ void CGroupHeader::resizeColumnsAndContainer(sint32 margin) invalidateCoords(); } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CGroupHeader::getEntries(std::vector &dest) { dest.clear(); @@ -197,7 +197,7 @@ void CGroupHeader::getEntries(std::vector &dest) } } -//***************************************************************************************************************** +// ***************************************************************************************************************** int CGroupHeader::luaEnlargeColumns(CLuaState &ls) { const char *funcName = "enlargeColumns"; @@ -207,7 +207,7 @@ int CGroupHeader::luaEnlargeColumns(CLuaState &ls) return 0; } -//***************************************************************************************************************** +// ***************************************************************************************************************** int CGroupHeader::luaResizeColumnsAndContainer(CLuaState &ls) { const char *funcName = "resizeColumnsAndContainer"; @@ -217,7 +217,7 @@ int CGroupHeader::luaResizeColumnsAndContainer(CLuaState &ls) return 0; } -//***************************************************************************************************************** +// ***************************************************************************************************************** bool CGroupHeader::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup) { if(!CGroupList::parse(cur, parentGroup)) return false; @@ -373,13 +373,13 @@ private: sint32 _WMin; }; -//***************************************************************************************************************** +// ***************************************************************************************************************** CGroupHeaderEntry::CGroupHeaderEntry(const TCtorParam ¶m) : CInterfaceGroup(param) { _MinSize = 4; } -//***************************************************************************************************************** +// ***************************************************************************************************************** bool CGroupHeaderEntry::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup) { if (!CInterfaceGroup::parse(cur, parentGroup)) return false; @@ -416,14 +416,14 @@ bool CGroupHeaderEntry::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup) return true; } -//***************************************************************************************************************** +// ***************************************************************************************************************** CInterfaceGroup *CGroupHeaderEntry::getTargetColumn() const { CInterfaceManager *im = CInterfaceManager::getInstance(); return dynamic_cast(im->getElementFromId(_TargetColumnId)); } -//***************************************************************************************************************** +// ***************************************************************************************************************** void CGroupHeaderEntry::updateCoords() { CInterfaceGroup::updateCoords(); diff --git a/code/ryzom/client/src/interface_v3/group_header.h b/code/ryzom/client/src/interface_v3/group_header.h index dc3b409e2..248c9585a 100644 --- a/code/ryzom/client/src/interface_v3/group_header.h +++ b/code/ryzom/client/src/interface_v3/group_header.h @@ -23,7 +23,7 @@ class CGroupHeaderEntry; -//***************************************************************************************************************** +// ***************************************************************************************************************** /** Display a header with movable entries. * Usually used with a table to change the size of each column (much like the windows file explorer in 'details' mode) * @@ -54,7 +54,7 @@ private: int luaResizeColumnsAndContainer(CLuaState &ls); }; -//***************************************************************************************************************** +// ***************************************************************************************************************** // an entry in a header, includes a "mover control" to move it inside its parent header // NOTE : when not used inside a CGroupHeader, will work, but there will be no 'max_size' class CGroupHeaderEntry : public CInterfaceGroup diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp index c1f1ccf3f..aa101c449 100644 --- a/code/ryzom/client/src/interface_v3/group_map.cpp +++ b/code/ryzom/client/src/interface_v3/group_map.cpp @@ -634,6 +634,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup) case EGSPD::CPeople::Matis: loadLandmarkInfo(cur, "home_matis", _HomeLMOptions); break; case EGSPD::CPeople::Zorai: loadLandmarkInfo(cur, "home_zorai", _HomeLMOptions); break; case EGSPD::CPeople::Tryker: loadLandmarkInfo(cur, "home_tryker", _HomeLMOptions); break; + default: break; } loadLandmarkInfo(cur, "respawn", _RespawnLMOptions); // animal landmark diff --git a/code/ryzom/client/src/interface_v3/group_wheel.cpp b/code/ryzom/client/src/interface_v3/group_wheel.cpp index f732079d6..51a6390f9 100644 --- a/code/ryzom/client/src/interface_v3/group_wheel.cpp +++ b/code/ryzom/client/src/interface_v3/group_wheel.cpp @@ -26,14 +26,14 @@ NLMISC_REGISTER_OBJECT(CViewBase, CInterfaceGroupWheel, std::string, "group_wheel"); -//***************************************************************************************************************** +// ***************************************************************************************************************** CInterfaceGroupWheel::CInterfaceGroupWheel(const TCtorParam ¶m) : CInterfaceGroup(param) { _AHWheelUp = NULL; _AHWheelDown = NULL; } -//***************************************************************************************************************** +// ***************************************************************************************************************** bool CInterfaceGroupWheel::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup) { if (!CInterfaceGroup::parse(cur, parentGroup)) return false; @@ -42,7 +42,7 @@ bool CInterfaceGroupWheel::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup) return true; } -//***************************************************************************************************************** +// ***************************************************************************************************************** bool CInterfaceGroupWheel::handleEvent(const CEventDescriptor &event) { if (CInterfaceGroup::handleEvent(event)) return true; diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp index aff874857..a8bb9cc2f 100644 --- a/code/ryzom/client/src/interface_v3/guild_manager.cpp +++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp @@ -606,7 +606,7 @@ void CGuildManager::initDBObservers() // CDBGroupListAscensor // *************************************************************************** -//********************************************************************************** +// ********************************************************************************** void CDBGroupListAscensor::CSheetChildAscensor::init(CDBGroupListSheetText *pFather, uint index) { // init my parent @@ -617,7 +617,7 @@ void CDBGroupListAscensor::CSheetChildAscensor::init(CDBGroupListSheetText *pFat SecondSheetIdCache = 0; } -//********************************************************************************** +// ********************************************************************************** bool CDBGroupListAscensor::CSheetChildAscensor::isInvalidated(CDBGroupListSheetText * /* pFather */) { if (Ctrl->getSheetId() != SecondSheetIdCache) @@ -663,7 +663,7 @@ bool CDBGroupListAscensor::CSheetChildAscensor::isInvalidated(CDBGroupListSheetT return false; } -//********************************************************************************** +// ********************************************************************************** bool CDBGroupListAscensor::CSheetChildAscensor::isSheetValid(CDBGroupListSheetText * /* pFather */) { if (!Ctrl) return false; diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp index 3f55b11a6..6fae67260 100644 --- a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp +++ b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp @@ -75,7 +75,7 @@ CInputHandlerManager::~CInputHandlerManager() { } -//******************************************************************************************** +// ******************************************************************************************** void CInputHandlerManager::releaseInstance() { if( _Instance ) diff --git a/code/ryzom/client/src/interface_v3/interface_expr_node.cpp b/code/ryzom/client/src/interface_v3/interface_expr_node.cpp index bb38767ef..319c3fc9f 100644 --- a/code/ryzom/client/src/interface_v3/interface_expr_node.cpp +++ b/code/ryzom/client/src/interface_v3/interface_expr_node.cpp @@ -21,7 +21,7 @@ #include "../cdb_leaf.h" #include "../cdb_branch.h" -//******************************************************************************************************* +// ******************************************************************************************************* void CInterfaceExprNodeValue::eval(CInterfaceExprValue &result) { result = Value; @@ -37,7 +37,7 @@ void CInterfaceExprNodeValue::getDepends(std::vector &/* nodes */) } -//******************************************************************************************************* +// ******************************************************************************************************* void CInterfaceExprNodeValueFnCall::eval(CInterfaceExprValue &result) { nlassert(Func); @@ -80,7 +80,7 @@ CInterfaceExprNodeValueFnCall::~CInterfaceExprNodeValueFnCall() } } -//******************************************************************************************************* +// ******************************************************************************************************* void CInterfaceExprNodeDBLeaf::eval(CInterfaceExprValue &result) { nlassert(Leaf); @@ -107,7 +107,7 @@ void CInterfaceExprNodeDBLeaf::getDepends(std::vector &nodes) } -//******************************************************************************************************* +// ******************************************************************************************************* void CInterfaceExprNodeDBBranch::eval(CInterfaceExprValue &result) { nlassert(Branch); @@ -134,7 +134,7 @@ void CInterfaceExprNodeDBBranch::getDepends(std::vector &nodes) } -//******************************************************************************************************* +// ******************************************************************************************************* void CInterfaceExprNodeDependantDBRead::eval(CInterfaceExprValue &result) { // no gain there, but barely used diff --git a/code/ryzom/client/src/interface_v3/interface_expr_node.h b/code/ryzom/client/src/interface_v3/interface_expr_node.h index 7b33e87f4..7327c4ada 100644 --- a/code/ryzom/client/src/interface_v3/interface_expr_node.h +++ b/code/ryzom/client/src/interface_v3/interface_expr_node.h @@ -39,7 +39,7 @@ public: }; -//******************************************************************************************************* +// ******************************************************************************************************* /** A constant value already parsed by interface (in a interface expr parse tree) */ class CInterfaceExprNodeValue : public CInterfaceExprNode @@ -52,7 +52,7 @@ public: virtual void getDepends(std::vector &nodes); }; -//******************************************************************************************************* +// ******************************************************************************************************* /** A fct call (in a interface expr parse tree) */ class CInterfaceExprNodeValueFnCall : public CInterfaceExprNode @@ -68,7 +68,7 @@ public: virtual ~CInterfaceExprNodeValueFnCall(); }; -//******************************************************************************************************* +// ******************************************************************************************************* /** A db leaf read (in a interface expr parse tree) */ class CInterfaceExprNodeDBLeaf : public CInterfaceExprNode @@ -81,7 +81,7 @@ public: virtual void getDepends(std::vector &nodes); }; -//******************************************************************************************************* +// ******************************************************************************************************* /** A db branch read (in a interface expr parse tree) */ class CInterfaceExprNodeDBBranch : public CInterfaceExprNode @@ -94,7 +94,7 @@ public: virtual void getDepends(std::vector &nodes); }; -//******************************************************************************************************* +// ******************************************************************************************************* /** A dependant db read (in a interface expr parse tree) * This is rarely used so no real optim there.. */ diff --git a/code/ryzom/client/src/interface_v3/lua_helper.h b/code/ryzom/client/src/interface_v3/lua_helper.h index bab37496b..c8192dcff 100644 --- a/code/ryzom/client/src/interface_v3/lua_helper.h +++ b/code/ryzom/client/src/interface_v3/lua_helper.h @@ -54,7 +54,7 @@ private: }; -//************************************************************************** +// ************************************************************************** /** Helper class to restore the lua stack to the desired size when this object goes out of scope */ class CLuaStackRestorer @@ -354,7 +354,7 @@ private: private: // this object isn't intended to be copied - CLuaState(const CLuaState &/* other */) { nlassert(0); } + CLuaState(const CLuaState &/* other */):NLMISC::CRefCount() { nlassert(0); } CLuaState &operator=(const CLuaState &/* other */) { nlassert(0); return *this; } void executeScriptInternal(const std::string &code, const std::string &dbgSrc, int numRet = 0); diff --git a/code/ryzom/client/src/interface_v3/macrocmd_key.cpp b/code/ryzom/client/src/interface_v3/macrocmd_key.cpp index 4d16c523a..a6e4f15ba 100644 --- a/code/ryzom/client/src/interface_v3/macrocmd_key.cpp +++ b/code/ryzom/client/src/interface_v3/macrocmd_key.cpp @@ -611,16 +611,19 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std // Get ith param (params are nameOfParam=argumentOfAction strings separated by |) // except for the last real param (which can then contains | chars) if it is the last param - if ((curStr.find('|') == string::npos) || - ((noParam == nbRealParam-1) && (rP.Type != CBaseAction::CParameter::Hidden)) && (i == (pBA->Parameters.size()-1))) + string::size_type pos = curStr.find('|'); + + if ((pos == string::npos) || + (((noParam == nbRealParam-1) && (rP.Type != CBaseAction::CParameter::Hidden)) && (i == (pBA->Parameters.size()-1)))) { sTmp = curStr; curStr = ""; } else { - sTmp = curStr.substr(0,curStr.find('|')); - curStr = curStr.substr(curStr.find('|')+1,curStr.size()); + + sTmp = curStr.substr(0, pos); + curStr = curStr.substr(pos+1, curStr.size()); } // Remove 'name=' diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.cpp b/code/ryzom/client/src/interface_v3/obs_huge_list.cpp index bb9f35193..ae68aeb36 100644 --- a/code/ryzom/client/src/interface_v3/obs_huge_list.cpp +++ b/code/ryzom/client/src/interface_v3/obs_huge_list.cpp @@ -125,7 +125,7 @@ void CHugeListObs::setListType(ListType listType) } -//**************************************************************************** +// **************************************************************************** bool CHugeListObs::init() { nlassert((uint) _Category < ListTypeCount); // must call setListType @@ -233,7 +233,7 @@ bool CHugeListObs::init() return true; } -//**************************************************************************** +// **************************************************************************** void CHugeListObs::start() { nlassert((uint) _Category < ListTypeCount); // must call setListType @@ -301,7 +301,7 @@ void CHugeListObs::start() _PhraseClientFill= false; } -//**************************************************************************** +// **************************************************************************** void CHugeListObs::update(ICDBNode * /* node */) { nlassert((uint) _Category < ListTypeCount); // must call setListType @@ -493,7 +493,7 @@ void CHugeListObs::update(ICDBNode * /* node */) } -//**************************************************************************** +// **************************************************************************** void CHugeListObs::updateUIItemPage(uint index) { nlassert((uint) _Category < ListTypeCount); // must call setListType diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.h b/code/ryzom/client/src/interface_v3/obs_huge_list.h index d23ebc2a6..fe2fba4f2 100644 --- a/code/ryzom/client/src/interface_v3/obs_huge_list.h +++ b/code/ryzom/client/src/interface_v3/obs_huge_list.h @@ -35,7 +35,7 @@ #define DB_LOCAL_BRANCH_FOR_MISSIONS "LOCAL:CHOOSE_MISSIONS" -//**************************************************************************** +// **************************************************************************** /** Database observer to update incrementaly a list of items * Class synchronizing huge list of leaves from server to local * This is done through a small window in the server database of 8 (for the moment) elements diff --git a/code/ryzom/client/src/interface_v3/people_interraction.cpp b/code/ryzom/client/src/interface_v3/people_interraction.cpp index 246df5d5f..17c6eadce 100644 --- a/code/ryzom/client/src/interface_v3/people_interraction.cpp +++ b/code/ryzom/client/src/interface_v3/people_interraction.cpp @@ -289,13 +289,17 @@ void CChatStdInput::registerListeningWindow(CChatWindow *cw) Universe.addListeningWindow(cw); } + //=========================================================================================================== -CPeopleInterraction::CPeopleInterraction() : SystemInfo(NULL), +CPeopleInterraction::CPeopleInterraction() : Region(NULL), + Universe(NULL), + TeamChat(NULL), GuildChat(NULL), - CurrPartyChatID(0), + SystemInfo(NULL), TellWindow(NULL), DebugInfo(NULL), - YuboChat(NULL) + YuboChat(NULL), + CurrPartyChatID(0) { for(uint i=0;i &vertices) { if (vertices.size() == _Poly.Vertices.size() && @@ -71,7 +71,7 @@ static inline bool totallyOutside(const CVector &minCorner, const CVector &maxCo (sint32) maxCorner.y < cy; } -//********************************************************************************* +// ********************************************************************************* void CViewPolygon::draw() { if (_Tris.empty()) return; @@ -178,14 +178,14 @@ void CViewPolygon::draw() vr.drawUnclippedTriangles(_RenderLayer, _RealTris, col); } -//********************************************************************************* +// ********************************************************************************* void CViewPolygon::updateCoords() { // assume that clipping will have to be done again, real update of triangle will be done at render time _Touched = true; } -//********************************************************************************* +// ********************************************************************************* void CViewPolygon::setAlpha(sint32 a) { _Color.A = (uint8) a; diff --git a/code/ryzom/client/src/interface_v3/view_quad.cpp b/code/ryzom/client/src/interface_v3/view_quad.cpp index 9abdbd316..a788fc226 100644 --- a/code/ryzom/client/src/interface_v3/view_quad.cpp +++ b/code/ryzom/client/src/interface_v3/view_quad.cpp @@ -21,7 +21,7 @@ using namespace NLMISC; -//********************************************************************************* +// ********************************************************************************* CViewQuad::CViewQuad() : CViewBase(TCtorParam()), _Color(CRGBA::White), _Additif(false), _UMin(0.f), @@ -36,14 +36,14 @@ CViewQuad::CViewQuad() : CViewBase(TCtorParam()), _Color(CRGBA::White), _RealQuad.Uv3.set(0.f, 1.f); } -//********************************************************************************* +// ********************************************************************************* bool CViewQuad::parse(xmlNodePtr /* cur */, CInterfaceGroup * /* parentGroup */) { nlassert(0); // NOT IMPLEMENTED (only created dynamically at this time) return false; } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::updateCoords() { CViewBase::updateCoords(); @@ -53,7 +53,7 @@ void CViewQuad::updateCoords() _RealQuad.set(_Quad.V0 + delta, _Quad.V1 + delta, _Quad.V2 + delta, _Quad.V3 + delta); } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::draw() { nlassert(_Parent); @@ -270,13 +270,13 @@ void CViewQuad::draw() } } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setAlpha(sint32 a) { _Color.A = (uint8) a; } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setTexture(const std::string &texName) { // CInterfaceManager *pIM = CInterfaceManager::getInstance(); @@ -284,7 +284,7 @@ void CViewQuad::setTexture(const std::string &texName) _TextureId.setTexture(texName.c_str()); } -//********************************************************************************* +// ********************************************************************************* std::string CViewQuad::getTexture() const { CInterfaceManager *pIM = CInterfaceManager::getInstance(); @@ -292,7 +292,7 @@ std::string CViewQuad::getTexture() const return rVR.getTextureNameFromId (_TextureId); } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setQuad(const CQuad &quad) { float qXMin = minof(quad.V0.x, quad.V1.x, quad.V2.x, quad.V3.x); @@ -307,7 +307,7 @@ void CViewQuad::setQuad(const CQuad &quad) _Quad = quad; } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setQuad(const NLMISC::CVector &start, const NLMISC::CVector &end, float thickness) { CVector right = end - start; @@ -316,7 +316,7 @@ void CViewQuad::setQuad(const NLMISC::CVector &start, const NLMISC::CVector &end setQuad(CQuad(start + up, end + up, end - up, start - up)); } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setQuad(const NLMISC::CVector &pos, float radius, float angle /*=0.f*/) { if (angle == 0.f) @@ -330,7 +330,7 @@ void CViewQuad::setQuad(const NLMISC::CVector &pos, float radius, float angle /* } } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setQuad(const std::string &texName, const NLMISC::CVector &srcPos, float angle /*= 0.f*/, float offCenter /* = 0.f*/) { NLMISC::CVector pos = srcPos; @@ -355,13 +355,13 @@ void CViewQuad::setQuad(const std::string &texName, const NLMISC::CVector &srcPo } } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setAdditif(bool additif) { _Additif = additif; } -//********************************************************************************* +// ********************************************************************************* void CViewQuad::setPattern(float umin, float umax, TWrapMode wrapMode) { nlassert((uint) wrapMode < WrapModeCount); diff --git a/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp b/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp index f04a32e25..29d360a4e 100644 --- a/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp +++ b/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp @@ -32,7 +32,7 @@ using namespace STRING_MANAGER; NLMISC_REGISTER_OBJECT(CViewBase, CViewTextIDFormated, std::string, "text_id_formated"); -//********************************************************************************* +// ********************************************************************************* bool CViewTextIDFormated::parse(xmlNodePtr cur,CInterfaceGroup * parentGroup) { if (!CViewTextID::parse(cur, parentGroup)) return false; @@ -44,7 +44,7 @@ bool CViewTextIDFormated::parse(xmlNodePtr cur,CInterfaceGroup * parentGroup) return true; } -//********************************************************************************* +// ********************************************************************************* void CViewTextIDFormated::checkCoords() { if (_IsDBLink) diff --git a/code/ryzom/client/src/login_progress_post_thread.cpp b/code/ryzom/client/src/login_progress_post_thread.cpp index 5525836ff..9b6e351da 100644 --- a/code/ryzom/client/src/login_progress_post_thread.cpp +++ b/code/ryzom/client/src/login_progress_post_thread.cpp @@ -192,7 +192,7 @@ public: } if (newStep) { - if (loginStep.Step == LoginStep_Stop) + if (loginStep.Step == (uint)LoginStep_Stop) { break; } diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp index 7c9084b95..cacf9c396 100644 --- a/code/ryzom/client/src/main_loop.cpp +++ b/code/ryzom/client/src/main_loop.cpp @@ -990,7 +990,7 @@ void endRenderSkyPart(TSkyMode skyMode) } -//*************************************************************************************************************************** +// *************************************************************************************************************************** // Render a part of the canopy static void renderCanopyPart(UScene::TRenderPart renderPart) { @@ -1012,7 +1012,7 @@ static void renderCanopyPart(UScene::TRenderPart renderPart) SceneRoot->renderPart(renderPart); } -//*************************************************************************************************************************** +// *************************************************************************************************************************** // Render a part of the main scene static void renderMainScenePart(UScene::TRenderPart renderPart) { @@ -1030,7 +1030,7 @@ static void renderMainScenePart(UScene::TRenderPart renderPart) } -//*************************************************************************************************************************** +// *************************************************************************************************************************** // Render a part of the sky static void renderSkyPart(UScene::TRenderPart renderPart, TSkyMode skyMode) { @@ -1057,7 +1057,7 @@ static void renderSkyPart(UScene::TRenderPart renderPart, TSkyMode skyMode) } -//*************************************************************************************************************************** +// *************************************************************************************************************************** // Render all scenes void renderAll(bool forceFullDetail) { diff --git a/code/ryzom/client/src/micro_life_manager.cpp b/code/ryzom/client/src/micro_life_manager.cpp index a980379aa..042b8dc1a 100644 --- a/code/ryzom/client/src/micro_life_manager.cpp +++ b/code/ryzom/client/src/micro_life_manager.cpp @@ -65,7 +65,7 @@ extern NL3D::UMaterial GenericMat; H_AUTO_DECL(RZ_MicroLifeManager) -//******************************************************************************************** +// ******************************************************************************************** CMicroLifeManager::CMicroLifeManager() { FPU_CHECKER @@ -77,7 +77,7 @@ CMicroLifeManager::CMicroLifeManager() _Noise.Rand = 1.f; } -//******************************************************************************************** +// ******************************************************************************************** CMicroLifeManager &CMicroLifeManager::getInstance() { FPU_CHECKER @@ -86,7 +86,7 @@ CMicroLifeManager &CMicroLifeManager::getInstance() return instance; } -//******************************************************************************************** +// ******************************************************************************************** void CMicroLifeManager::init(const NLMISC::CVector2f &minCorner, const NLMISC::CVector2f &maxCorner, float cellSize /* = 30.f*/) { FPU_CHECKER @@ -132,7 +132,7 @@ void CMicroLifeManager::init(const NLMISC::CVector2f &minCorner, const NLMISC::C // - we search for redundant lists and store the result as index in the final grid. This is done in packBuildGrid -//********************************************************************************************************************************* +// ********************************************************************************************************************************* bool CMicroLifeManager::CGridOverlapPolyInfo::operator < (const CMicroLifeManager::CGridOverlapPolyInfo &other) const { FPU_CHECKER @@ -144,7 +144,7 @@ bool CMicroLifeManager::CGridOverlapPolyInfo::operator < (const CMicroLifeManage return Poly < other.Poly; } -//********************************************************************************************************************************* +// ********************************************************************************************************************************* bool CMicroLifeManager::CGridOverlapPolyInfo::operator == (const CMicroLifeManager::CGridOverlapPolyInfo &other) const { FPU_CHECKER @@ -156,7 +156,7 @@ bool CMicroLifeManager::CGridOverlapPolyInfo::operator == (const CMicroLifeManag Poly == other.Poly; } -//********************************************************************************************************************************* +// ********************************************************************************************************************************* bool CMicroLifeManager::CGridOverlapPolyInfoVector::operator < (const CMicroLifeManager::CGridOverlapPolyInfoVector &other) const { FPU_CHECKER @@ -169,7 +169,7 @@ bool CMicroLifeManager::CGridOverlapPolyInfoVector::operator < (const CMicroLife return false; } -//********************************************************************************************************************************* +// ********************************************************************************************************************************* bool CMicroLifeManager::CGridOverlapPolyInfoVector::operator == (const CMicroLifeManager::CGridOverlapPolyInfoVector &other) const { FPU_CHECKER @@ -179,7 +179,7 @@ bool CMicroLifeManager::CGridOverlapPolyInfoVector::operator == (const CMicroLif } -//*************************************************************************************************************************** +// *************************************************************************************************************************** void CMicroLifeManager::drawPolyInBuildGrid(const std::vector &primPoly, uint primitiveIndex, CMicroLifeManager::TBuildGrid &buildGrid, @@ -261,7 +261,7 @@ public: }; -//*************************************************************************************************************************** +// *************************************************************************************************************************** // pack the build grid so that each cell only contains index into a small set of poly list, instead of a full poly list // (a lot of cells share the same poly list) void CMicroLifeManager::packBuildGrid(TBuildGrid &buildGrid, @@ -313,7 +313,7 @@ void CMicroLifeManager::packBuildGrid(TBuildGrid &buildGrid, finalPossibleLists.swap(flatSet); } -//*************************************************************************************************************************** +// *************************************************************************************************************************** // read a .primitive file and add its content to a build grid void CMicroLifeManager::addPrimitiveToBuildGrid(const std::string &fileName, uint &primitiveIndex, CMicroLifeManager::TBuildGrid &buildGrid) { @@ -420,7 +420,7 @@ void CMicroLifeManager::addPrimitiveToBuildGrid(const std::string &fileName, uin } } -//******************************************************************************************** +// ******************************************************************************************** void CMicroLifeManager::build(const std::vector &fileNames) { FPU_CHECKER @@ -437,7 +437,7 @@ void CMicroLifeManager::build(const std::vector &fileNames) } -//******************************************************************************************** +// ******************************************************************************************** void CMicroLifeManager::release() { FPU_CHECKER @@ -463,7 +463,7 @@ void CMicroLifeManager::release() #endif } -//******************************************************************************************** +// ******************************************************************************************** void CMicroLifeManager::tileAdded(const NL3D::CTileAddedInfo &infos) { FPU_CHECKER @@ -694,7 +694,7 @@ void CMicroLifeManager::tileAdded(const NL3D::CTileAddedInfo &infos) } } -//******************************************************************************************** +// ******************************************************************************************** void CMicroLifeManager::tileRemoved(uint64 id) { FPU_CHECKER @@ -730,7 +730,7 @@ static const NLMISC::CRGBA DebugCols[] = }; static const uint NumDebugCols = sizeof(DebugCols) / sizeof(DebugCols[0]); -//******************************************************************************************** +// ******************************************************************************************** void CMicroLifeManager::dumpMLGrid(const std::string &filename) { FPU_CHECKER @@ -767,7 +767,7 @@ void CMicroLifeManager::dumpMLGrid(const std::string &filename) f.close(); } -//******************************************************************************************** +// ******************************************************************************************** void CMicroLifeManager::renderMLZones(const NLMISC::CVector2f &camPos, float maxDist /*=1000.f*/) { FPU_CHECKER @@ -839,7 +839,7 @@ void CMicroLifeManager::renderMLZones(const NLMISC::CVector2f &camPos, float max } #ifdef NL_DEBUG - //******************************************************************************************** + // ******************************************************************************************** void CMicroLifeManager::renderActiveTiles() { FPU_CHECKER @@ -894,7 +894,7 @@ void CMicroLifeManager::renderMLZones(const NLMISC::CVector2f &camPos, float max #if !FINAL_VERSION #include "continent_manager.h" - //****************************************************************************************************************** + // ****************************************************************************************************************** // display micro-life zone on screen NLMISC_COMMAND(showMLZones,"display micro-life zones", "<0 = off, 1 = on>") { @@ -904,7 +904,7 @@ void CMicroLifeManager::renderMLZones(const NLMISC::CVector2f &camPos, float max } - //****************************************************************************************************************** + // ****************************************************************************************************************** // dump micro-life zone in a tga file NLMISC_COMMAND(dumpMLZones,"display micro-life zones", "") { @@ -914,7 +914,7 @@ void CMicroLifeManager::renderMLZones(const NLMISC::CVector2f &camPos, float max } - //****************************************************************************************************************** + // ****************************************************************************************************************** // reload micro-life zones NLMISC_COMMAND(reloadMLZones, "reload micro-life zones", "") { diff --git a/code/ryzom/client/src/misc.cpp b/code/ryzom/client/src/misc.cpp index 34a1e1205..976786a97 100644 --- a/code/ryzom/client/src/misc.cpp +++ b/code/ryzom/client/src/misc.cpp @@ -56,10 +56,6 @@ #include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_loader.h" -#ifndef NL_OS_WINDOWS - #include -#endif - /////////// // USING // /////////// diff --git a/code/ryzom/client/src/permanent_ban.cpp b/code/ryzom/client/src/permanent_ban.cpp index fe380e307..8cb4d0fac 100644 --- a/code/ryzom/client/src/permanent_ban.cpp +++ b/code/ryzom/client/src/permanent_ban.cpp @@ -29,7 +29,7 @@ using namespace NLMISC; #define REGKEY_PERMANENT_BAN "PB" -//************************************************************ +// ************************************************************ static void setPermanentBanRegistryKey(bool on) { #ifndef NL_OS_WINDOWS @@ -52,7 +52,7 @@ static void setPermanentBanRegistryKey(bool on) #endif } -//************************************************************ +// ************************************************************ static bool getPermanentBanRegistryKey() { #ifndef NL_OS_WINDOWS @@ -74,7 +74,7 @@ static bool getPermanentBanRegistryKey() #endif } -//*********************************************************** +// *********************************************************** static void setPermanentBanFileMarker(const std::string &path, bool on) { if (on) @@ -98,7 +98,7 @@ static void setPermanentBanFileMarker(const std::string &path, bool on) } } -//*********************************************************** +// *********************************************************** static bool getPermanentBanFileMarker(const std::string &path) { return CFile::isExists(path); @@ -107,7 +107,7 @@ static bool getPermanentBanFileMarker(const std::string &path) #define PERMANENT_BAN_FILE0 "c:\\3289763c1ecd044e" #define PERMANENT_BAN_FILE1 "78d0732e50bf2bbd" -//************************************************************ +// ************************************************************ void setPermanentBanMarkers(bool on) { setPermanentBanRegistryKey(on); @@ -116,7 +116,7 @@ void setPermanentBanMarkers(bool on) } -//************************************************************ +// ************************************************************ bool testPermanentBanMarkers() { /*#ifndef NL_OS_WINDOWS @@ -234,7 +234,7 @@ static void markBNPFile(std::string &path) fclose (f); } -//************************************************************ +// ************************************************************ void applyPermanentBanPunishment() { // go in the data directory & touch all bnp files so that the client should repatch all its datas diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp index 6872665de..90232d90d 100644 --- a/code/ryzom/client/src/player_cl.cpp +++ b/code/ryzom/client/src/player_cl.cpp @@ -1292,33 +1292,33 @@ void CPlayerCL::load() // virtual } }// load // -//********************************************************************************************* +// ********************************************************************************************* const char *CPlayerCL::getBoneNameFromBodyPart(BODY::TBodyPart part, BODY::TSide side) const { if (!_PlayerSheet) return CCharacterCL::getBoneNameFromBodyPart(part, side); return _PlayerSheet->BodyToBone.getBoneName(part, side); } -//********************************************************************************************* +// ********************************************************************************************* const CItemSheet *CPlayerCL::getRightHandItemSheet() const { return _Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet; } -//********************************************************************************************* +// ********************************************************************************************* const CItemSheet *CPlayerCL::getLeftHandItemSheet() const { return _Items[SLOTTYPE::LEFT_HAND_SLOT].Sheet; } -//********************************************************************************************* +// ********************************************************************************************* const CAttack *CPlayerCL::getAttack(const CAttackIDSheet &id) const { if (!_PlayerSheet) return NULL; return CCharacterCL::getAttack(id, _PlayerSheet->AttackLists); } -//********************************************************************************************* +// ********************************************************************************************* float CPlayerCL::getScaleRef() const { float fyrosRefScale = GabaritSet.getRefHeightScale(0, EGSPD::CPeople::Fyros); @@ -1327,7 +1327,7 @@ float CPlayerCL::getScaleRef() const } -//********************************************************************************************* +// ********************************************************************************************* float CPlayerCL::getNamePosZ() const { if (!_PlayerSheet) diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/code/ryzom/client/src/player_r2_cl.cpp index 2cbfb6869..b858f8f94 100644 --- a/code/ryzom/client/src/player_r2_cl.cpp +++ b/code/ryzom/client/src/player_r2_cl.cpp @@ -1038,7 +1038,7 @@ void CPlayerR2CL::load() // virtual } }// load // -//********************************************************************************************* +// ********************************************************************************************* /* const char *CPlayerR2CL::getBoneNameFromBodyPart(BODY::TBodyPart part, BODY::TSide side) const { @@ -1046,26 +1046,26 @@ const char *CPlayerR2CL::getBoneNameFromBodyPart(BODY::TBodyPart part, BODY::TSi return _PlayerSheet->BodyToBone.getBoneName(part, side); }*/ -//********************************************************************************************* +// ********************************************************************************************* const CItemSheet *CPlayerR2CL::getRightHandItemSheet() const { return _Items[SLOTTYPE::RIGHT_HAND_SLOT].Sheet; } -//********************************************************************************************* +// ********************************************************************************************* const CItemSheet *CPlayerR2CL::getLeftHandItemSheet() const { return _Items[SLOTTYPE::LEFT_HAND_SLOT].Sheet; } -//********************************************************************************************* +// ********************************************************************************************* /*const CAttack *CPlayerR2CL::getAttack(const CAttackIDSheet &id) const { if (!_PlayerSheet) return NULL; return CCharacterCL::getAttack(id, _PlayerSheet->AttackLists); }*/ -//********************************************************************************************* +// ********************************************************************************************* float CPlayerR2CL::getScaleRef() const { float fyrosRefScale = GabaritSet.getRefHeightScale(0, EGSPD::CPeople::Fyros); @@ -1074,7 +1074,7 @@ float CPlayerR2CL::getScaleRef() const } -//********************************************************************************************* +// ********************************************************************************************* /* float CPlayerR2CL::getNamePosZ() const { diff --git a/code/ryzom/client/src/precipitation_clip_grid.cpp b/code/ryzom/client/src/precipitation_clip_grid.cpp index e441d3424..03cba6ec5 100644 --- a/code/ryzom/client/src/precipitation_clip_grid.cpp +++ b/code/ryzom/client/src/precipitation_clip_grid.cpp @@ -46,7 +46,7 @@ extern UVisualCollisionManager *CollisionManager; /* -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::tileAdded(const CTileAddedInfo &infos) { // insert in point grid @@ -62,7 +62,7 @@ void CHeightGrid::tileAdded(const CTileAddedInfo &infos) addTri(corners, infos.Center.z); } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::tileRemoved(uint64 id) { CHashMap::iterator it = _TileInfos.find(id); @@ -79,7 +79,7 @@ void CHeightGrid::tileRemoved(uint64 id) removeTri(corners, infos.Center.z); } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::addTri(const CVector2f corners[3], float z) { _Tri.Vertices.resize(3); @@ -109,7 +109,7 @@ void CHeightGrid::addTri(const CVector2f corners[3], float z) } } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::removeTri(const CVector2f corners[3], float z) { _Tri.Vertices.resize(3); @@ -133,7 +133,7 @@ void CHeightGrid::removeTri(const CVector2f corners[3], float z) } } -//*********************************************************************************** +// *********************************************************************************** CHeightGrid::CHeightGrid() { _CellSize = 0.f; @@ -148,7 +148,7 @@ CHeightGrid::CHeightGrid() -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::init(float cellSize, uint heightGridSize, uint wrappedHeightGridSize, float minZ) { nlassert(cellSize > 0.f); @@ -164,14 +164,14 @@ void CHeightGrid::init(float cellSize, uint heightGridSize, uint wrappedHeightGr updateBBox(); } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::updateBBox() { _BBox.setMinMax(CVector(_PosX * _CellSize, _PosY * _CellSize, _MinZ), CVector((_PosX + _GridSize) * _CellSize, (_PosY + _GridSize) * _CellSize, -_MinZ)); } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::update(const CVector &newPos) { if (_CellSize == 0.f) return; @@ -200,7 +200,7 @@ void CHeightGrid::update(const CVector &newPos) } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::addCollisionMesh(const UVisualCollisionManager::CMeshInstanceColInfo &colMesh) { const std::vector &vertices = colMesh.Mesh.getVertices(); @@ -236,7 +236,7 @@ void CHeightGrid::addCollisionMesh(const UVisualCollisionManager::CMeshInstanceC _Meshs[colMesh.ID] = colMesh; } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::removeCollisionMesh(uint id) { TColMeshMap::iterator it = _Meshs.find(id); @@ -274,7 +274,7 @@ void CHeightGrid::removeCollisionMesh(uint id) } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::updateRect(const NLMISC::CRect &rect) { // add incoming meshs into the quad grid @@ -299,7 +299,7 @@ void CHeightGrid::updateRect(const NLMISC::CRect &rect) } } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::discardRect(const CRect &rect) { // remove meshs that are totally out of the grid @@ -315,7 +315,7 @@ void CHeightGrid::discardRect(const CRect &rect) } } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::updateCell(sint px, sint py) { sint worldX = px + _PosX; @@ -334,7 +334,7 @@ void CHeightGrid::updateCell(sint px, sint py) } -//*********************************************************************************** +// *********************************************************************************** void CHeightGrid::display(NL3D::UDriver &drv) const { extern UCamera MainCam; @@ -387,7 +387,7 @@ void CHeightGrid::display(NL3D::UDriver &drv) const // CPointGrid // //////////////// -//********************************************************************************* +// ********************************************************************************* CHeightGridWrapped::CHeightGridWrapped() { _CellSize = 0.f; @@ -395,7 +395,7 @@ CHeightGridWrapped::CHeightGridWrapped() _InvCellSize = 1.f; } -//********************************************************************************* +// ********************************************************************************* uint CHeightGridWrapped::getListMaxLength() const { uint sizeMax = 0; @@ -406,7 +406,7 @@ uint CHeightGridWrapped::getListMaxLength() const return sizeMax; } -//********************************************************************************* +// ********************************************************************************* void CHeightGridWrapped::init(uint size, float cellSize) { nlassert(cellSize > 0.f) diff --git a/code/ryzom/client/src/precipitation_clip_grid.h b/code/ryzom/client/src/precipitation_clip_grid.h index 30df2a311..7292f3ece 100644 --- a/code/ryzom/client/src/precipitation_clip_grid.h +++ b/code/ryzom/client/src/precipitation_clip_grid.h @@ -26,7 +26,7 @@ /* -//********************************************************************************* +// ********************************************************************************* template class CArray2D { public: @@ -130,7 +130,7 @@ private: }; -//********************************************************************************* +// ********************************************************************************* template void CArray2D::getUpdateRects(sint moveOffsetX, sint moveOffsetY, std::vector &rectsToUpdate) { @@ -189,14 +189,14 @@ void CArray2D::getUpdateRects(sint moveOffsetX, sint moveOffsetY, std::vector } } -//********************************************************************************* +// ********************************************************************************* template void CArray2D::getDiscardRects(sint moveOffsetX, sint moveOffsetY,std::vector &discardedRects) { getUpdateRects(- moveOffsetX, - moveOffsetY, discardedRects); } -//********************************************************************************* +// ********************************************************************************* template void CArray2D::moveSubArray(sint dstX, sint dstY, sint srcX, sint srcY, sint width, sint height) { @@ -337,14 +337,14 @@ void CArray2D::moveSubArray(sint dstX, sint dstY, sint srcX, sint srcY, sint } -//********************************************************************************* +// ********************************************************************************* template void CArray2D::move(sint offsetX, sint offsetY) { moveSubArray(offsetX, offsetY, 0, 0, _Width, _Height); } -//********************************************************************************* +// ********************************************************************************* template void CArray2D::init(uint width, uint height) { @@ -353,7 +353,7 @@ void CArray2D::init(uint width, uint height) _Height = height; } -//********************************************************************************* +// ********************************************************************************* template void CArray2D::init(uint width,uint height, const T &defaultValue) { @@ -363,7 +363,7 @@ void CArray2D::init(uint width,uint height, const T &defaultValue) } -//********************************************************************************* +// ********************************************************************************* // A height grid with wrapping class CHeightGridWrapped @@ -404,13 +404,13 @@ private: -//********************************************************************************* +// ********************************************************************************* inline void CHeightGridWrapped::insert(const CGridElem &ge) { _Grid(ge.X & _SizeMask, ge.Y & _SizeMask).push_back(ge); } -//********************************************************************************* +// ********************************************************************************* inline void CHeightGridWrapped::remove(const CGridElem &ge) { TGridElemList &gel = _Grid(ge.X & _SizeMask, ge.Y & _SizeMask); @@ -486,13 +486,13 @@ private: void addCollisionMesh(const UVisualCollisionManager::CMeshInstanceColInfo &colMesh); }; -//*********************************************************************************** +// *********************************************************************************** inline void CHeightGrid::gridCoordToWorld(sint x, sint y, CVector &dest) const { dest.set(x * _CellSize, y * _CellSize, 0.f); } -//*********************************************************************************** +// *********************************************************************************** inline CVector CHeightGrid::gridCoordToWorld(sint x, sint y) const { CVector dest; diff --git a/code/ryzom/client/src/projectile_manager.cpp b/code/ryzom/client/src/projectile_manager.cpp index 1964fb943..1bc44c3f5 100644 --- a/code/ryzom/client/src/projectile_manager.cpp +++ b/code/ryzom/client/src/projectile_manager.cpp @@ -57,7 +57,7 @@ static const float ImpactUserParams[MAGICFX::NUM_SPELL_POWER][4] = -//***************************************************************************************** +// ***************************************************************************************** CProjectileManager &CProjectileManager::getInstance() { H_AUTO_USE(RZ_ProjectileManager) @@ -65,7 +65,7 @@ CProjectileManager &CProjectileManager::getInstance() return manager; } -//***************************************************************************************** +// ***************************************************************************************** const float *CProjectileManager::getProjectileFXUserParams(uint power) { if (power < 1 || power > MAGICFX::NUM_SPELL_POWER) return NULL; @@ -73,14 +73,14 @@ const float *CProjectileManager::getProjectileFXUserParams(uint power) } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::addProjectileToQueue(const CProjectileBuild &pb) { H_AUTO_USE(RZ_ProjectileManager) _ProjectileQueue.insert(pb); } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::addProjectile(const CProjectileBuild &pb) { H_AUTO_USE(RZ_ProjectileManager) @@ -156,7 +156,7 @@ void CProjectileManager::addProjectile(const CProjectileBuild &pb) proj.ParabolaHeight = dist * 0.01f * BOMB_MISSILE_PARABOLA_HEIGHT_FOR_100_METERS; } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::updateProjectileQueue() { H_AUTO_USE(RZ_ProjectileManager) @@ -170,7 +170,7 @@ void CProjectileManager::updateProjectileQueue() } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::update() { H_AUTO_USE(RZ_ProjectileManager) @@ -411,7 +411,7 @@ void CProjectileManager::update() } } -//***************************************************************************************** +// ***************************************************************************************** CProjectileManager::CProjectile::CProjectile() { H_AUTO_USE(RZ_ProjectileManager) @@ -423,7 +423,7 @@ CProjectileManager::CProjectile::CProjectile() LocalizedImpact = false; } -//***************************************************************************************** +// ***************************************************************************************** CProjectileManager::CProjectile::~CProjectile() { H_AUTO_USE(RZ_ProjectileManager) @@ -440,7 +440,7 @@ CProjectileManager::CProjectile::~CProjectile() } } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::evalFXPosition(const CFXStickMode *stickMode, CEntityCL &entity, NLMISC::CVector &result, const NLMISC::CVector &additionnalOffset /* = NLMISC::CVector::Null*/) { H_AUTO_USE(RZ_ProjectileManager) @@ -497,7 +497,7 @@ void CProjectileManager::evalFXPosition(const CFXStickMode *stickMode, CEntityCL } } -//***************************************************************************************** +// ***************************************************************************************** sint CProjectileManager::CProjectile::getImpactBoneID(CEntityCL &target) { H_AUTO_USE(RZ_ProjectileManager) @@ -507,7 +507,7 @@ sint CProjectileManager::CProjectile::getImpactBoneID(CEntityCL &target) return TargetBoneID; } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::CProjectile::updateTargetPos() { H_AUTO_USE(RZ_ProjectileManager) @@ -601,7 +601,7 @@ void CProjectileManager::CProjectile::updateTargetPos() // else use value already present in impactPos } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::CProjectile::setMatrix(const NLMISC::CMatrix &pos) { H_AUTO_USE(RZ_ProjectileManager) @@ -631,7 +631,7 @@ static void convertFreeFXToAttachedFX(NL3D::UParticleSystemInstance instance, holder.attachFX(af); } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::CProjectile::shutDown(CCharacterCL *target) { H_AUTO_USE(RZ_ProjectileManager) @@ -677,7 +677,7 @@ void CProjectileManager::CProjectile::shutDown(CCharacterCL *target) } } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::reset() { H_AUTO_USE(RZ_ProjectileManager) @@ -686,7 +686,7 @@ void CProjectileManager::reset() _ToShutDownProjectiles.clear(); } -//***************************************************************************************** +// ***************************************************************************************** void CProjectileManager::entityRemoved(uint slot) { // TODO nico : adding anchor objects (that can be "CRefPtr'ed" ...) to define rays / projectile paths would be a more elegant solution now (and a CAnchorRef object to dlte anchor automatically) @@ -729,7 +729,7 @@ void CProjectileManager::entityRemoved(uint slot) } } -//***************************************************************************************** +// ***************************************************************************************** const CAnimationFX *CProjectileManager::getResistFX(uint level) { H_AUTO_USE(RZ_ProjectileManager) diff --git a/code/ryzom/client/src/property_decoder.h b/code/ryzom/client/src/property_decoder.h index 076be0966..0dd3fa413 100644 --- a/code/ryzom/client/src/property_decoder.h +++ b/code/ryzom/client/src/property_decoder.h @@ -53,7 +53,7 @@ private: class CEntityEntry { public: - CEntityEntry() : EntryUsed(false), PosIsRelative(false), AssociationBits(0) {} + CEntityEntry() : AssociationBits(0), EntryUsed(false), PosIsRelative(false), PosIsInterior(false) {} CLFECOMMON::TSheetId Sheet; uint16 AssociationBits; bool EntryUsed; diff --git a/code/ryzom/client/src/r2/auto_group.cpp b/code/ryzom/client/src/r2/auto_group.cpp index 8bd71eb55..c792b8347 100644 --- a/code/ryzom/client/src/r2/auto_group.cpp +++ b/code/ryzom/client/src/r2/auto_group.cpp @@ -28,7 +28,7 @@ namespace R2 { -//*************************************************************** +// *************************************************************** CAutoGroup::CAutoGroup() { CPrimLook primGroup; @@ -37,13 +37,13 @@ CAutoGroup::CAutoGroup() _AutoGroupEnabled = false; } -//*************************************************************** +// *************************************************************** CAutoGroup::~CAutoGroup() { clear(); } -//*************************************************************** +// *************************************************************** void CAutoGroup::clear() { //H_AUTO(R2_CAutoGroup__clear) @@ -58,7 +58,7 @@ void CAutoGroup::clear() _AutoGroup.clear(); } -//*************************************************************** +// *************************************************************** void CAutoGroup::update(const CVector &testPos, const std::string &paletteEntry, bool valid) { //H_AUTO(R2_CAutoGroup_update) @@ -92,7 +92,7 @@ void CAutoGroup::update(const CVector &testPos, const std::string &paletteEntry, } } -//*************************************************************** +// *************************************************************** CInstance *CAutoGroup::getGroupingCandidate() { //H_AUTO(R2_CAutoGroup_getGroupingCandidate) @@ -229,7 +229,7 @@ CInstance *CAutoGroup::getGroupingCandidate() } -//*************************************************************** +// *************************************************************** void CAutoGroup::group(CObject *newEntityDesc, const NLMISC::CVectorD &createPosition) { //H_AUTO(R2_CAutoGroup_group) diff --git a/code/ryzom/client/src/r2/displayer_base.cpp b/code/ryzom/client/src/r2/displayer_base.cpp index 3598ec816..a149972de 100644 --- a/code/ryzom/client/src/r2/displayer_base.cpp +++ b/code/ryzom/client/src/r2/displayer_base.cpp @@ -28,7 +28,7 @@ namespace R2 uint CDisplayerBase::ObjCount = 0; -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerBase::CDisplayerBase() : _DisplayedInstance(NULL) { ++ ObjCount; @@ -42,14 +42,14 @@ CDisplayerBase::~CDisplayerBase() -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerBase::pushLuaAccess(CLuaState &ls) { //H_AUTO(R2_CDisplayerBase_pushLuaAccess) CLuaIHM::pushReflectableOnStack(ls, this); } -//********************************************************************************************************* +// ********************************************************************************************************* const CObjectTable &CDisplayerBase::getProps() const { //H_AUTO(R2_CDisplayerBase_getProps) @@ -64,7 +64,7 @@ const CObjectTable &CDisplayerBase::getProps() const return *props; } -//********************************************************************************************************* +// ********************************************************************************************************* CLuaObject &CDisplayerBase::getLuaProjection() { //H_AUTO(R2_CDisplayerBase_getLuaProjection) diff --git a/code/ryzom/client/src/r2/displayer_lua.cpp b/code/ryzom/client/src/r2/displayer_lua.cpp index d07d32e76..a2df79851 100644 --- a/code/ryzom/client/src/r2/displayer_lua.cpp +++ b/code/ryzom/client/src/r2/displayer_lua.cpp @@ -22,7 +22,7 @@ namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* bool CDisplayerLua::init(const CLuaObject ¶meters) { //H_AUTO(R2_CDisplayerLua_init) @@ -52,13 +52,13 @@ bool CDisplayerLua::init(const CLuaObject ¶meters) return CDisplayerBase::init(parameters); } -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerLua &CDisplayerLua::CToLua::getEnclosing() { return *(CDisplayerLua *) ((uint8 *) this - offsetof(CDisplayerLua, _ToLua)); // ugly, yes ... } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::CToLua::executeHandler(const CLuaString &eventName, int numArgs) { CLuaState &ls = *getLua(); @@ -87,7 +87,7 @@ void CDisplayerLua::CToLua::executeHandler(const CLuaString &eventName, int numA } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::CToLua::pushLuaAccess(CLuaState &ls) { if (_LuaTable.isValid()) @@ -102,14 +102,14 @@ void CDisplayerLua::CToLua::pushLuaAccess(CLuaState &ls) } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::pushLuaAccess(CLuaState &ls) { //H_AUTO(R2_CDisplayerLua_pushLuaAccess) _ToLua.pushLuaAccess(ls); } -//********************************************************************************************************* +// ********************************************************************************************************* CLuaState *CDisplayerLua::CToLua::getLua() { if (!_LuaTable.isValid()) @@ -120,112 +120,112 @@ CLuaState *CDisplayerLua::CToLua::getLua() return _LuaTable.getLuaState(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onActChanged() { //H_AUTO(R2_CDisplayerLua_onActChanged) _ToLua.onActChanged(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onContinentChanged() { //H_AUTO(R2_CDisplayerLua_onContinentChanged) _ToLua.onContinentChanged(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onPostCreate() { //H_AUTO(R2_CDisplayerLua_onPostCreate) _ToLua.onPostCreate(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onCreate() { //H_AUTO(R2_CDisplayerLua_onCreate) _ToLua.onCreate(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onErase() { //H_AUTO(R2_CDisplayerLua_onErase) _ToLua.onErase(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onPreHrcMove() { //H_AUTO(R2_CDisplayerLua_onPreHrcMove) _ToLua.onPreHrcMove(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onPostHrcMove() { //H_AUTO(R2_CDisplayerLua_onPostHrcMove) _ToLua.onPostHrcMove(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onFocus(bool focused) { //H_AUTO(R2_CDisplayerLua_onFocus) _ToLua.onFocus(focused); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onSelect(bool selected) { //H_AUTO(R2_CDisplayerLua_onSelect) _ToLua.onSelect(selected); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onAttrModified(const std::string &attrName,sint32 index) { //H_AUTO(R2_CDisplayerLua_onAttrModified) _ToLua.onAttrModified(attrName, index); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onTargetInstanceCreated(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CDisplayerLua_onTargetInstanceCreated) _ToLua.onTargetInstanceCreated(refMakerAttr, refMakerAttrIndex); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onTargetInstanceErased(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CDisplayerLua_onTargetInstanceErased) _ToLua.onTargetInstanceErased(refMakerAttr, refMakerAttrIndex); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onTargetInstanceEraseRequested(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CDisplayerLua_onTargetInstanceEraseRequested) _ToLua.onTargetInstanceEraseRequested(refMakerAttr, refMakerAttrIndex); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onTargetInstanceAttrModified(const std::string &refMakerAttr,sint32 refMakerAttrIndex,const std::string &targetAttrName,sint32 targetAttrIndex) { //H_AUTO(R2_CDisplayerLua_onTargetInstanceAttrModified) _ToLua.onTargetInstanceAttrModified(refMakerAttr, refMakerAttrIndex, targetAttrName, targetAttrIndex); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onTargetInstancePreHrcMove(const std::string &refMakerAttr,sint32 refMakerAttrIndex) { //H_AUTO(R2_CDisplayerLua_onTargetInstancePreHrcMove) _ToLua.onTargetInstancePreHrcMove(refMakerAttr, refMakerAttrIndex); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerLua::onTargetInstancePostHrcMove(const std::string &refMakerAttr,sint32 refMakerAttrIndex) { //H_AUTO(R2_CDisplayerLua_onTargetInstancePostHrcMove) diff --git a/code/ryzom/client/src/r2/displayer_visual.h b/code/ryzom/client/src/r2/displayer_visual.h index d459ba630..905960abe 100644 --- a/code/ryzom/client/src/r2/displayer_visual.h +++ b/code/ryzom/client/src/r2/displayer_visual.h @@ -32,7 +32,7 @@ class CGroupInScene; namespace R2 { -//*********************************************************************************************************************** +// *********************************************************************************************************************** // Interface for object selection in the scene struct ISelectableObject { @@ -51,7 +51,7 @@ struct ISelectableObject virtual CInstance *getInstanceInEditor() const = 0; }; -//*********************************************************************************************************************** +// *********************************************************************************************************************** // Decoration in a CGroupMap that expose this interface (through dynamic_cast) are representation of CInstance in the island map struct IDisplayerUIHandle { @@ -66,7 +66,7 @@ struct IDisplayerUIHandle }; -//*********************************************************************************************************************** +// *********************************************************************************************************************** // Displays an object of the editor in the 3D scene / in the worldmap class CDisplayerVisual : public CDisplayerBase, public ISelectableObject { diff --git a/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp b/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp index 959ff13a8..fc69f487a 100644 --- a/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp +++ b/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp @@ -29,7 +29,7 @@ using namespace NLMISC; namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerVisualActivitySequence::CDisplayerVisualActivitySequence() { _Touched = true; @@ -38,14 +38,14 @@ CDisplayerVisualActivitySequence::CDisplayerVisualActivitySequence() _DecalColor = CRGBA(0, 0, 0, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerVisualActivitySequence::~CDisplayerVisualActivitySequence() { clear(); _WPCache.clear(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::clear(bool wantRemoveFromWorldMap) { //H_AUTO(R2_CDisplayerVisualActivitySequence_clear) @@ -64,7 +64,7 @@ void CDisplayerVisualActivitySequence::clear(bool wantRemoveFromWorldMap) _TraversedPrimInfos.clear(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::onAttrModified(const std::string &attrName,sint32 /* attrIndex */) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onAttrModified) @@ -74,14 +74,14 @@ void CDisplayerVisualActivitySequence::onAttrModified(const std::string &attrNam } } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::touch() { //H_AUTO(R2_CDisplayerVisualActivitySequence_touch) _Touched = true; } -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerVisual *CDisplayerVisualActivitySequence::getParentDV() const { //H_AUTO(R2_CDisplayerVisualActivitySequence_getParentDV) @@ -96,7 +96,7 @@ CDisplayerVisual *CDisplayerVisualActivitySequence::getParentDV() const return prevDV; } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::update() { //H_AUTO(R2_CDisplayerVisualActivitySequence_update) @@ -242,7 +242,7 @@ void CDisplayerVisualActivitySequence::update() } } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::addFootSteps(const NLMISC::CLine &line) { //H_AUTO(R2_CDisplayerVisualActivitySequence_addFootSteps) @@ -262,7 +262,7 @@ void CDisplayerVisualActivitySequence::addFootSteps(const NLMISC::CLine &line) _FootSteps.push_back(line); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::addWanderSteps(const CVector &pos) { //H_AUTO(R2_CDisplayerVisualActivitySequence_addWanderSteps) @@ -280,7 +280,7 @@ static void updateState(TSequenceState &state, CDisplayerVisual *dv) } -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerVisual *CDisplayerVisualActivitySequence::getPossibleGroupDV(CDisplayerVisual *entityDV) { //H_AUTO(R2_CDisplayerVisualActivitySequence_getPossibleGroupDV) @@ -298,7 +298,7 @@ CDisplayerVisual *CDisplayerVisualActivitySequence::getPossibleGroupDV(CDisplaye return entityDV; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CDisplayerVisualActivitySequence::isVisible(CDisplayerVisual *groupDV, CDisplayerVisual *entityDV) { //H_AUTO(R2_CDisplayerVisualActivitySequence_isVisible) @@ -321,7 +321,7 @@ bool CDisplayerVisualActivitySequence::isVisible(CDisplayerVisual *groupDV, CDis return true; } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::removeFromWorldMap() { //H_AUTO(R2_CDisplayerVisualActivitySequence_removeFromWorldMap) @@ -335,7 +335,7 @@ void CDisplayerVisualActivitySequence::removeFromWorldMap() } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::onPostRender() { //H_AUTO(R2_CDisplayerVisualActivitySequence_onPostRender) @@ -435,7 +435,7 @@ void CDisplayerVisualActivitySequence::onPostRender() } } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::onPreRender() { //H_AUTO(R2_CDisplayerVisualActivitySequence_onPreRender) @@ -475,7 +475,7 @@ void CDisplayerVisualActivitySequence::onPreRender() } } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::updateWorldPos() { //H_AUTO(R2_CDisplayerVisualActivitySequence_updateWorldPos) @@ -483,28 +483,28 @@ void CDisplayerVisualActivitySequence::updateWorldPos() } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::onInstanceCreated(CInstance &/* instance */) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onInstanceCreated) touch(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::onInstanceErased(CInstance &/* instance */) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onInstanceErased) touch(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::onAttrModified(CInstance &/* instance */,const std::string &/* attrName */,sint32 /* attrIndex */) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onAttrModified) touch(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualActivitySequence::setActive(bool active) { //H_AUTO(R2_CDisplayerVisualActivitySequence_setActive) @@ -520,7 +520,7 @@ void CDisplayerVisualActivitySequence::setActive(bool active) _Active = active; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CDisplayerVisualActivitySequence::getActive() const { //H_AUTO(R2_CDisplayerVisualActivitySequence_getActive) @@ -528,7 +528,7 @@ bool CDisplayerVisualActivitySequence::getActive() const } -//********************************************************* +// ********************************************************* void CDisplayerVisualActivitySequence::setWorldMapNumEdges(uint count) { //H_AUTO(R2_CDisplayerVisualActivitySequence_setWorldMapNumEdges) @@ -564,7 +564,7 @@ void CDisplayerVisualActivitySequence::setWorldMapNumEdges(uint count) } } -//********************************************************* +// ********************************************************* void CDisplayerVisualActivitySequence::onAdd(CGroupMap &/* owner */) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onAdd) @@ -574,7 +574,7 @@ void CDisplayerVisualActivitySequence::onAdd(CGroupMap &/* owner */) setWorldMapNumEdges((uint)_FootSteps.size()); } -//********************************************************* +// ********************************************************* void CDisplayerVisualActivitySequence::onRemove(CGroupMap &/* owner */) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onRemove) @@ -583,14 +583,14 @@ void CDisplayerVisualActivitySequence::onRemove(CGroupMap &/* owner */) _AddedToWorldMap = false; } -//********************************************************* +// ********************************************************* void CDisplayerVisualActivitySequence::onPreRender(CGroupMap &/* owner */) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onPreRender) } -//********************************************************* +// ********************************************************* void CDisplayerVisualActivitySequence::onUpdate(CGroupMap &owner) { //H_AUTO(R2_CDisplayerVisualActivitySequence_onUpdate) @@ -615,7 +615,7 @@ void CDisplayerVisualActivitySequence::onUpdate(CGroupMap &owner) } } -//********************************************************* +// ********************************************************* void CDisplayerVisualActivitySequence::setWorldMapColor(CRGBA color) { //H_AUTO(R2_CDisplayerVisualActivitySequence_setWorldMapColor) diff --git a/code/ryzom/client/src/r2/displayer_visual_road.cpp b/code/ryzom/client/src/r2/displayer_visual_road.cpp index 8661e67fd..2e580416c 100644 --- a/code/ryzom/client/src/r2/displayer_visual_road.cpp +++ b/code/ryzom/client/src/r2/displayer_visual_road.cpp @@ -30,7 +30,7 @@ namespace R2 { /* -//********************************************************************************************************* +// ********************************************************************************************************* CPrimRender2::CPrimRender2() { _VertexMeshs.setShapeName("road_flag.shape"); @@ -38,19 +38,19 @@ CPrimRender2::CPrimRender2() _VertexScale = 1.f; } -//********************************************************************************************************* +// ********************************************************************************************************* void CPrimRender2::setVertexShapeName(const std::string &name) { _VertexMeshs.setShapeName(name); } -//********************************************************************************************************* +// ********************************************************************************************************* void CPrimRender2::setEdgeShapeName(const std::string &name) { _EdgeMeshs.setShapeName(name); } -//********************************************************************************************************* +// ********************************************************************************************************* void CPrimRender2::setPoints(const std::vector &wp, bool lastIsValid, bool closed) { uint iclosed = closed ? 1 : 0; @@ -94,7 +94,7 @@ void CPrimRender2::setPoints(const std::vector &wp, bool lastIs } } -//********************************************************************************************************* +// ********************************************************************************************************* void CPrimRender2::setEmissive(NLMISC::CRGBA color) { _VertexMeshs.setEmissive(color); @@ -104,13 +104,13 @@ void CPrimRender2::setEmissive(NLMISC::CRGBA color) /* -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerVisualRoad::~CDisplayerVisualRoad() { } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualRoad::onCreate() { rebuild(); @@ -118,7 +118,7 @@ void CDisplayerVisualRoad::onCreate() } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualRoad::rebuild() { const CObject *points = getObject(&getProps(), "Points"); diff --git a/code/ryzom/client/src/r2/displayer_visual_shape.cpp b/code/ryzom/client/src/r2/displayer_visual_shape.cpp index b867d44b3..5902ea103 100644 --- a/code/ryzom/client/src/r2/displayer_visual_shape.cpp +++ b/code/ryzom/client/src/r2/displayer_visual_shape.cpp @@ -41,7 +41,7 @@ extern uint SkipFrame; namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerVisualShape::CDisplayerVisualShape(const std::string &shapeName, float scale, bool worldMapDisplay) { _ShapeName = shapeName; @@ -54,14 +54,14 @@ CDisplayerVisualShape::CDisplayerVisualShape(const std::string &shapeName, float _WorldMapDisplay = worldMapDisplay; } -//********************************************************************************************************* +// ********************************************************************************************************* CDisplayerVisualShape::~CDisplayerVisualShape() { deleteShape(); deleteVisualCollisionEntity(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::deleteVisualCollisionEntity() { //H_AUTO(R2_CDisplayerVisualShape_deleteVisualCollisionEntity) @@ -75,7 +75,7 @@ void CDisplayerVisualShape::deleteVisualCollisionEntity() } } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::deleteShape() { //H_AUTO(R2_CDisplayerVisualShape_deleteShape) @@ -93,7 +93,7 @@ void CDisplayerVisualShape::deleteShape() } } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onPreRender() { //H_AUTO(R2_CDisplayerVisualShape_onPreRender) @@ -191,7 +191,7 @@ void CDisplayerVisualShape::onPreRender() _Touched = false; } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::drawBBox(NLMISC::CRGBA color) const { //H_AUTO(R2_CDisplayerVisualShape_drawBBox) @@ -202,7 +202,7 @@ void CDisplayerVisualShape::drawBBox(NLMISC::CRGBA color) const ::drawBox(bbox.getMin(), bbox.getMax(), color); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onPostRender() { //H_AUTO(R2_CDisplayerVisualShape_onPostRender) @@ -232,7 +232,7 @@ void CDisplayerVisualShape::onPostRender() CDisplayerVisual::onPostRender(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onAttrModified(const std::string &name, sint32 index) { //H_AUTO(R2_CDisplayerVisualShape_onAttrModified) @@ -248,7 +248,7 @@ void CDisplayerVisualShape::onAttrModified(const std::string &name, sint32 in }*/ } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::setDisplayMode(sint32 mode) { //H_AUTO(R2_CDisplayerVisualShape_setDisplayMode) @@ -257,14 +257,14 @@ void CDisplayerVisualShape::setDisplayMode(sint32 mode) } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onParentDisplayModeChanged() { //H_AUTO(R2_CDisplayerVisualShape_onParentDisplayModeChanged) updateMapDeco(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onFocus(bool focused) { //H_AUTO(R2_CDisplayerVisualShape_onFocus) @@ -272,7 +272,7 @@ void CDisplayerVisualShape::onFocus(bool focused) updateMapDeco(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onSelect(bool selected) { //H_AUTO(R2_CDisplayerVisualShape_onSelect) @@ -281,7 +281,7 @@ void CDisplayerVisualShape::onSelect(bool selected) } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::setActive(bool active) { //H_AUTO(R2_CDisplayerVisualShape_setActive) @@ -307,7 +307,7 @@ void CDisplayerVisualShape::setActive(bool active) _Active = active; } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::updateMapDeco() { //H_AUTO(R2_CDisplayerVisualShape_updateMapDeco) @@ -322,14 +322,14 @@ void CDisplayerVisualShape::updateMapDeco() } } -//********************************************************************************************************* +// ********************************************************************************************************* bool CDisplayerVisualShape::getActive() const { //H_AUTO(R2_CDisplayerVisualShape_getActive) return _Active; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CDisplayerVisualShape::init(const CLuaObject ¶meters) { //H_AUTO(R2_CDisplayerVisualSh_initSape) @@ -346,7 +346,7 @@ bool CDisplayerVisualShape::init(const CLuaObject ¶meters) return CDisplayerVisual::init(parameters); } -//********************************************************************************************************* +// ********************************************************************************************************* bool CDisplayerVisualShape::getLastClip() const { //H_AUTO(R2_CDisplayerVisualShape_getLastClip) @@ -354,7 +354,7 @@ bool CDisplayerVisualShape::getLastClip() const return !_Instance.getLastClippedState(); } -//********************************************************************************************************* +// ********************************************************************************************************* NLMISC::CAABBox CDisplayerVisualShape::getSelectBox() const { //H_AUTO(R2_CDisplayerVisualShape_getSelectBox) @@ -366,7 +366,7 @@ NLMISC::CAABBox CDisplayerVisualShape::getSelectBox() const return bbox; } -//********************************************************************************************************* +// ********************************************************************************************************* float CDisplayerVisualShape::preciseIntersectionTest(const NLMISC::CVector &worldRayStart,const NLMISC::CVector &worldRayDir) const { //H_AUTO(R2_CDisplayerVisualShape_preciseIntersectionTest) @@ -385,7 +385,7 @@ float CDisplayerVisualShape::preciseIntersectionTest(const NLMISC::CVector &worl return FLT_MAX; } -//********************************************************************************************************* +// ********************************************************************************************************* const NLMISC::CMatrix &CDisplayerVisualShape::getInvertedMatrix() const { //H_AUTO(R2_CDisplayerVisualShape_getInvertedMatrix) @@ -394,7 +394,7 @@ const NLMISC::CMatrix &CDisplayerVisualShape::getInvertedMatrix() const return _InvertedMatrix; } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::updateWorldPos() { //H_AUTO(R2_CDisplayerVisualShape_updateWorldPos) @@ -407,7 +407,7 @@ void CDisplayerVisualShape::updateWorldPos() } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::snapToGround() { //H_AUTO(R2_CDisplayerVisualShape_snapToGround) @@ -432,7 +432,7 @@ void CDisplayerVisualShape::snapToGround() _Touched = true; } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::visualSnapToGround() { //H_AUTO(R2_CDisplayerVisualShape_visualSnapToGround) @@ -478,7 +478,7 @@ void CDisplayerVisualShape::visualSnapToGround() } } -//********************************************************************************************************* +// ********************************************************************************************************* NLMISC::CVector CDisplayerVisualShape::evalLinkPoint(bool /* leader */) { //H_AUTO(R2_CDisplayerVisualShape_evalLinkPoint) @@ -493,27 +493,27 @@ NLMISC::CVector CDisplayerVisualShape::evalLinkPoint(bool /* leader */) } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onAdd(CGroupMap &/* owner */) { //H_AUTO(R2_CDisplayerVisualShape_onAdd) } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onRemove(CGroupMap &/* owner */) { //H_AUTO(R2_CDisplayerVisualShape_onRemove) } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onPreRender(CGroupMap &/* owner */) { //H_AUTO(R2_CDisplayerVisualShape_onPreRender) } -//********************************************************************************************************* +// ********************************************************************************************************* void CDisplayerVisualShape::onUpdate(CGroupMap &/* owner */) { //H_AUTO(R2_CDisplayerVisualShape_onUpdate) diff --git a/code/ryzom/client/src/r2/entity_custom_select_box.cpp b/code/ryzom/client/src/r2/entity_custom_select_box.cpp index 6e472a898..ea2bd21f8 100644 --- a/code/ryzom/client/src/r2/entity_custom_select_box.cpp +++ b/code/ryzom/client/src/r2/entity_custom_select_box.cpp @@ -26,7 +26,7 @@ using namespace NLMISC; namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* void CEntityCustomSelectBox::toTable(CLuaObject &table) { //H_AUTO(R2_CEntityCustomSelectBox_toTable) @@ -48,7 +48,7 @@ void CEntityCustomSelectBox::toTable(CLuaObject &table) } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntityCustomSelectBox::fromTable(CLuaObject &table) { //H_AUTO(R2_CEntityCustomSelectBox_fromTable) diff --git a/code/ryzom/client/src/r2/entity_sorter.cpp b/code/ryzom/client/src/r2/entity_sorter.cpp index e30387ce8..21d9937fe 100644 --- a/code/ryzom/client/src/r2/entity_sorter.cpp +++ b/code/ryzom/client/src/r2/entity_sorter.cpp @@ -30,12 +30,12 @@ namespace R2 #define CHECK_INTEGRITY #endif -//********************************************************************************************************* +// ********************************************************************************************************* CEntitySorter::CEntitySorter() { } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::registerEntityDisplayer(CDisplayerVisualEntity *dve) { nlassert(dve); @@ -49,7 +49,7 @@ void CEntitySorter::registerEntityDisplayer(CDisplayerVisualEntity *dve) CHECK_INTEGRITY } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::unregisterEntityDisplayer(CDisplayerVisualEntity *dve) { nlassert(dve); @@ -67,14 +67,14 @@ void CEntitySorter::unregisterEntityDisplayer(CDisplayerVisualEntity *dve) CHECK_INTEGRITY } -//********************************************************************************************************* +// ********************************************************************************************************* uint CEntitySorter::getMaxEntityCount() const { static volatile uint MAX_NUM_VISIBLE_ENTITIES = 253; return MAX_NUM_VISIBLE_ENTITIES; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CEntitySorter::isWithinDisplayRange(CDisplayerVisualEntity *displayer) const { if (!displayer) return false; @@ -82,7 +82,7 @@ bool CEntitySorter::isWithinDisplayRange(CDisplayerVisualEntity *displayer) cons return CSortedEntity(displayer, (UserEntity->pos() - displayer->getWorldPos()).sqrnorm()) < _FarthestEntity; } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::sortByEntitiesByDistance() { CHECK_INTEGRITY @@ -101,7 +101,7 @@ void CEntitySorter::sortByEntitiesByDistance() } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::updateFadeInOut() { CHECK_INTEGRITY @@ -148,7 +148,7 @@ void CEntitySorter::updateFadeInOut() CHECK_INTEGRITY } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::eraseVisibleListEntry(sint index) { if (index == -1) return; @@ -167,7 +167,7 @@ void CEntitySorter::eraseVisibleListEntry(sint index) _VisibleList.pop_back(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::updateVisibleList() { CHECK_INTEGRITY @@ -229,7 +229,7 @@ void CEntitySorter::updateVisibleList() CHECK_INTEGRITY } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::clipEntitiesByDist() { CHECK_INTEGRITY @@ -250,7 +250,7 @@ void CEntitySorter::clipEntitiesByDist() CHECK_INTEGRITY } -//********************************************************************************************************* +// ********************************************************************************************************* void CEntitySorter::checkIntegrity() { #ifdef NL_DEBUG diff --git a/code/ryzom/client/src/r2/instance.h b/code/ryzom/client/src/r2/instance.h index 6c37aca11..d10c37532 100644 --- a/code/ryzom/client/src/r2/instance.h +++ b/code/ryzom/client/src/r2/instance.h @@ -241,7 +241,7 @@ private: // For editor : Create this object from the CObjectTable it materialize in the editor CInstance(const CObjectTable *objectTable, CLuaState &ls); // copy not supported - CInstance(const CInstance &/* other */) { nlassert(0); } + CInstance(const CInstance &/* other */):NLMISC::CRefCount() { nlassert(0); } CInstance &operator = (const CInstance &/* other */) { nlassert(0); return *this; } // void executeHandler(const CLuaString &name, int numArgs); diff --git a/code/ryzom/client/src/r2/instance_map_deco.cpp b/code/ryzom/client/src/r2/instance_map_deco.cpp index ea9b426f8..aec958373 100644 --- a/code/ryzom/client/src/r2/instance_map_deco.cpp +++ b/code/ryzom/client/src/r2/instance_map_deco.cpp @@ -30,7 +30,7 @@ namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::CCtrlButtonEntity::getContextHelp(ucstring &help) const { //H_AUTO(R2_CCtrlButtonEntity_getContextHelp) @@ -38,14 +38,14 @@ void CInstanceMapDeco::CCtrlButtonEntity::getContextHelp(ucstring &help) const if (help == NLMISC::CI18N::get("uiR2EDNoName")) help.clear(); } -//********************************************************************************************************* +// ********************************************************************************************************* bool CInstanceMapDeco::CCtrlButtonEntity::handleEvent(const CEventDescriptor &/* event */) { //H_AUTO(R2_CCtrlButtonEntity_handleEvent) return false; // just a display with tooltip capability } -//********************************************************************************************************* +// ********************************************************************************************************* CInstanceMapDeco::CInstanceMapDeco() { //H_AUTO(R2_CInstanceMapDeco_CInstanceMapDeco) @@ -64,7 +64,7 @@ CInstanceMapDeco::CInstanceMapDeco() _InvalidPos = false; } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::setDisplayedInstance(CInstance *instance, bool orientable) { //H_AUTO(R2_CInstanceMapDeco_setDisplayedInstance) @@ -74,7 +74,7 @@ void CInstanceMapDeco::setDisplayedInstance(CInstance *instance, bool orientable _Orientable = orientable; } -//********************************************************************************************************* +// ********************************************************************************************************* CVector2f CInstanceMapDeco::getWorldPos() const { //H_AUTO(R2_CInstanceMapDeco_getWorldPos) @@ -84,7 +84,7 @@ CVector2f CInstanceMapDeco::getWorldPos() const return vd->getWorldPos2f(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::invalidateCoords() { //H_AUTO(R2_CInstanceMapDeco_invalidateCoords) @@ -103,7 +103,7 @@ void CInstanceMapDeco::invalidateCoords() if (_Orient) _Orient->invalidateCoords(); } -//********************************************************************************************************* +// ********************************************************************************************************* CCtrlQuad *CInstanceMapDeco::newQuad(CGroupMap &owner) { //H_AUTO(R2_CInstanceMapDeco_newQuad) @@ -117,7 +117,7 @@ CCtrlQuad *CInstanceMapDeco::newQuad(CGroupMap &owner) } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::onAdd(CGroupMap &owner) { //H_AUTO(R2_CInstanceMapDeco_onAdd) @@ -168,7 +168,7 @@ void CInstanceMapDeco::onAdd(CGroupMap &owner) _AddedToMap = true; } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::onRemove(CGroupMap &owner) { //H_AUTO(R2_CInstanceMapDeco_onRemove) @@ -199,7 +199,7 @@ void CInstanceMapDeco::onRemove(CGroupMap &owner) } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::onPreRender(CGroupMap &groupMap) { //H_AUTO(R2_CInstanceMapDeco_onPreRender) @@ -268,7 +268,7 @@ void CInstanceMapDeco::onPreRender(CGroupMap &groupMap) } } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::onUpdate(CGroupMap &groupMap) { //H_AUTO(R2_CInstanceMapDeco_onUpdate) @@ -444,7 +444,7 @@ void CInstanceMapDeco::onUpdate(CGroupMap &groupMap) } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::setTextureAndFit(const std::string &bitmapName) { //H_AUTO(R2_CInstanceMapDeco_setTextureAndFit) @@ -463,7 +463,7 @@ void CInstanceMapDeco::setTextureAndFit(const std::string &bitmapName) } } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::setActive(bool active) { //H_AUTO(R2_CInstanceMapDeco_setActive) @@ -476,7 +476,7 @@ void CInstanceMapDeco::setActive(bool active) _Active = active; } -//********************************************************************************************************* +// ********************************************************************************************************* void CInstanceMapDeco::setInvalidPosFlag(bool invalid) { //H_AUTO(R2_CInstanceMapDeco_setInvalidPosFlag) diff --git a/code/ryzom/client/src/r2/island_collision.cpp b/code/ryzom/client/src/r2/island_collision.cpp index 45a45f306..eecddb642 100644 --- a/code/ryzom/client/src/r2/island_collision.cpp +++ b/code/ryzom/client/src/r2/island_collision.cpp @@ -107,25 +107,25 @@ private: }; -//********************************************************************************************************* +// ********************************************************************************************************* CAccessibilityTexture::CAccessibilityTexture() : _IslandCol(NULL) { nlassert(0); } -//********************************************************************************************************* +// ********************************************************************************************************* CAccessibilityTexture::CAccessibilityTexture(CIslandCollision *islandCol) : _IslandCol(islandCol) { // nlwarning new accessiblity texture created } -//********************************************************************************************************* +// ********************************************************************************************************* CAccessibilityTexture::~CAccessibilityTexture() { nlwarning("Accessibility texture removed"); } -//********************************************************************************************************* +// ********************************************************************************************************* CIslandCollision::CIslandCollision() { _LastPackedIslandTestPos.set(0.f, 0.f); @@ -135,7 +135,7 @@ CIslandCollision::CIslandCollision() _AccessibilityTexture = NULL; } -//********************************************************************************************************* +// ********************************************************************************************************* void CIslandCollision::releaseAccessibilityTexture() { //H_AUTO(R2_CIslandCollision_releaseAccessibilityTexture) @@ -145,7 +145,7 @@ void CIslandCollision::releaseAccessibilityTexture() vr.setExternalTexture(_AccessibilityTextureId, NULL, 0, 0, 0, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CIslandCollision::release() { //H_AUTO(R2_CIslandCollision_release) @@ -155,13 +155,13 @@ void CIslandCollision::release() } -//********************************************************************************************************* +// ********************************************************************************************************* CIslandCollision::~CIslandCollision() { release(); } -//********************************************************************************************************* +// ********************************************************************************************************* CRefCountedPackedWorld *CIslandCollision::getPackedIsland() { //H_AUTO(R2_CIslandCollision_getPackedIsland) @@ -179,7 +179,7 @@ inline sint clamped(sint value, sint size) clamp(value, 0, size - 1); return value; } -//********************************************************************************************************* +// ********************************************************************************************************* R2::CScenarioEntryPoints::CCompleteIsland *CIslandCollision::getCurrIslandDesc() { //H_AUTO(R2_CIslandCollision_getCurrIslandDesc) @@ -239,7 +239,7 @@ R2::CScenarioEntryPoints::CCompleteIsland *CIslandCollision::getCurrIslandDesc() return &_IslandDesc; } -//********************************************************************************************************* +// ********************************************************************************************************* const NLMISC::CArray2D &CIslandCollision::getHeightMap() { //H_AUTO(R2_CIslandCollision_getHeightMap) @@ -248,7 +248,7 @@ const NLMISC::CArray2D &CIslandCollision::getHeightMap() return _HeightMap; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CIslandCollision::findEmptyPlace(const CVector2f &startPos, NLMISC::CVector &dest) { //H_AUTO(R2_CIslandCollision_findEmptyPlace) @@ -373,7 +373,7 @@ bool CIslandCollision::findEmptyPlace(const CVector2f &startPos, NLMISC::CVector return false; } -//********************************************************************************************************* +// ********************************************************************************************************* void CIslandCollision::updateCurrPackedIsland() { //H_AUTO(R2_CIslandCollision_updateCurrPackedIsland) @@ -400,7 +400,7 @@ void CIslandCollision::updateCurrPackedIsland() } } -//********************************************************************************************************* +// ********************************************************************************************************* CPackedWorld *CIslandCollision::reloadPackedIsland(const CScenarioEntryPoints::CCompleteIsland &islandDesc) { //H_AUTO(R2_CIslandCollision_reloadPackedIsland) @@ -487,7 +487,7 @@ CPackedWorld *CIslandCollision::reloadPackedIsland(const CScenarioEntryPoints::C return _PackedIsland; } -//********************************************************************************************************* +// ********************************************************************************************************* void CIslandCollision::mergeWaterSurfaces() { //H_AUTO(R2_CIslandCollision_mergeWaterSurfaces) @@ -531,7 +531,7 @@ void CIslandCollision::mergeWaterSurfaces() } } -//********************************************************************************************************* +// ********************************************************************************************************* void CIslandCollision::addInaccessibleRegion(const NLMISC::CPolygon2D &poly) { //H_AUTO(R2_CIslandCollision_addInaccessibleRegion) @@ -559,7 +559,7 @@ void CIslandCollision::addInaccessibleRegion(const NLMISC::CPolygon2D &poly) } } -//********************************************************************************************************* +// ********************************************************************************************************* void CIslandCollision::loadEntryPoints() { //H_AUTO(R2_CIslandCollision_loadEntryPoints) @@ -580,7 +580,7 @@ void CIslandCollision::loadEntryPoints() } } -//********************************************************************************************************* +// ********************************************************************************************************* bool CIslandCollision::isValidPoly(const NLMISC::CPolygon2D &poly) { //H_AUTO(R2_CIslandCollision_isValidPoly) @@ -680,7 +680,7 @@ bool CIslandCollision::isValidPoly(const NLMISC::CPolygon2D &poly) return true; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CIslandCollision::isValidSegment(const NLMISC::CVector2f start, const NLMISC::CVector2f end) { //H_AUTO(R2_CIslandCollision_isValidSegment) @@ -704,7 +704,7 @@ bool CIslandCollision::isValidSegment(const NLMISC::CVector2f start, const NLMIS return isValidPoly(extrudedSegment); } -//********************************************************************************************************* +// ********************************************************************************************************* void CIslandCollision::waterSurfaceAdded(const NLMISC::CPolygon2D &shape, const NLMISC::CMatrix &worldMatrix) { //H_AUTO(R2_CIslandCollision_waterSurfaceAdded) @@ -732,7 +732,7 @@ void CIslandCollision::waterSurfaceAdded(const NLMISC::CPolygon2D &shape, const _WaterSurfs.push_back(ws); } -//********************************************************************************************************* +// ********************************************************************************************************* bool CIslandCollision::isValidPos(const NLMISC::CVector2f &pos) { //H_AUTO(R2_CIslandCollision_isValidPos) diff --git a/code/ryzom/client/src/r2/lua_event_forwarder.cpp b/code/ryzom/client/src/r2/lua_event_forwarder.cpp index f9b6e4b6e..004ea9430 100644 --- a/code/ryzom/client/src/r2/lua_event_forwarder.cpp +++ b/code/ryzom/client/src/r2/lua_event_forwarder.cpp @@ -43,7 +43,7 @@ static CLuaString LuaStr_onTargetInstancePreHrcMove("onTargetInstancePreHrcMove" -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onActChanged() { //H_AUTO(R2_CLuaEventForwarder_onActChanged) @@ -51,7 +51,7 @@ void CLuaEventForwarder::onActChanged() executeHandler(LuaStr_onActChanged, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onContinentChanged() { //H_AUTO(R2_CLuaEventForwarder_onContinentChanged) @@ -59,7 +59,7 @@ void CLuaEventForwarder::onContinentChanged() executeHandler(LuaStr_onContinentChanged, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onCreate() { //H_AUTO(R2_CLuaEventForwarder_onCreate) @@ -67,7 +67,7 @@ void CLuaEventForwarder::onCreate() executeHandler(LuaStr_onCreate, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onPostCreate() { //H_AUTO(R2_CLuaEventForwarder_onPostCreate) @@ -75,7 +75,7 @@ void CLuaEventForwarder::onPostCreate() executeHandler(LuaStr_onPostCreate, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onErase() { //H_AUTO(R2_CLuaEventForwarder_onErase) @@ -83,7 +83,7 @@ void CLuaEventForwarder::onErase() executeHandler(LuaStr_onErase, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onPreHrcMove() { //H_AUTO(R2_CLuaEventForwarder_onPreHrcMove) @@ -91,7 +91,7 @@ void CLuaEventForwarder::onPreHrcMove() executeHandler(LuaStr_onPreHrcMove, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onPostHrcMove() { //H_AUTO(R2_CLuaEventForwarder_onPostHrcMove) @@ -99,7 +99,7 @@ void CLuaEventForwarder::onPostHrcMove() executeHandler(LuaStr_onPostHrcMove, 0); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onFocus(bool focused) { //H_AUTO(R2_CLuaEventForwarder_onFocus) @@ -109,7 +109,7 @@ void CLuaEventForwarder::onFocus(bool focused) executeHandler(LuaStr_onFocus, 1); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onSelect(bool selected) { //H_AUTO(R2_CLuaEventForwarder_onSelect) @@ -119,7 +119,7 @@ void CLuaEventForwarder::onSelect(bool selected) executeHandler(LuaStr_onSelect, 1); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onAttrModified(const std::string &attrName, sint32 index) { //H_AUTO(R2_CLuaEventForwarder_onAttrModified) @@ -130,7 +130,7 @@ void CLuaEventForwarder::onAttrModified(const std::string &attrName, sint32 inde executeHandler(LuaStr_onAttrModified, 2); } -//********************************************************************************************************* +// ********************************************************************************************************* /*void CDisplayerLua::onTableModified(const std::string &tableName, const std::string &keyInTable, sint32 indexInTable) { //H_AUTO(R2_CDisplayerLua_onTableModified) @@ -142,7 +142,7 @@ void CLuaEventForwarder::onAttrModified(const std::string &attrName, sint32 inde executeHandler("onTableModified", 3); }*/ -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onTargetInstanceCreated(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CLuaEventForwarder_onTargetInstanceCreated) @@ -153,7 +153,7 @@ void CLuaEventForwarder::onTargetInstanceCreated(const std::string &refMakerAttr executeHandler(LuaStr_onTargetInstanceCreated, 2); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onTargetInstanceErased(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CLuaEventForwarder_onTargetInstanceErased) @@ -164,7 +164,7 @@ void CLuaEventForwarder::onTargetInstanceErased(const std::string &refMakerAttr, executeHandler(LuaStr_onTargetInstanceErased, 2); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onTargetInstanceEraseRequested(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CLuaEventForwarder_onTargetInstanceEraseRequested) @@ -175,7 +175,7 @@ void CLuaEventForwarder::onTargetInstanceEraseRequested(const std::string &refMa executeHandler(LuaStr_onTargetInstanceEraseRequested, 2); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onTargetInstanceAttrModified(const std::string &refMakerAttr, sint32 refMakerAttrIndex, const std::string &targetAttrName, sint32 targetAttrIndex) { //H_AUTO(R2_CLuaEventForwarder_onTargetInstanceAttrModified) @@ -188,7 +188,7 @@ void CLuaEventForwarder::onTargetInstanceAttrModified(const std::string &refMake executeHandler(LuaStr_onTargetInstanceAttrModified, 4); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onTargetInstancePreHrcMove(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CLuaEventForwarder_onTargetInstancePreHrcMove) @@ -199,7 +199,7 @@ void CLuaEventForwarder::onTargetInstancePreHrcMove(const std::string &refMakerA executeHandler(LuaStr_onTargetInstancePreHrcMove, 2); } -//********************************************************************************************************* +// ********************************************************************************************************* void CLuaEventForwarder::onTargetInstancePostHrcMove(const std::string &refMakerAttr, sint32 refMakerAttrIndex) { //H_AUTO(R2_CLuaEventForwarder_onTargetInstancePostHrcMove) diff --git a/code/ryzom/client/src/r2/mesh_array.cpp b/code/ryzom/client/src/r2/mesh_array.cpp index 26a308509..c5f120bc3 100644 --- a/code/ryzom/client/src/r2/mesh_array.cpp +++ b/code/ryzom/client/src/r2/mesh_array.cpp @@ -29,19 +29,19 @@ namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* CMeshArray::CMeshArray() { _Active = true; } -//********************************************************************************************************* +// ********************************************************************************************************* CMeshArray::~CMeshArray() { clear(); } -//********************************************************************************************************* +// ********************************************************************************************************* void CMeshArray::setShapeName(const std::string &shapeName) { //H_AUTO(R2_CMeshArray_setShapeName) @@ -49,7 +49,7 @@ void CMeshArray::setShapeName(const std::string &shapeName) _ShapeName = shapeName; } -//********************************************************************************************************* +// ********************************************************************************************************* void CMeshArray::resize(uint newSize) { //H_AUTO(R2_CMeshArray_resize) @@ -80,7 +80,7 @@ void CMeshArray::resize(uint newSize) } } -//********************************************************************************************************* +// ********************************************************************************************************* UInstance &CMeshArray::getInstance(uint index) { //H_AUTO(R2_CMeshArray_getInstance) @@ -88,7 +88,7 @@ UInstance &CMeshArray::getInstance(uint index) return _MeshInstances[index]; } -//********************************************************************************************************* +// ********************************************************************************************************* const UInstance &CMeshArray::getInstance(uint index) const { //H_AUTO(R2_CMeshArray_getInstance) @@ -96,7 +96,7 @@ const UInstance &CMeshArray::getInstance(uint index) const return _MeshInstances[index]; } -//********************************************************************************************************* +// ********************************************************************************************************* void CMeshArray::setEmissive(NLMISC::CRGBA color) { //H_AUTO(R2_CMeshArray_setEmissive) @@ -106,7 +106,7 @@ void CMeshArray::setEmissive(NLMISC::CRGBA color) } } -//********************************************************************************************************* +// ********************************************************************************************************* void CMeshArray::setActive(bool active) { //H_AUTO(R2_CMeshArray_setActive) diff --git a/code/ryzom/client/src/r2/palette_node.cpp b/code/ryzom/client/src/r2/palette_node.cpp index 89f5c3001..8f0aa150a 100644 --- a/code/ryzom/client/src/r2/palette_node.cpp +++ b/code/ryzom/client/src/r2/palette_node.cpp @@ -23,7 +23,7 @@ namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* /* const CLuaObject CPaletteNode::getClass() const { diff --git a/code/ryzom/client/src/r2/prim_render.cpp b/code/ryzom/client/src/r2/prim_render.cpp index 4aecb95f5..ac05a1633 100644 --- a/code/ryzom/client/src/r2/prim_render.cpp +++ b/code/ryzom/client/src/r2/prim_render.cpp @@ -66,7 +66,7 @@ void readFromLua(const CLuaObject &table, const char *key, CRGBA &dest) #define READ_FROM_LUA(dest) readFromLua(params, #dest, dest); -//********************************************************* +// ********************************************************* void CVertexLook::init(const CLuaObject ¶ms) { //H_AUTO(R2_CVertexLook_init) @@ -79,7 +79,7 @@ void CVertexLook::init(const CLuaObject ¶ms) } -//********************************************************* +// ********************************************************* void CEdgeLook::init(const CLuaObject ¶ms) { //H_AUTO(R2_CEdgeLook_init) @@ -103,7 +103,7 @@ void CEdgeLook::init(const CLuaObject ¶ms) if (worldMapWrapMode < WrapModeCount) WorldMapWrapMode = (TWrapMode) worldMapWrapMode; } -//********************************************************* +// ********************************************************* bool operator ==(const CPrimLook &lhs, const CPrimLook &rhs) { return lhs.Shape == rhs.Shape && @@ -117,7 +117,7 @@ bool operator ==(const CPrimLook &lhs, const CPrimLook &rhs) } -//********************************************************* +// ********************************************************* void CPrimLook::init(const CLuaObject ¶ms) { //H_AUTO(R2_CPrimLook_init) @@ -148,7 +148,7 @@ void CPrimLook::init(const CLuaObject ¶ms) // } -//********************************************************* +// ********************************************************* void CPrimRender::setLook(const CPrimLook &look) { //H_AUTO(R2_CPrimRender_setLook) @@ -166,7 +166,7 @@ void CPrimRender::setLook(const CPrimLook &look) update(); } -//********************************************************* +// ********************************************************* CPrimRender::~CPrimRender() { if (_AddedToWorldMap) @@ -182,7 +182,7 @@ CPrimRender::~CPrimRender() } } -//********************************************************* +// ********************************************************* CCtrlPolygon *CPrimRender::newCtrlPolygon() const { //H_AUTO(R2_CPrimRender_newCtrlPolygon) @@ -200,14 +200,14 @@ CCtrlPolygon *CPrimRender::newCtrlPolygon() const return new CCtrlMapPolygon; } -//********************************************************* +// ********************************************************* CCtrlQuad *CPrimRender::newCtrlQuad(uint /* edgeIndex */) const { //H_AUTO(R2_CPrimRender_newCtrlQuad) return new CCtrlQuad; } -//********************************************************* +// ********************************************************* bool CPrimRender::contains(const NLMISC::CVector2f &pos) const { //H_AUTO(R2_CPrimRender_contains) @@ -222,7 +222,7 @@ bool CPrimRender::contains(const NLMISC::CVector2f &pos) const return false; } -//********************************************************* +// ********************************************************* sint CPrimRender::isOnEdge(const NLMISC::CVector2f &pos) const { //H_AUTO(R2_CPrimRender_isOnEdge) @@ -233,7 +233,7 @@ sint CPrimRender::isOnEdge(const NLMISC::CVector2f &pos) const return -1; } -//********************************************************* +// ********************************************************* CPrimRender::CPrimRender() { _Emissive = CRGBA::Black; @@ -244,14 +244,14 @@ CPrimRender::CPrimRender() _Active = true; } -//********************************************************* +// ********************************************************* void CPrimRender::clear() { //H_AUTO(R2_CPrimRender_clear) setVertices(std::vector()); } -//********************************************************* +// ********************************************************* void CPrimRender::setVertices(const std::vector &vertices) { //H_AUTO(R2_CPrimRender_setVertices) @@ -272,7 +272,7 @@ void CPrimRender::setVertices(const std::vector &vertices) update(); } -//********************************************************* +// ********************************************************* void CPrimRender::setVertices(const std::vector &vertices) { //H_AUTO(R2_CPrimRender_setVertices) @@ -284,7 +284,7 @@ void CPrimRender::setVertices(const std::vector &vertices) setVertices(vertices3D); } -//********************************************************* +// ********************************************************* void CPrimRender::setCustomWorldMapEdgeUVMatrix(bool on, const NLMISC::CMatrix &matrix) { //H_AUTO(R2_CPrimRender_setCustomWorldMapEdgeUVMatrix) @@ -294,7 +294,7 @@ void CPrimRender::setCustomWorldMapEdgeUVMatrix(bool on, const NLMISC::CMatrix & } } -//********************************************************* +// ********************************************************* void CPrimRender::setCustomDecalEdgeUVMatrix(bool on, const NLMISC::CMatrix &matrix) { //H_AUTO(R2_CPrimRender_setCustomDecalEdgeUVMatrix) @@ -304,7 +304,7 @@ void CPrimRender::setCustomDecalEdgeUVMatrix(bool on, const NLMISC::CMatrix &mat } } -//********************************************************* +// ********************************************************* void CPrimRender::setEmissive(NLMISC::CRGBA color) { //H_AUTO(R2_CPrimRender_setEmissive) @@ -312,7 +312,7 @@ void CPrimRender::setEmissive(NLMISC::CRGBA color) forceSetEmissive(color); } -//********************************************************* +// ********************************************************* void CPrimRender::forceSetEmissive(NLMISC::CRGBA emissive) { //H_AUTO(R2_CPrimRender_forceSetEmissive) @@ -329,7 +329,7 @@ void CPrimRender::forceSetEmissive(NLMISC::CRGBA emissive) } } -//********************************************************* +// ********************************************************* void CPrimRender::update() { //H_AUTO(R2_CPrimRender_update) @@ -428,7 +428,7 @@ void CPrimRender::update() } -//********************************************************* +// ********************************************************* void CPrimRender::updatePos() { //H_AUTO(R2_CPrimRender_updatePos) @@ -512,7 +512,7 @@ void CPrimRender::updatePos() } } -//********************************************************* +// ********************************************************* void CPrimRender::updateEdge(NL3D::UInstance edge,const NLMISC::CVector &start, const NLMISC::CVector &end) { //H_AUTO(R2_CPrimRender_updateEdge) @@ -529,7 +529,7 @@ void CPrimRender::updateEdge(NL3D::UInstance edge,const NLMISC::CVector &start, edge.show(); } -//********************************************************* +// ********************************************************* void CPrimRender::updateEdgeDecal(CDecal &edgeDecal, const NLMISC::CVector &start, const NLMISC::CVector &end, float distToStartVertex, float distToEndVertex) { //H_AUTO(R2_CPrimRender_updateEdgeDecal) @@ -567,7 +567,7 @@ void CPrimRender::updateEdgeDecal(CDecal &edgeDecal, const NLMISC::CVector &star edgeDecal.setTextureMatrix(uvMatrix); } -//********************************************************* +// ********************************************************* void CPrimRender::addDecalsToRenderList() { //H_AUTO(R2_CPrimRender_addDecalsToRenderList) @@ -582,7 +582,7 @@ void CPrimRender::addDecalsToRenderList() } } -//********************************************************* +// ********************************************************* void CPrimRender::setWorldMapNumVertices(uint count) { //H_AUTO(R2_CPrimRender_setWorldMapNumVertices) @@ -622,7 +622,7 @@ void CPrimRender::setWorldMapNumVertices(uint count) } } -//********************************************************* +// ********************************************************* void CPrimRender::setWorldMapNumEdges(uint count) { //H_AUTO(R2_CPrimRender_setWorldMapNumEdges) @@ -662,7 +662,7 @@ void CPrimRender::setWorldMapNumEdges(uint count) } } -//********************************************************* +// ********************************************************* void CPrimRender::updateWorldMapDisplay() { //H_AUTO(R2_CPrimRender_updateWorldMapDisplay) @@ -672,7 +672,7 @@ void CPrimRender::updateWorldMapDisplay() this->onUpdate(*gm); } -//********************************************************* +// ********************************************************* void CPrimRender::onAdd(CGroupMap &owner) { //H_AUTO(R2_CPrimRender_onAdd) @@ -689,7 +689,7 @@ void CPrimRender::onAdd(CGroupMap &owner) } } -//********************************************************* +// ********************************************************* void CPrimRender::onRemove(CGroupMap &owner) { //H_AUTO(R2_CPrimRender_onRemove) @@ -704,14 +704,14 @@ void CPrimRender::onRemove(CGroupMap &owner) _AddedToWorldMap = false; } -//********************************************************* +// ********************************************************* void CPrimRender::onPreRender(CGroupMap &/* owner */) { //H_AUTO(R2_CPrimRender_onPreRender) // no-op } -//********************************************************* +// ********************************************************* void CPrimRender::onUpdate(CGroupMap &worldMap) { //H_AUTO(R2_CPrimRender_onUpdate) @@ -828,7 +828,7 @@ void CPrimRender::onUpdate(CGroupMap &worldMap) } } -//********************************************************* +// ********************************************************* CViewBitmap *CPrimRender::getWorldMapVertexView(uint index) const { //H_AUTO(R2_CPrimRender_getWorldMapVertexView) @@ -836,14 +836,14 @@ CViewBitmap *CPrimRender::getWorldMapVertexView(uint index) const return _WorldMapVertices[index]; } -//********************************************************* +// ********************************************************* void CPrimRender::setWorldMapPolyColor(NLMISC::CRGBA color) { //H_AUTO(R2_CPrimRender_setWorldMapPolyColor) if (_WorldMapPoly) _WorldMapPoly->setColorRGBA(color); } -//********************************************************* +// ********************************************************* void CPrimRender::setActive(bool active) { //H_AUTO(R2_CPrimRender_setActive) diff --git a/code/ryzom/client/src/r2/prim_render.h b/code/ryzom/client/src/r2/prim_render.h index 2fbe2ca2a..025da5862 100644 --- a/code/ryzom/client/src/r2/prim_render.h +++ b/code/ryzom/client/src/r2/prim_render.h @@ -31,7 +31,7 @@ class CCtrlPolygon; namespace R2 { -//******************************************************************************* +// ******************************************************************************* class CVertexLook { public: @@ -65,7 +65,7 @@ inline bool operator == (const CVertexLook &lhs, const CVertexLook &rhs) inline bool operator != (const CVertexLook &lhs, const CVertexLook &rhs) { return !(lhs == rhs); } -//******************************************************************************* +// ******************************************************************************* class CEdgeLook { public: @@ -132,7 +132,7 @@ inline bool operator==(const CEdgeLook &lhs, const CEdgeLook &rhs) inline bool operator!=(const CEdgeLook &lhs, const CEdgeLook &rhs) { return !(lhs == rhs); } -//******************************************************************************* +// ******************************************************************************* // look of a primitive class CPrimLook { diff --git a/code/ryzom/client/src/r2/tool.cpp b/code/ryzom/client/src/r2/tool.cpp index a0e97539b..65887db73 100644 --- a/code/ryzom/client/src/r2/tool.cpp +++ b/code/ryzom/client/src/r2/tool.cpp @@ -68,7 +68,7 @@ static const CVector cardinals[] = CVector(1.f, -1.f, 0.f).normed() }; -//*************************************************************** +// *************************************************************** CTool::CTool() { _DoubleClickStartTime = -1; @@ -80,7 +80,7 @@ CTool::CTool() } -//*************************************************************** +// *************************************************************** void CTool::startDoubleClickCheck() { //H_AUTO(R2_CTool_startDoubleClickCheck) @@ -88,7 +88,7 @@ void CTool::startDoubleClickCheck() getMousePos(_DoubleClickX, _DoubleClickY); } -//*************************************************************** +// *************************************************************** bool CTool::checkDoubleClick() { //H_AUTO(R2_CTool_checkDoubleClick) @@ -101,7 +101,7 @@ bool CTool::checkDoubleClick() return abs(mx - _DoubleClickX) <= moveThrehsold && abs(my - _DoubleClickY) <= moveThrehsold; } -//*************************************************************** +// *************************************************************** bool CTool::isShiftDown() { //H_AUTO(R2_CTool_isShiftDown) @@ -110,7 +110,7 @@ bool CTool::isShiftDown() Driver->AsyncListener.isKeyDown(KeyRSHIFT); } -//*************************************************************** +// *************************************************************** bool CTool::isCtrlDown() { //H_AUTO(R2_CTool_isCtrlDown) @@ -119,21 +119,21 @@ bool CTool::isCtrlDown() Driver->AsyncListener.isKeyDown(KeyRCONTROL); } -//*************************************************************** +// *************************************************************** CInterfaceManager &CTool::getUI() { //H_AUTO(R2_CTool_getUI) return CEditor::getUI(); } -//*************************************************************** +// *************************************************************** void CTool::getScreenSize(uint32 &scrW, uint32 &scrH) { //H_AUTO(R2_CTool_getScreenSize) getUI().getViewRenderer().getScreenSize(scrW, scrH); } -//*************************************************************** +// *************************************************************** uint32 CTool::getScreenWidth() { //H_AUTO(R2_CTool_getScreenWidth) @@ -142,7 +142,7 @@ uint32 CTool::getScreenWidth() return scrW; } -//*************************************************************** +// *************************************************************** uint32 CTool::getScreenHeight() { //H_AUTO(R2_CTool_getScreenHeight) @@ -151,7 +151,7 @@ uint32 CTool::getScreenHeight() return scrH; } -//*************************************************************** +// *************************************************************** void CTool::getMousePos(sint32 &x, sint32 &y) { //H_AUTO(R2_CTool_getMousePos) @@ -164,7 +164,7 @@ void CTool::getMousePos(sint32 &x, sint32 &y) cursor->getPointerPos(x, y); } -//*************************************************************** +// *************************************************************** sint32 CTool::getMouseX() { //H_AUTO(R2_CTool_getMouseX) @@ -173,7 +173,7 @@ sint32 CTool::getMouseX() return x; } -//*************************************************************** +// *************************************************************** sint32 CTool::getMouseY() { //H_AUTO(R2_CTool_getMouseY) @@ -182,7 +182,7 @@ sint32 CTool::getMouseY() return y; } -//*************************************************************** +// *************************************************************** bool CTool::isMouseOnUI() { //H_AUTO(R2_CTool_isMouseOnUI) @@ -190,7 +190,7 @@ bool CTool::isMouseOnUI() } -//*************************************************************** +// *************************************************************** CGroupMap *CTool::getWorldMap() { //H_AUTO(R2_CTool_getWorldMap) @@ -203,7 +203,7 @@ CGroupMap *CTool::getWorldMap() return mapPtr; } -//*************************************************************** +// *************************************************************** CGroupMap *CTool::isMouseOnWorldMap() { //H_AUTO(R2_CTool_isMouseOnWorldMap) @@ -217,7 +217,7 @@ CGroupMap *CTool::isMouseOnWorldMap() return NULL; } -//*************************************************************** +// *************************************************************** CGroupContainer *CTool::isMouseOnContainer() { //H_AUTO(R2_CTool_isMouseOnContainer) @@ -231,7 +231,7 @@ CGroupContainer *CTool::isMouseOnContainer() return NULL; } -//*************************************************************** +// *************************************************************** void CTool::computeWorldViewRay(sint32 posX, sint32 posY, CWorldViewRay &dest) { //H_AUTO(R2_CTool_computeWorldViewRay) @@ -288,7 +288,7 @@ void CTool::computeWorldViewRay(sint32 posX, sint32 posY, CWorldViewRay &dest) dest.Origin += distBias * dest.Dir; } -//*************************************************************** +// *************************************************************** bool CTool::isInScreen(sint32 x, sint32 y) { //H_AUTO(R2_CTool_isInScreen) @@ -297,7 +297,7 @@ bool CTool::isInScreen(sint32 x, sint32 y) return x >= 0 && y >=0 && x < (sint32) scrW && y < (sint32) scrH; } -//*************************************************************** +// *************************************************************** CTool::TRayIntersectionType CTool::getPacsType(const NLMISC::CVector &pos, float threshold, NLPACS::UGlobalPosition &destPos) { //H_AUTO(R2_CTool_getPacsType) @@ -319,7 +319,7 @@ CTool::TRayIntersectionType CTool::getPacsType(const NLMISC::CVector &pos, float } } -//*************************************************************** +// *************************************************************** bool CTool::raytrace(const NLMISC::CVector &segmentStart, const NLMISC::CVector &dir, NLMISC::CVector &inter) { //H_AUTO(R2_CTool_raytrace) @@ -353,7 +353,7 @@ bool CTool::raytrace(const NLMISC::CVector &segmentStart, const NLMISC::CVector return false; } -//*************************************************************** +// *************************************************************** CTool::TRayIntersectionType CTool::computeWorldMapIntersection(float x, float y, NLMISC::CVector &inter) { //H_AUTO(R2_CTool_computeWorldMapIntersection) @@ -395,7 +395,7 @@ CTool::TRayIntersectionType CTool::computeWorldMapIntersection(float x, float y, return interType; } -//*************************************************************** +// *************************************************************** inline bool CTool::isIslandValidPos(const CArray2D &heightMap, const CScenarioEntryPoints::CCompleteIsland &islandDesc, float x, float y) { //H_AUTO(R2_CTool_isIslandValidPos) @@ -431,7 +431,7 @@ static bool areaRaytrace(CPackedWorld &pw, const CVector &start, const CVector & return false; } -//*************************************************************** +// *************************************************************** bool CTool::computeNearestValidSurfaceFromHeightMap(float x, float y, NLMISC::CVector &inter) { //H_AUTO(R2_CTool_computeNearestValidSurfaceFromHeightMap) @@ -488,14 +488,14 @@ bool CTool::computeNearestValidSurfaceFromHeightMap(float x, float y, NLMISC::CV return true; } -//*************************************************************** +// *************************************************************** bool CTool::isValid2DPos(const NLMISC::CVector2f &pos) { //H_AUTO(R2_CTool_isValid2DPos) return getEditor().getIslandCollision().isValidPos(CVector2f(pos.x, pos.y)); } -//*************************************************************** +// *************************************************************** CTool::TRayIntersectionType CTool::computeLandscapeRayIntersection(const CWorldViewRay &worldViewRay, NLMISC::CVector &inter) { //H_AUTO(R2_CTool_computeLandscapeRayIntersection) @@ -545,7 +545,7 @@ CTool::TRayIntersectionType CTool::computeLandscapeRayIntersection(const CWorldV } } -//********************************************** +// ********************************************** void CTool::handleMouseOverPlayer(bool over) { //H_AUTO(R2_CTool_handleMouseOverPlayer) @@ -563,7 +563,7 @@ void CTool::handleMouseOverPlayer(bool over) UserEntity->makeTransparent(false); } -//*************************************************************** +// *************************************************************** CInstance *CTool::checkInstanceUnderMouse(IDisplayerUIHandle **miniMapHandle /*= NULL*/) { //H_AUTO(R2_CTool_checkInstanceUnderMouse) @@ -658,7 +658,7 @@ CInstance *CTool::checkInstanceUnderMouse(IDisplayerUIHandle **miniMapHandle /*= } -//*************************************************************** +// *************************************************************** void CTool::handleMouseOverInstance(const char *cursorDefault, const char *cursorOverUnselectedInstance, const char *cursorOverSelectedInstance) { //H_AUTO(R2_CTool_handleMouseOverInstance) @@ -682,7 +682,7 @@ void CTool::handleMouseOverInstance(const char *cursorDefault, const char *curso } } -//*************************************************************** +// *************************************************************** bool CTool::onMouseRightButtonClicked() { //H_AUTO(R2_CTool_onMouseRightButtonClicked) @@ -696,7 +696,7 @@ bool CTool::onMouseRightButtonClicked() return true; } -//*************************************************************** +// *************************************************************** bool CTool::defaultRightButtonDownHandling() { //H_AUTO(R2_CTool_defaultRightButtonDownHandling) @@ -712,7 +712,7 @@ bool CTool::defaultRightButtonDownHandling() return false; } -//*************************************************************** +// *************************************************************** void CTool::captureMouse() { //H_AUTO(R2_CTool_captureMouse) @@ -730,7 +730,7 @@ void CTool::captureMouse() _MouseCaptured = true; } -//*************************************************************** +// *************************************************************** void CTool::releaseMouse() { //H_AUTO(R2_CTool_releaseMouse) @@ -741,14 +741,14 @@ void CTool::releaseMouse() _MouseCaptured = false; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CTool::isMouseCaptured() { //H_AUTO(R2_CTool_isMouseCaptured) return _MouseCaptured; } -//********************************************************************************************************* +// ********************************************************************************************************* void CTool::setMouseCursor(const char *cursorTexture) { //H_AUTO(R2_CTool_setMouseCursor) @@ -759,7 +759,7 @@ void CTool::setMouseCursor(const char *cursorTexture) } } -//*************************************************************** +// *************************************************************** bool CTool::handleEvent(const CEventDescriptor &event) { //H_AUTO(R2_CTool_handleEvent) @@ -805,14 +805,14 @@ bool CTool::handleEvent(const CEventDescriptor &event) return handled; } -//*************************************************************** +// *************************************************************** CDynamicMapClient &CTool::getDMC() { //H_AUTO(R2_CTool_getDMC) return getEditor().getDMC(); } -//*************************************************************** +// *************************************************************** void CTool::handleWorldMapAutoPan(sint32 &outDx, sint32 &outDy) { //H_AUTO(R2_CTool_handleWorldMapAutoPan) @@ -866,7 +866,7 @@ void CTool::handleWorldMapAutoPan(sint32 &outDx, sint32 &outDy) return; } -//*************************************************************** +// *************************************************************** int CTool::luaIsPickTool(CLuaState &ls) { //H_AUTO(R2_CTool_luaIsPickTool) @@ -875,7 +875,7 @@ int CTool::luaIsPickTool(CLuaState &ls) return 1; } -//*************************************************************** +// *************************************************************** void CTool::setContextHelp(const ucstring &contextHelp) { //H_AUTO(R2_CTool_setContextHelp) @@ -886,7 +886,7 @@ void CTool::setContextHelp(const ucstring &contextHelp) getEditor().callEnvMethod("setToolContextHelp", 1, 0); } -//*************************************************************** +// *************************************************************** NLMISC::CRGBA CTool::getInvalidPosColor() { //H_AUTO(R2_CTool_getInvalidPosColor) diff --git a/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp b/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp index 467cb60f7..e7c3a60c1 100644 --- a/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp +++ b/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp @@ -27,7 +27,7 @@ using namespace NLMISC; namespace R2 { -//*************************************************************** +// *************************************************************** CToolChoosePosLua::CToolChoosePosLua(uint ghostSlot, const CLuaObject &validFunc, const CLuaObject &cancelFunc, @@ -51,7 +51,7 @@ CToolChoosePosLua::CToolChoosePosLua(uint ghostSlot, _Commited = false; } -//*************************************************************** +// *************************************************************** void CToolChoosePosLua::commit(const NLMISC::CVector &createPosition, float /* createAngle */) { //H_AUTO(R2_CToolChoosePosLua_commit) @@ -67,7 +67,7 @@ void CToolChoosePosLua::commit(const NLMISC::CVector &createPosition, float /* c _Commited = true; } -//********************************************************************************************************* +// ********************************************************************************************************* void CToolChoosePosLua::cancel() { //H_AUTO(R2_CToolChoosePosLua_cancel) diff --git a/code/ryzom/client/src/r2/tool_create_entity.cpp b/code/ryzom/client/src/r2/tool_create_entity.cpp index d1a4b73cd..9633d242e 100644 --- a/code/ryzom/client/src/r2/tool_create_entity.cpp +++ b/code/ryzom/client/src/r2/tool_create_entity.cpp @@ -48,20 +48,20 @@ using namespace std; namespace R2 { -//*************************************************************** +// *************************************************************** CToolCreateEntity::~CToolCreateEntity() { clearArray(); } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::cancel() { CToolChoosePos::cancel(); clearArray(); } -//*************************************************************** +// *************************************************************** CToolCreateEntity::CToolCreateEntity(uint ghostSlot, const std::string &paletteId, bool arrayMode) : CToolChoosePos(ghostSlot) { _PaletteId = paletteId; @@ -88,7 +88,7 @@ CToolCreateEntity::CToolCreateEntity(uint ghostSlot, const std::string &paletteI _ArrayWantedAction = ArrayActionNone; } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::updateInvalidCursorOnUI() { //H_AUTO(R2_CToolCreateEntity_updateInvalidCursorOnUI) @@ -105,7 +105,7 @@ void CToolCreateEntity::updateInvalidCursorOnUI() setMouseCursor(DEFAULT_CURSOR); } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::commit(const NLMISC::CVector &createPosition, float createAngle) { //H_AUTO(R2_CToolCreateEntity_commit) @@ -145,7 +145,7 @@ void CToolCreateEntity::commit(const NLMISC::CVector &createPosition, float crea } } -//*************************************************************** +// *************************************************************** bool CToolCreateEntity::isBotObjectSheet(const NLMISC::CSheetId &sheetId) const { //H_AUTO(R2_CToolCreateEntity_isBotObjectSheet) @@ -159,7 +159,7 @@ bool CToolCreateEntity::isBotObjectSheet(const NLMISC::CSheetId &sheetId) const } -//*************************************************************** +// *************************************************************** std::string CToolCreateEntity::cloneEntityIntoScenario(CEntityCL *clonee, const NLMISC::CVector &createPosition, float createAngle, @@ -537,14 +537,14 @@ std::string CToolCreateEntity::cloneEntityIntoScenario(CEntityCL *clonee, return instanceId; } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::onActivate() { //H_AUTO(R2_CToolCreateEntity_onActivate) setContextHelp(CI18N::get("uiR2EDToolCreateEntity")); } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::updateBeforeRender() { //H_AUTO(R2_CToolCreateEntity_updateBeforeRender) @@ -599,7 +599,7 @@ void CToolCreateEntity::updateBeforeRender() setMouseCursor(_ValidArray ? _CursValid.c_str() : _CursInvalid.c_str()); } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::updateAfterRender() { //H_AUTO(R2_CToolCreateEntity_updateAfterRender) @@ -633,7 +633,7 @@ void CToolCreateEntity::updateAfterRender() } -//*************************************************************** +// *************************************************************** bool CToolCreateEntity::onMouseLeftButtonClicked() { //H_AUTO(R2_CToolCreateEntity_onMouseLeftButtonClicked) @@ -648,7 +648,7 @@ bool CToolCreateEntity::onMouseLeftButtonClicked() return true; } -//*************************************************************** +// *************************************************************** bool CToolCreateEntity::onMouseRightButtonClicked() { //H_AUTO(R2_CToolCreateEntity_onMouseRightButtonClicked) @@ -660,7 +660,7 @@ bool CToolCreateEntity::onMouseRightButtonClicked() return true; } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::clearArray() { //H_AUTO(R2_CToolCreateEntity_clearArray) @@ -673,7 +673,7 @@ void CToolCreateEntity::clearArray() } } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::updateArray(CEntityCL *clonee) { //H_AUTO(R2_CToolCreateEntity_updateArray) @@ -784,7 +784,7 @@ void CToolCreateEntity::updateArray(CEntityCL *clonee) } } -//*************************************************************** +// *************************************************************** void CToolCreateEntity::commitArray() { //H_AUTO(R2_CToolCreateEntity_commitArray) @@ -803,7 +803,7 @@ void CToolCreateEntity::commitArray() getEditor().getDMC().flushActions(); } -//*************************************************************** +// *************************************************************** bool CToolCreateEntity::stopAfterCommit() const { //H_AUTO(R2_CToolCreateEntity_stopAfterCommit) @@ -812,7 +812,7 @@ bool CToolCreateEntity::stopAfterCommit() const -//*************************************************************** +// *************************************************************** class CAHR2EDToggleDrawArray : public IActionHandler { virtual void execute(CCtrlBase *pCaller, const std::string &/* sParams */) diff --git a/code/ryzom/client/src/r2/tool_draw_prim.cpp b/code/ryzom/client/src/r2/tool_draw_prim.cpp index e2eac61ba..981d942af 100644 --- a/code/ryzom/client/src/r2/tool_draw_prim.cpp +++ b/code/ryzom/client/src/r2/tool_draw_prim.cpp @@ -41,7 +41,7 @@ namespace R2 { -//*************************************************************** +// *************************************************************** CToolDrawPrim::CToolDrawPrim(TPrimType primType, CInstance *extending /*= NULL*/) { _NumPoints = 0; @@ -60,14 +60,14 @@ CToolDrawPrim::CToolDrawPrim(TPrimType primType, CInstance *extending /*= NULL*/ } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::canTerminate() const { //H_AUTO(R2_CToolDrawPrim_canTerminate) return ((_PrimType == Road && _NumPoints >= 1) || _NumPoints >= 3) && _ValidPrim; } -//*************************************************************** +// *************************************************************** const char *CToolDrawPrim::getToolUIName() const { //H_AUTO(R2_CToolDrawPrim_getToolUIName) @@ -75,7 +75,7 @@ const char *CToolDrawPrim::getToolUIName() const } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::init(const CLuaObject ¶meters) { //H_AUTO(R2_CToolDrawPrim_init) @@ -163,13 +163,13 @@ bool CToolDrawPrim::init(const CLuaObject ¶meters) return true; } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::updateAfterRender() { //H_AUTO(R2_CToolDrawPrim_updateAfterRender) } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::removeFromWorldMap() { //H_AUTO(R2_CToolDrawPrim_removeFromWorldMap) @@ -187,7 +187,7 @@ void CToolDrawPrim::removeFromWorldMap() } } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::cancel() { //H_AUTO(R2_CToolDrawPrim_cancel) @@ -209,7 +209,7 @@ void CToolDrawPrim::cancel() } } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::setPrimLook(bool closed, bool lastEdgeIsValid, bool valid) { //H_AUTO(R2_CToolDrawPrim_setPrimLook) @@ -221,7 +221,7 @@ void CToolDrawPrim::setPrimLook(bool closed, bool lastEdgeIsValid, bool valid) _Prim.setLook(*look); } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::updateBeforeRender() { //H_AUTO(R2_CToolDrawPrim_updateBeforeRender) @@ -233,7 +233,7 @@ void CToolDrawPrim::updateBeforeRender() } } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::doUpdateBeforeRender() { //H_AUTO(R2_CToolDrawPrim_doUpdateBeforeRender) @@ -418,7 +418,7 @@ void CToolDrawPrim::doUpdateBeforeRender() } } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::updateInaccessiblePrimRenderLook(CPrimRender &dest) { //H_AUTO(R2_CToolDrawPrim_updateInaccessiblePrimRenderLook) @@ -435,7 +435,7 @@ void CToolDrawPrim::updateInaccessiblePrimRenderLook(CPrimRender &dest) dest.setCustomDecalEdgeUVMatrix(true, getEditor().getIslandCollision().getWorldToAccessibilityTexMat(true)); // cropped version for decal rendering } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::onMouseLeftButtonClicked() { //H_AUTO(R2_CToolDrawPrim_onMouseLeftButtonClicked) @@ -455,7 +455,7 @@ bool CToolDrawPrim::onMouseLeftButtonClicked() return true; } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::onMouseLeftButtonDown() { //H_AUTO(R2_CToolDrawPrim_onMouseLeftButtonDown) @@ -480,7 +480,7 @@ bool CToolDrawPrim::onMouseLeftButtonDown() } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::commit() { //H_AUTO(R2_CToolDrawPrim_commit) @@ -626,7 +626,7 @@ void CToolDrawPrim::commit() } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::onMouseRightButtonClicked() { //H_AUTO(R2_CToolDrawPrim_onMouseRightButtonClicked) @@ -653,7 +653,7 @@ bool CToolDrawPrim::onMouseRightButtonClicked() //return true; } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::onDeleteCmd() { //H_AUTO(R2_CToolDrawPrim_onDeleteCmd) @@ -679,7 +679,7 @@ bool CToolDrawPrim::onDeleteCmd() } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::isValidPolyShape(bool ignoreLast, std::list &splitPoly) const { //H_AUTO(R2_CToolDrawPrim_isValidPolyShape) @@ -711,7 +711,7 @@ bool CToolDrawPrim::isValidPolyShape(bool ignoreLast, std::list &split return validPrim; } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::testAccessibleEdges(bool ignoreLast) { //H_AUTO(R2_CToolDrawPrim_testAccessibleEdges) @@ -734,7 +734,7 @@ bool CToolDrawPrim::testAccessibleEdges(bool ignoreLast) return true; } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::updateValidityFlag(bool ignoreLast) { //H_AUTO(R2_CToolDrawPrim_updateValidityFlag) @@ -789,7 +789,7 @@ void CToolDrawPrim::updateValidityFlag(bool ignoreLast) } }*/ -//*************************************************************** +// *************************************************************** void CToolDrawPrim::onActivate() { //H_AUTO(R2_CToolDrawPrim_onActivate) @@ -819,14 +819,14 @@ void CToolDrawPrim::onActivate() } } -//*************************************************************** +// *************************************************************** bool CToolDrawPrim::checkRoomLeft() { //H_AUTO(R2_CToolDrawPrim_checkRoomLeft) return _NumPoints < PrimMaxNumPoints; } -//*************************************************************** +// *************************************************************** void CToolDrawPrim::displayNoMoreRoomLeftMsg() { //H_AUTO(R2_CToolDrawPrim_displayNoMoreRoomLeftMsg) diff --git a/code/ryzom/client/src/r2/tool_draw_road.cpp b/code/ryzom/client/src/r2/tool_draw_road.cpp index 63c8769ae..ff799a680 100644 --- a/code/ryzom/client/src/r2/tool_draw_road.cpp +++ b/code/ryzom/client/src/r2/tool_draw_road.cpp @@ -30,14 +30,14 @@ using namespace NLMISC; namespace R2 { -//*************************************************************** +// *************************************************************** CToolDrawRoad::CToolDrawRoad() { _NumWayPoints = 0; _ValidPos = false; } -//*************************************************************** +// *************************************************************** void CToolDrawRoad::updateAfterRender() { } @@ -48,7 +48,7 @@ void CToolDrawRoad::cancel() } -//*************************************************************** +// *************************************************************** void CToolDrawRoad::updateBeforeRender() { // Build vector for direction pointed by mouse in world @@ -107,7 +107,7 @@ void CToolDrawRoad::updateBeforeRender() } } -//*************************************************************** +// *************************************************************** bool CToolDrawRoad::onMouseLeftButtonClicked() { if (_ValidPos) @@ -118,7 +118,7 @@ bool CToolDrawRoad::onMouseLeftButtonClicked() return true; } -//*************************************************************** +// *************************************************************** bool CToolDrawRoad::onMouseLeftButtonDown() { if (!checkDoubleClick()) return false; @@ -168,7 +168,7 @@ bool CToolDrawRoad::onMouseLeftButtonDown() } -//*************************************************************** +// *************************************************************** bool CToolDrawRoad::onMouseRightButtonClicked() { // cancel the drawing diff --git a/code/ryzom/client/src/r2/tool_maintained_action.cpp b/code/ryzom/client/src/r2/tool_maintained_action.cpp index df28ea12d..4f8001d86 100644 --- a/code/ryzom/client/src/r2/tool_maintained_action.cpp +++ b/code/ryzom/client/src/r2/tool_maintained_action.cpp @@ -23,7 +23,7 @@ namespace R2 { -//*************************************************************** +// *************************************************************** CToolMaintainedAction::CToolMaintainedAction() { _State = Idle; @@ -33,13 +33,13 @@ CToolMaintainedAction::CToolMaintainedAction() _LostFocusRecover = false; } -//*************************************************************** +// *************************************************************** CToolMaintainedAction::~CToolMaintainedAction() { // getEditor().setFocusedInstance(NULL); } -//*************************************************************** +// *************************************************************** void CToolMaintainedAction::cancel() { //H_AUTO(R2_CToolMaintainedAction_cancel) @@ -55,7 +55,7 @@ void CToolMaintainedAction::cancel() } -//*************************************************************** +// *************************************************************** bool CToolMaintainedAction::onMouseLeftButtonDown() { //H_AUTO(R2_CToolMaintainedAction_onMouseLeftButtonDown) @@ -86,7 +86,7 @@ bool CToolMaintainedAction::onMouseLeftButtonDown() return true; } -//*************************************************************** +// *************************************************************** bool CToolMaintainedAction::onMouseLeftButtonUp() { //H_AUTO(R2_CToolMaintainedAction_onMouseLeftButtonUp) @@ -124,7 +124,7 @@ bool CToolMaintainedAction::onMouseLeftButtonUp() return true; } -//*************************************************************** +// *************************************************************** bool CToolMaintainedAction::onMouseRightButtonDown() { //H_AUTO(R2_CToolMaintainedAction_onMouseRightButtonDown) @@ -149,7 +149,7 @@ bool CToolMaintainedAction::onMouseRightButtonDown() return true; } -//*************************************************************** +// *************************************************************** bool CToolMaintainedAction::onMouseRightButtonUp() { //H_AUTO(R2_CToolMaintainedAction_onMouseRightButtonUp) @@ -166,7 +166,7 @@ bool CToolMaintainedAction::onMouseRightButtonUp() return false; } -//*************************************************************** +// *************************************************************** bool CToolMaintainedAction::onMouseLeftButtonClicked() { //H_AUTO(R2_CToolMaintainedAction_onMouseLeftButtonClicked) @@ -190,21 +190,21 @@ bool CToolMaintainedAction::onMouseLeftButtonClicked() return true; } -//*************************************************************** +// *************************************************************** const char *CToolMaintainedAction::getDefaultCursor() const { //H_AUTO(R2_CToolMaintainedAction_getDefaultCursor) return DEFAULT_CURSOR; } -//*************************************************************** +// *************************************************************** const char *CToolMaintainedAction::getPickCursor() const { //H_AUTO(R2_CToolMaintainedAction_getPickCursor) return "curs_pick.tga"; } -//*************************************************************** +// *************************************************************** void CToolMaintainedAction::updateBeforeRender() { //H_AUTO(R2_CToolMaintainedAction_updateBeforeRender) @@ -212,7 +212,7 @@ void CToolMaintainedAction::updateBeforeRender() } -//*************************************************************** +// *************************************************************** void CToolMaintainedAction::onFocusGained() { if (_State == Idle) @@ -222,7 +222,7 @@ void CToolMaintainedAction::onFocusGained() } } -//*************************************************************** +// *************************************************************** bool CToolMaintainedAction::onMouseMove() { if (_LostFocusRecover) @@ -240,7 +240,7 @@ bool CToolMaintainedAction::onMouseMove() return false; } -//*************************************************************** +// *************************************************************** void CToolMaintainedAction::updateFocusedInstance() { //handleMouseOverInstance(DEFAULT_CURSOR, , getCursorForPossibleAction()); @@ -280,7 +280,7 @@ void CToolMaintainedAction::updateFocusedInstance() } } -//*************************************************************** +// *************************************************************** void CToolMaintainedAction::updateAfterRender() { //H_AUTO(R2_CToolMaintainedAction_updateAfterRender) @@ -306,7 +306,7 @@ void CToolMaintainedAction::updateAfterRender() } } -//*************************************************************** +// *************************************************************** bool CToolMaintainedAction::getPreviousToolClickEndFlag(bool clear /*=true*/) { //H_AUTO(R2_CToolMaintainedAction_getPreviousToolClickEndFlag) diff --git a/code/ryzom/client/src/r2/tool_new_vertex.cpp b/code/ryzom/client/src/r2/tool_new_vertex.cpp index 2ba20a61e..68674b843 100644 --- a/code/ryzom/client/src/r2/tool_new_vertex.cpp +++ b/code/ryzom/client/src/r2/tool_new_vertex.cpp @@ -29,13 +29,13 @@ namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* CToolNewVertex::CToolNewVertex() : CToolChoosePos(-1, "curs_create.tga", "curs_create_vertex_invalid.tga"), _CurrEdge(-1), _CurrPos(CVector::Null) { lockMultiPos(); } -//********************************************************************************************************* +// ********************************************************************************************************* bool CToolNewVertex::isValidChoosePos(const CVector2f &pos) const { //H_AUTO(R2_CToolNewVertex_isValidChoosePos) @@ -65,7 +65,7 @@ bool CToolNewVertex::isValidChoosePos(const CVector2f &pos) const return _CurrEdge != -1; } -//********************************************************************************************************* +// ********************************************************************************************************* void CToolNewVertex::commit(const NLMISC::CVector &createPosition, float /* createAngle */) { //H_AUTO(R2_CToolNewVertex_commit) @@ -96,14 +96,14 @@ void CToolNewVertex::commit(const NLMISC::CVector &createPosition, float /* crea delete wp; } -//********************************************************************************************************* +// ********************************************************************************************************* const char *CToolNewVertex::getToolUIName() const { //H_AUTO(R2_CToolNewVertex_getToolUIName) return "new_vertex"; } -//********************************************************************************************************* +// ********************************************************************************************************* bool CToolNewVertex::onDeleteCmd() { //H_AUTO(R2_CToolNewVertex_onDeleteCmd) diff --git a/code/ryzom/client/src/r2/tool_pick.cpp b/code/ryzom/client/src/r2/tool_pick.cpp index 1030aeb08..3f81fc672 100644 --- a/code/ryzom/client/src/r2/tool_pick.cpp +++ b/code/ryzom/client/src/r2/tool_pick.cpp @@ -27,7 +27,7 @@ using namespace NLMISC; namespace R2 { -//********************************************** +// ********************************************** CToolPick::CToolPick(const std::string &cursCanPickInstance, const std::string &cursCannotPickInstance, const std::string &cursCanPickPos, @@ -43,7 +43,7 @@ CToolPick::CToolPick(const std::string &cursCanPickInstance, _WantMouseUp = wantMouseUp; } -//********************************************** +// ********************************************** void CToolPick::setIgnoreInstances(const std::string & ignoreInstances) { //H_AUTO(R2_CToolPick_setIgnoreInstances) @@ -81,7 +81,7 @@ void CToolPick::setIgnoreInstances(const std::string & ignoreInstances) } } -//********************************************** +// ********************************************** void CToolPick::updateAfterRender() { //H_AUTO(R2_CToolPick_updateAfterRender) @@ -138,7 +138,7 @@ void CToolPick::updateAfterRender() } } -//********************************************** +// ********************************************** bool CToolPick::onMouseRightButtonClicked() { //H_AUTO(R2_CToolPick_onMouseRightButtonClicked) @@ -147,7 +147,7 @@ bool CToolPick::onMouseRightButtonClicked() return true; } -//********************************************** +// ********************************************** bool CToolPick::validate() { //H_AUTO(R2_CToolPick_validate) @@ -166,7 +166,7 @@ bool CToolPick::validate() return true; } -//********************************************** +// ********************************************** bool CToolPick::onMouseLeftButtonDown() { //H_AUTO(R2_CToolPick_onMouseLeftButtonDown) @@ -174,7 +174,7 @@ bool CToolPick::onMouseLeftButtonDown() return validate(); } -//********************************************** +// ********************************************** bool CToolPick::onMouseLeftButtonClicked() { //H_AUTO(R2_CToolPick_onMouseLeftButtonClicked) @@ -182,7 +182,7 @@ bool CToolPick::onMouseLeftButtonClicked() return validate(); } -//********************************************** +// ********************************************** int CToolPick::luaPick(CLuaState &ls) { //H_AUTO(R2_CToolPick_luaPick) @@ -191,7 +191,7 @@ int CToolPick::luaPick(CLuaState &ls) return 0; } -//********************************************** +// ********************************************** int CToolPick::luaCanPick(CLuaState &ls) { //H_AUTO(R2_CToolPick_luaCanPick) diff --git a/code/ryzom/client/src/r2/tool_select_move.cpp b/code/ryzom/client/src/r2/tool_select_move.cpp index fbb8bcae7..1ad9fd797 100644 --- a/code/ryzom/client/src/r2/tool_select_move.cpp +++ b/code/ryzom/client/src/r2/tool_select_move.cpp @@ -38,7 +38,7 @@ using namespace NLMISC; namespace R2 { -//*************************************************************** +// *************************************************************** CToolSelectMove::CToolSelectMove() { _MouseX = -1; @@ -57,7 +57,7 @@ CToolSelectMove::CToolSelectMove() } -//*************************************************************** +// *************************************************************** bool CToolSelectMove::checkAdditionnalRoomLeftFor(CInstance &instance) { //H_AUTO(R2_CToolSelectMove_checkAdditionnalRoomLeftFor) @@ -86,7 +86,7 @@ bool CToolSelectMove::checkAdditionnalRoomLeftFor(CInstance &instance) } -//*************************************************************** +// *************************************************************** CInstance *CToolSelectMove::createGhost(CInstance &instance) { //H_AUTO(R2_CToolSelectMove_createGhost) @@ -139,7 +139,7 @@ CInstance *CToolSelectMove::createGhost(CInstance &instance) return NULL; } -//*************************************************************** +// *************************************************************** void CToolSelectMove::beginAction(CInstance &instance) { _DeltaAnchor.set(0, 0, 0); @@ -265,7 +265,7 @@ void CToolSelectMove::beginAction(CInstance &instance) dv->setMoveInProgress(true); } -//*************************************************************** +// *************************************************************** void CToolSelectMove::cancelAction(CInstance &instance) { //H_AUTO(R2_CToolSelectMove_cancelAction) @@ -291,7 +291,7 @@ void CToolSelectMove::cancelAction(CInstance &instance) _Duplicating = false; } -//*************************************************************** +// *************************************************************** void CToolSelectMove::commitAction(CInstance &instance) { //H_AUTO(R2_CToolSelectMove_commitAction) @@ -435,14 +435,14 @@ void CToolSelectMove::commitAction(CInstance &instance) } } -//*************************************************************** +// *************************************************************** const char *CToolSelectMove::getCursorForPossibleAction() const { //H_AUTO(R2_CToolSelectMove_getCursorForPossibleAction) return isShiftDown() ? "curs_can_pan_dup.tga" : "curs_can_pan.tga"; } -//*************************************************************** +// *************************************************************** const char *CToolSelectMove::getDefaultCursor() const { //H_AUTO(R2_CToolSelectMove_getDefaultCursor) @@ -450,7 +450,7 @@ const char *CToolSelectMove::getDefaultCursor() const return isShiftDown() ? "curs_dup.tga" : DEFAULT_CURSOR; } -//*************************************************************** +// *************************************************************** const char *CToolSelectMove::getPickCursor() const { //H_AUTO(R2_CToolSelectMove_getPickCursor) @@ -458,7 +458,7 @@ const char *CToolSelectMove::getPickCursor() const } -//*************************************************************** +// *************************************************************** void CToolSelectMove::updateAction(CInstance &instance) { //H_AUTO(R2_CToolSelectMove_updateAction) @@ -647,7 +647,7 @@ void CToolSelectMove::updateAction(CInstance &instance) */ } -//*************************************************************** +// *************************************************************** void CToolSelectMove::setInstancePos(const NLMISC::CVectorD &pos, CInstance &instance) { //H_AUTO(R2_CToolSelectMove_setInstancePos) @@ -658,7 +658,7 @@ void CToolSelectMove::setInstancePos(const NLMISC::CVectorD &pos, CInstance &ins delete newPos; } -//*************************************************************** +// *************************************************************** bool CToolSelectMove::isActionPossibleOn(const CInstance &instance) const { //H_AUTO(R2_CToolSelectMove_isActionPossibleOn) @@ -681,14 +681,14 @@ bool CToolSelectMove::isActionPossibleOn(const CInstance &instance) const return true; } -//*************************************************************** +// *************************************************************** void CToolSelectMove::onActivate() { //H_AUTO(R2_CToolSelectMove_onActivate) setContextHelp(CI18N::get("uiR2EDToolSelectMove")); } -//*************************************************************** +// *************************************************************** void CToolSelectMove::updateBeforeRender() { //H_AUTO(R2_CToolSelectMove_updateBeforeRender) diff --git a/code/ryzom/client/src/r2/tool_select_rotate.cpp b/code/ryzom/client/src/r2/tool_select_rotate.cpp index 17bb17390..2f728d728 100644 --- a/code/ryzom/client/src/r2/tool_select_rotate.cpp +++ b/code/ryzom/client/src/r2/tool_select_rotate.cpp @@ -34,7 +34,7 @@ using namespace NLMISC; namespace R2 { -//*************************************************************** +// *************************************************************** CToolSelectRotate::CToolSelectRotate() { _StartAngle = 0; @@ -43,7 +43,7 @@ CToolSelectRotate::CToolSelectRotate() } -//*************************************************************** +// *************************************************************** void CToolSelectRotate::updateAction(CInstance &instance) { //H_AUTO(R2_CToolSelectRotate_updateAction) @@ -56,7 +56,7 @@ void CToolSelectRotate::updateAction(CInstance &instance) } -//*************************************************************** +// *************************************************************** void CToolSelectRotate::setRotateInProgress(bool rotateInProgress, CInstance &instance) { //H_AUTO(R2_CToolSelectRotate_setRotateInProgress) @@ -64,7 +64,7 @@ void CToolSelectRotate::setRotateInProgress(bool rotateInProgress, CInstance &in if (dv) dv->setRotateInProgress(rotateInProgress); } -//*************************************************************** +// *************************************************************** void CToolSelectRotate::beginAction(CInstance &instance) { //H_AUTO(R2_CToolSelectRotate_beginAction) @@ -73,7 +73,7 @@ void CToolSelectRotate::beginAction(CInstance &instance) setRotateInProgress(true, instance); } -//*************************************************************** +// *************************************************************** void CToolSelectRotate::cancelAction(CInstance &instance) { //H_AUTO(R2_CToolSelectRotate_cancelAction) @@ -83,7 +83,7 @@ void CToolSelectRotate::cancelAction(CInstance &instance) setRotateInProgress(false, instance); } -//*************************************************************** +// *************************************************************** void CToolSelectRotate::commitAction(CInstance &instance) { //H_AUTO(R2_CToolSelectRotate_commitAction) @@ -93,7 +93,7 @@ void CToolSelectRotate::commitAction(CInstance &instance) setRotateInProgress(false, instance); } -//*************************************************************** +// *************************************************************** void CToolSelectRotate::setEntityAngle(CEntityCL &/* entity */, CInstance &instance, float angle) { //H_AUTO(R2_CToolSelectRotate_setEntityAngle) @@ -102,7 +102,7 @@ void CToolSelectRotate::setEntityAngle(CEntityCL &/* entity */, CInstance &insta delete angleObject; } -//*************************************************************** +// *************************************************************** bool CToolSelectRotate::isActionPossibleOn(const CInstance &instance) const { //H_AUTO(R2_CToolSelectRotate_isActionPossibleOn) @@ -119,7 +119,7 @@ bool CToolSelectRotate::isActionPossibleOn(const CInstance &instance) const return false; } -//*************************************************************** +// *************************************************************** bool CToolSelectRotate::onMouseLeftButtonDown() { //H_AUTO(R2_CToolSelectRotate_onMouseLeftButtonDown) diff --git a/code/ryzom/client/src/r2/verbose_clock.cpp b/code/ryzom/client/src/r2/verbose_clock.cpp index 2fc89560b..f994b0d02 100644 --- a/code/ryzom/client/src/r2/verbose_clock.cpp +++ b/code/ryzom/client/src/r2/verbose_clock.cpp @@ -25,7 +25,7 @@ using namespace NLMISC; namespace R2 { -//********************************************************************************************************* +// ********************************************************************************************************* CVerboseClock::CVerboseClock(const std::string &msg) { _Msg = msg; @@ -33,7 +33,7 @@ CVerboseClock::CVerboseClock(const std::string &msg) } -//********************************************************************************************************* +// ********************************************************************************************************* CVerboseClock::~CVerboseClock() { TTime endTime = CTime::getLocalTime(); @@ -43,7 +43,7 @@ CVerboseClock::~CVerboseClock() } } -//********************************************************************************************************* +// ********************************************************************************************************* CPreciseClock::CPreciseClock(const std::string &msg) { _Msg = msg; @@ -51,7 +51,7 @@ CPreciseClock::CPreciseClock(const std::string &msg) } -//********************************************************************************************************* +// ********************************************************************************************************* CPreciseClock::~CPreciseClock() { TTicks endTime = CTime::getPerformanceTime(); diff --git a/code/ryzom/client/src/rosace.cpp b/code/ryzom/client/src/rosace.cpp index 5e097a74f..5f6c038a7 100644 --- a/code/ryzom/client/src/rosace.cpp +++ b/code/ryzom/client/src/rosace.cpp @@ -245,6 +245,8 @@ void CRosacePage::update(float x, float y, TMode mode) case NbRosaceMode: nlwarning("Rosace Mode reached."); break; + default: + break; } }// update // diff --git a/code/ryzom/client/src/scalable_time.cpp b/code/ryzom/client/src/scalable_time.cpp index 269886612..1bc0e15a0 100644 --- a/code/ryzom/client/src/scalable_time.cpp +++ b/code/ryzom/client/src/scalable_time.cpp @@ -21,7 +21,7 @@ #include "time_client.h" #include "nel/misc/time_nl.h" -//************************************************************************************************* +// ************************************************************************************************* CScalableTime::CScalableTime() { _LastPerformanceTime = NLMISC::CTime::getPerformanceTime(); @@ -29,27 +29,27 @@ CScalableTime::CScalableTime() _TimeScale = 1.f; } -//************************************************************************************************* +// ************************************************************************************************* TTime CScalableTime::getScaledLocalTime() { update(); return (TTime) (NLMISC::CTime::ticksToSecond ((NLMISC::TTicks) _ScaledPerformanceTime) * 1000.0); } -//************************************************************************************************* +// ************************************************************************************************* NLMISC::TTicks CScalableTime::getScaledPerformanceTime() { update(); return (NLMISC::TTicks) _ScaledPerformanceTime; } -//************************************************************************************************* +// ************************************************************************************************* void CScalableTime::setTimeScale(float scale) { _TimeScale = std::max(0.f, scale); } -//************************************************************************************************* +// ************************************************************************************************* void CScalableTime::update() { NLMISC::TTicks dt = NLMISC::CTime::getPerformanceTime() - _LastPerformanceTime; diff --git a/code/ryzom/client/src/session_browser_impl.cpp b/code/ryzom/client/src/session_browser_impl.cpp index 6061d8e36..00ca1ab55 100644 --- a/code/ryzom/client/src/session_browser_impl.cpp +++ b/code/ryzom/client/src/session_browser_impl.cpp @@ -29,7 +29,7 @@ using namespace R2; CVariable SBSPortOffset("client", "SBSPortOffset", "Offset of the SBS port from the FS port", 1000, 0, true); -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::init(CLuaState *ls) { if (ls != NULL) @@ -66,7 +66,7 @@ void CSessionBrowserImpl::init(CLuaState *ls) } -//*************************************************************************** +// *************************************************************************** const NLNET::CLoginCookie &CSessionBrowserImpl::getCookie() { /*if (CInterfaceManager::getInstance()->isInGame()) @@ -77,7 +77,7 @@ const NLNET::CLoginCookie &CSessionBrowserImpl::getCookie() return FakeCookie; // TMP TMP : for Nico's test*/ } -//**************************************************************************** +// **************************************************************************** const std::string &CSessionBrowserImpl::getFrontEndAddress() { if (!NetMngr.getFrontendAddress().empty()) @@ -88,14 +88,14 @@ const std::string &CSessionBrowserImpl::getFrontEndAddress() return testAddress; // TMP TMP : for Nico's test } -//**************************************************************************** +// **************************************************************************** uint32 CSessionBrowserImpl::getCharId() { if (ClientCfg.Local) return 0; return (getCookie().getUserId() << 4) + (uint32) PlayerSelectedSlot; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaGetRingSessionList(CLuaState &ls) { nldebug("SB: luaGetRingSessionList"); @@ -105,7 +105,7 @@ int CSessionBrowserImpl::luaGetRingSessionList(CLuaState &ls) return 0; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaGetRingCharList(CLuaState &ls) { nldebug("SB: luaGetRingCharList"); @@ -117,7 +117,7 @@ int CSessionBrowserImpl::luaGetRingCharList(CLuaState &ls) return 0; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaGetRingStats(CLuaState &ls) { nldebug("SB: luaGetRingStats"); @@ -127,7 +127,7 @@ int CSessionBrowserImpl::luaGetRingStats(CLuaState &ls) return 0; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaGetScenarioScores(CLuaState &ls) { nldebug("SB: luaGetScenarioScores"); @@ -139,7 +139,7 @@ int CSessionBrowserImpl::luaGetScenarioScores(CLuaState &ls) return 0; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaGetSessionAverageScores(CLuaState &ls) { nldebug("SB: luaGetSessionAverageScores"); @@ -151,7 +151,7 @@ int CSessionBrowserImpl::luaGetSessionAverageScores(CLuaState &ls) return 0; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaGetScenarioAverageScores(CLuaState &ls) { nldebug("SB: luaGetScenarioAverageScores"); @@ -164,7 +164,7 @@ int CSessionBrowserImpl::luaGetScenarioAverageScores(CLuaState &ls) return 0; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaUpdateScenarioScores(CLuaState &ls) { nldebug("SB: luaUpdateScenarioScores"); @@ -185,7 +185,7 @@ int CSessionBrowserImpl::luaUpdateScenarioScores(CLuaState &ls) return 0; } -//**************************************************************************** +// **************************************************************************** int CSessionBrowserImpl::luaJoinRingSession(CLuaState &ls) { nldebug("SB: luaJoinRingSession"); @@ -213,7 +213,7 @@ int CSessionBrowserImpl::luaJoinRingSession(CLuaState &ls) return 0; } -//***************************************************************************** +// ***************************************************************************** int CSessionBrowserImpl::luaCheckRingAccess(CLuaState &ls) { lua_State* state = ls.getStatePointer(); @@ -221,7 +221,7 @@ int CSessionBrowserImpl::luaCheckRingAccess(CLuaState &ls) } -//***************************************************************************** +// ***************************************************************************** int CSessionBrowserImpl::luaGetFileHeader(CLuaState &ls) { lua_State* state = ls.getStatePointer(); @@ -229,28 +229,28 @@ int CSessionBrowserImpl::luaGetFileHeader(CLuaState &ls) } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_connectionFailed() { nldebug("SB: on_connectionFailed"); callRingAccessPointMethod("onConnectionFailed", 0, 0); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_CRingSessionManagerWebClient_Disconnection(NLNET::TSockId /* from */) { nldebug("SB: on_CRingSessionManagerWebClient_Disconnection"); callRingAccessPointMethod("onDisconnection", 0, 0); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_connectionClosed() { nldebug("SB: on_connectionClosed"); callRingAccessPointMethod("onConnectionClosed", 0, 0); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_invokeResult(NLNET::TSockId /* from */, uint32 /* userId */, uint32 resultCode, const std::string &resultString) { nldebug("SB: on_invokeResult : result = %u, msg='%s'", resultCode, resultString.c_str()); @@ -259,7 +259,7 @@ void CSessionBrowserImpl::on_invokeResult(NLNET::TSockId /* from */, uint32 /* u _LastInvokeResultMsg = resultString; } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_scheduleSessionResult(NLNET::TSockId /* from */, uint32 charId, TSessionId sessionId, uint8 result, const std::string &resultString) { nldebug("SB: on_scheduleSessionResult : result = %u, msg = '%s'", result, resultString.c_str()); @@ -282,7 +282,7 @@ void CSessionBrowserImpl::on_scheduleSessionResult(NLNET::TSockId /* from */, ui // } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_sessionInfoResult(NLNET::TSockId from, uint32 charId, TSessionId sessionId, const RSMGR::TRaceFilter &raceFilter, const RSMGR::TReligionFilter &religionFilter, const RSMGR::TGuildFilter &guildFilter, const RSMGR::TShardFilter &shardFilter, const RSMGR::TLevelFilter &levelFilter, bool subscriptionClosed, bool autoInvite, const std::string &language, const TSessionOrientation &/* orientation */, const std::string &description) @@ -298,7 +298,7 @@ void CSessionBrowserImpl::on_sessionInfoResult(NLNET::TSockId from, uint32 charI _LastDescription = description; } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_joinSessionResult(NLNET::TSockId /* from */, uint32 /* userId */, TSessionId sessionId, uint32 result, const std::string &shardAddr, const RSMGR::TSessionPartStatus &participantStatus) { nldebug("SB: on_joinSessionResult : result = %u; msg = '%s'", result, shardAddr.c_str()); @@ -315,7 +315,7 @@ void CSessionBrowserImpl::on_joinSessionResult(NLNET::TSockId /* from */, uint32 } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_joinSessionResultExt(NLNET::TSockId from, uint32 userId, TSessionId sessionId, uint32 result, const std::string &shardAddr, const RSMGR::TSessionPartStatus &participantStatus, const CSecurityCode& securityCode) { nldebug("SB: on_joinSessionResultExt : result = %u, msg = '%s'", result, shardAddr.c_str()); @@ -324,27 +324,27 @@ void CSessionBrowserImpl::on_joinSessionResultExt(NLNET::TSockId from, uint32 us on_joinSessionResult(from, userId, sessionId, result, shardAddr, participantStatus); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_getShardsResult(NLNET::TSockId /* from */, uint32 /* userId */, const std::string &/* result */) { nldebug("SB: on_getShardsResult"); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_CSessionBrowserServerWebClient_Disconnection(NLNET::TSockId /* from */) { nldebug("SB: on_CSessionBrowserServerWebClient_Disconnection"); callRingAccessPointMethod("onDisconnection", 0, 0); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_sessionList(NLNET::TSockId /* from */, uint32 /* charId */, const std::vector &sessions) { nldebug("SB: on_sessionList"); fill(sessions); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::fill(const std::vector &sessions) { // build datas & send to lua @@ -418,7 +418,7 @@ void CSessionBrowserImpl::fill(const std::vector &session } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::playerRatingFill(bool scenarioRated, uint32 rateFun, uint32 rateDifficulty, uint32 rateAccessibility, uint32 rateOriginality, uint32 rateDirection) { nlassert(_Lua); @@ -445,7 +445,7 @@ void CSessionBrowserImpl::playerRatingFill(bool scenarioRated, uint32 rateFun, u } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::averageScoresFill(bool scenarioRated, uint32 rateFun, uint32 rateDifficulty, uint32 rateAccessibility, uint32 rateOriginality, uint32 rateDirection, uint32 rrpTotal) { nlassert(_Lua); @@ -474,7 +474,7 @@ void CSessionBrowserImpl::averageScoresFill(bool scenarioRated, uint32 rateFun, } -//**************************************************************************** +// **************************************************************************** static RSMGR::TSessionDesc buildSession(uint32 id, const std::string &owner, const std::string &title, const std::string &description, uint32 level, uint32 playerCount, const std::string &/* language */, uint32 launchTime, bool dm, bool invited) { RSMGR::TSessionDesc result; @@ -490,7 +490,7 @@ static RSMGR::TSessionDesc buildSession(uint32 id, const std::string &owner, con return result; } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::testFill() { std::vector sessions; @@ -514,27 +514,27 @@ void CSessionBrowserImpl::testFill() fill(sessions); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_charList(NLNET::TSockId /* from */, uint32 /* charId */, TSessionId /* sessionId */, const std::vector &chars) { nldebug("SB: on_charList"); charsFill(chars); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_playerRatings(NLNET::TSockId /* from */, uint32 /* charId */, bool scenarioRated, uint32 rateFun, uint32 rateDifficulty, uint32 rateAccessibility, uint32 rateOriginality, uint32 rateDirection) { playerRatingFill(scenarioRated, rateFun, rateDifficulty, rateAccessibility, rateOriginality, rateDirection); } -//**************************************************************************** +// **************************************************************************** // Return average scores of a session void CSessionBrowserImpl::on_sessionAverageScores(NLNET::TSockId /* from */, bool scenarioRated, uint32 rateFun, uint32 rateDifficulty, uint32 rateAccessibility, uint32 rateOriginality, uint32 rateDirection, uint32 rrpTotal) { averageScoresFill(scenarioRated, rateFun, rateDifficulty, rateAccessibility, rateOriginality, rateDirection, rrpTotal); } -//**************************************************************************** +// **************************************************************************** // Return average scores of a scenario void CSessionBrowserImpl::on_scenarioAverageScores(NLNET::TSockId /* from */, bool scenarioRated, uint32 rateFun, uint32 rateDifficulty, uint32 rateAccessibility, uint32 rateOriginality, uint32 rateDirection, uint32 rrpTotal) { @@ -564,7 +564,7 @@ void CSessionBrowserImpl::on_scenarioAverageScores(NLNET::TSockId /* from */, bo } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_ringRatings(NLNET::TSockId /* from */, uint32 /* charId */, uint32 authorRating, uint32 AMRating, uint32 masterlessRating) { _LastAuthorRating = authorRating; @@ -573,7 +573,7 @@ void CSessionBrowserImpl::on_ringRatings(NLNET::TSockId /* from */, uint32 /* ch ringStatsFill(); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::on_ringPoints(NLNET::TSockId /* from */, uint32 /* charId */, const std::string &ringPoints, const std::string &maxRingPoints) { _LastRingPoints = ringPoints; @@ -581,7 +581,7 @@ void CSessionBrowserImpl::on_ringPoints(NLNET::TSockId /* from */, uint32 /* cha ringStatsFill(); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::charsFill(const std::vector &chars) { // build datas & send to lua @@ -638,7 +638,7 @@ void CSessionBrowserImpl::charsFill(const std::vector &chars } } -//**************************************************************************** +// **************************************************************************** inline double ecoRingPoints(const std::string & ecoPoints, char * c) { @@ -697,7 +697,7 @@ void CSessionBrowserImpl::ringStatsFill() } } -//**************************************************************************** +// **************************************************************************** static RSMGR::TCharDesc buildChar(uint32 id, const std::string &charName, const std::string &guild, TRace race, TCult cult, uint32 shardId, TSessionLevel level, bool connected) { @@ -713,7 +713,7 @@ static RSMGR::TCharDesc buildChar(uint32 id, const std::string &charName, const return result; } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::testCharsFill() { std::vector chars; @@ -736,7 +736,7 @@ void CSessionBrowserImpl::testCharsFill() charsFill(chars); } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::callRingAccessPointMethod(const char *name, int numArg, int numResult) { // when you load an animation, lua state isn't initialized for a short time @@ -751,7 +751,7 @@ void CSessionBrowserImpl::callRingAccessPointMethod(const char *name, int numArg } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::callRingCharTrackingMethod(const char *name, int numArg, int numResult) { // when you load an animation, lua state isn't initialized for a short time @@ -766,7 +766,7 @@ void CSessionBrowserImpl::callRingCharTrackingMethod(const char *name, int numAr } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::callRingPlayerInfoMethod(const char *name, int numArg, int numResult) { // when you load an animation, lua state isn't initialized for a short time @@ -781,7 +781,7 @@ void CSessionBrowserImpl::callRingPlayerInfoMethod(const char *name, int numArg, } } -//**************************************************************************** +// **************************************************************************** void CSessionBrowserImpl::callScenarioScoresMethod(const char *name, int numArg, int numResult) { // when you load an animation, lua state isn't initialized for a short time diff --git a/code/ryzom/client/src/seven_zip/CMakeLists.txt b/code/ryzom/client/src/seven_zip/CMakeLists.txt index 6182eed5d..f116006d6 100644 --- a/code/ryzom/client/src/seven_zip/CMakeLists.txt +++ b/code/ryzom/client/src/seven_zip/CMakeLists.txt @@ -6,21 +6,28 @@ LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp) ADD_EXECUTABLE(7zDec ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${NELMISC_LIBRARY}) -ADD_LIBRARY(seven_zip STATIC ${LIB_SRC}) -TARGET_LINK_LIBRARIES(seven_zip ${PLATFORM_LINKFLAGS}) +IF(NOT WIN32) + ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC}) +ELSE(NOT WIN32) + ADD_LIBRARY(ryzom_sevenzip STATIC ${LIB_SRC}) +ENDIF(NOT WIN32) + +TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS}) +SET_TARGET_PROPERTIES(ryzom_sevenzip PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) SET_TARGET_PROPERTIES(seven_zip PROJECT_LABEL "Library: Seven Zip" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") + LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt" ENDIF(WIN32) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -D_SZ_ONE_DIRECTORY) +ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY) + +INSTALL(TARGETS ryzom_sevenzip LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) INSTALL(TARGETS 7zDec RUNTIME DESTINATION bin COMPONENT client) diff --git a/code/ryzom/client/src/sky.cpp b/code/ryzom/client/src/sky.cpp index a37ed77a3..d641d584f 100644 --- a/code/ryzom/client/src/sky.cpp +++ b/code/ryzom/client/src/sky.cpp @@ -38,7 +38,7 @@ using namespace NLMISC; H_AUTO_DECL ( RZ_Client_Render_Sky ) -//************************************************************************************************* +// ************************************************************************************************* CSky::CSky() { _Scene = NULL; @@ -57,13 +57,13 @@ CSky::CSky() _WaterEnvMapAlpha = 255; } -//************************************************************************************************* +// ************************************************************************************************* CSky::~CSky() { release(); } -//************************************************************************************************* +// ************************************************************************************************* void CSky::release() { if (_PlayListManager) @@ -99,7 +99,7 @@ void CSky::release() } } -//************************************************************************************************* +// ************************************************************************************************* void CSky::init(UDriver *drv, const CSkySheet &sheet, bool forceFallbackVersion /*= false*/, float numHourInDay /*= 24.f*/, std::vector *unsupportedObjects /*= NULL*/) { release(); @@ -226,7 +226,7 @@ void CSky::init(UDriver *drv, const CSkySheet &sheet, bool forceFallbackVersion _WaterEnvMapAlpha= sheet.WaterEnvMapAlpha; } -//************************************************************************************************* +// ************************************************************************************************* uint CSky::setup(const CClientDate &date, const CClientDate &animationDate, float weatherLevel, CRGBA fogColor, const NLMISC::CVector &sunLightDir, bool envMapScene) { if (!_Scene) return 0; @@ -268,7 +268,7 @@ uint CSky::setup(const CClientDate &date, const CClientDate &animationDate, floa return numVisibleObjects; } -//************************************************************************************************* +// ************************************************************************************************* NLMISC::CRGBA CSky::computeFogColor(const CClientDate &date, float weatherLevel) const { if (!_FogColor) return CRGBA::White; @@ -279,7 +279,7 @@ NLMISC::CRGBA CSky::computeFogColor(const CClientDate &date, float weatherLevel) } -//************************************************************************************************* +// ************************************************************************************************* CBitmap *buildSharedBitmap(const std::string &filename, std::map &bitmapByName, std::vector &builtBitmaps, diff --git a/code/ryzom/client/src/sky_object.cpp b/code/ryzom/client/src/sky_object.cpp index ef2095085..3a284612a 100644 --- a/code/ryzom/client/src/sky_object.cpp +++ b/code/ryzom/client/src/sky_object.cpp @@ -33,7 +33,7 @@ using namespace NL3D; // CSkyObject::CColorInfo // //////////////////////////// -//************************************************************************************************* +// ************************************************************************************************* void CSkyObject::CColorInfo::init(const CSkyObjectSheet::CColorInfoSheet &ci, std::map &bitmapByName, std::vector &builtBitmaps) @@ -43,7 +43,7 @@ void CSkyObject::CColorInfo::init(const CSkyObjectSheet::CColorInfoSheet &ci, Map = buildSharedBitmap(ci.MapName, bitmapByName, builtBitmaps, alreadyBuilt); } -//************************************************************************************************* +// ************************************************************************************************* CRGBA CSkyObject::CColorInfo::computeColor(float dayPart, float weatherLevel, CRGBA fogColor) { switch(Mode) @@ -73,7 +73,7 @@ CRGBA CSkyObject::CColorInfo::computeColor(float dayPart, float weatherLevel, CR } -//************************************************************************************************* +// ************************************************************************************************* //////////////////////////////////// // CSkyObject::CColorGradientInfo // //////////////////////////////////// @@ -131,7 +131,7 @@ static void dumpGrad(CBitmap &bm) */ -//************************************************************************************************* +// ************************************************************************************************* void CSkyObject::CColorGradientInfo::setup(NL3D::UInstance instance, float dayPart, float weatherLevel, CBitmap &gradientCache, CBitmap &gradientCacheBlurred) { if (instance.empty()) return; @@ -214,7 +214,7 @@ void CSkyObject::CColorGradientInfo::setup(NL3D::UInstance instance, float dayPa } } -//************************************************************************************************* +// ************************************************************************************************* //////////////// // CSkyObject // //////////////// @@ -266,7 +266,7 @@ void CSkyObject::init(const CSkyObjectSheet::CVersionSheet &sheet, } -//************************************************************************************************* +// ************************************************************************************************* bool CSkyObject::setup(const CClientDate &date, const CClientDate &animationDate, float numHoursInDay, float weatherLevel, CRGBA fogColor, bool envMapScene) { if (Instance.empty()) return false; @@ -439,7 +439,7 @@ bool CSkyObject::setup(const CClientDate &date, const CClientDate &animationDate return Active; } -//************************************************************************************************* +// ************************************************************************************************* CSkyObject::~CSkyObject() { } diff --git a/code/ryzom/client/src/timed_fx_manager.cpp b/code/ryzom/client/src/timed_fx_manager.cpp index 1c0e662d3..958d84426 100644 --- a/code/ryzom/client/src/timed_fx_manager.cpp +++ b/code/ryzom/client/src/timed_fx_manager.cpp @@ -73,7 +73,7 @@ const float DEFAULT_SPAWNED_FX_TIMED_OUT = 100.f; H_AUTO_DECL(RZ_TimedFX) -//******************************************************************************************* +// ******************************************************************************************* NLMISC::CMatrix CTimedFX::getInstanceMatrix() const { FPU_CHECKER @@ -87,7 +87,7 @@ NLMISC::CMatrix CTimedFX::getInstanceMatrix() const } -//******************************************************************************************* +// ******************************************************************************************* CTimedFXManager::CTimedFXManager() { FPU_CHECKER @@ -101,7 +101,7 @@ CTimedFXManager::CTimedFXManager() _MaxNumberOfFXInstances = 0; } -//******************************************************************************************* +// ******************************************************************************************* CTimedFXManager::~CTimedFXManager() { FPU_CHECKER @@ -109,7 +109,7 @@ CTimedFXManager::~CTimedFXManager() reset(); } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::init(NL3D::UScene *scene, const CClientDate &startDate, float /* dayLength */, @@ -141,7 +141,7 @@ void CTimedFXManager::init(NL3D::UScene *scene, } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::reset() { FPU_CHECKER @@ -161,7 +161,7 @@ void CTimedFXManager::reset() } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::setDate(const CClientDate &date) { FPU_CHECKER @@ -169,7 +169,7 @@ void CTimedFXManager::setDate(const CClientDate &date) _CurrDate = date; } -//******************************************************************************************* +// ******************************************************************************************* CTimedFXManager::TFXGroupHandle CTimedFXManager::add(const std::vector &fxs, EGSPD::CSeason::TSeason /* season */) { FPU_CHECKER @@ -316,7 +316,7 @@ CTimedFXManager::TFXGroupHandle CTimedFXManager::add(const std::vector -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::remove(TFXGroupHandle handle) { FPU_CHECKER @@ -346,7 +346,7 @@ void CTimedFXManager::remove(TFXGroupHandle handle) } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::update(const CClientDate &date, EGSPD::CSeason::TSeason /* season */, const NLMISC::CVector &camPos) { FPU_CHECKER @@ -475,7 +475,7 @@ void CTimedFXManager::update(const CClientDate &date, EGSPD::CSeason::TSeason /* } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::shutDown(TFXGroupHandle handle) { FPU_CHECKER @@ -493,7 +493,7 @@ void CTimedFXManager::shutDown(TFXGroupHandle handle) } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::CManagedFX::unlinkFromCandidateFXList() { FPU_CHECKER @@ -510,7 +510,7 @@ void CTimedFXManager::CManagedFX::unlinkFromCandidateFXList() } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::CManagedFX::unlinkFromInstanciatedFXList() { FPU_CHECKER @@ -527,7 +527,7 @@ void CTimedFXManager::CManagedFX::unlinkFromInstanciatedFXList() } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::CManagedFX::shutDown(NL3D::UScene *scene, CFXManager &fxManager) { FPU_CHECKER @@ -563,7 +563,7 @@ void CTimedFXManager::CManagedFX::shutDown(NL3D::UScene *scene, CFXManager &fxMa } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::cycleToDate(sint32 cycle, float hour, float cycleLength, float dayLength, CClientDate &result) { FPU_CHECKER @@ -578,7 +578,7 @@ void CTimedFXManager::cycleToDate(sint32 cycle, float hour, float cycleLength, f result.Hour = (float) (resultHour - (double) result.Day * (double) dayLength); } -//******************************************************************************************* +// ******************************************************************************************* sint32 CTimedFXManager::dateToCycle(const CClientDate &date, float cycleLength, float dayLength) { FPU_CHECKER @@ -590,7 +590,7 @@ sint32 CTimedFXManager::dateToCycle(const CClientDate &date, float cycleLength, } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::CManagedFX::computeHour(sint32 cycle, float bias, CClientDate &resultDate, float cycleLength, float dayLength, const NLMISC::CNoiseValue &nv, float minHour, float maxHour) const { FPU_CHECKER @@ -618,7 +618,7 @@ void CTimedFXManager::CManagedFX::computeHour(sint32 cycle, float bias, CClientD } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::CManagedFX::computeStartHour(sint32 cycle, CClientDate &resultDate, float cycleLength, float dayLength, const NLMISC::CNoiseValue &nv) const { FPU_CHECKER @@ -631,7 +631,7 @@ void CTimedFXManager::CManagedFX::computeStartHour(sint32 cycle, CClientDate &re computeHour(cycle, 0.f, resultDate, cycleLength, dayLength, nv, FXSheet->StartHourMin, FXSheet->StartHourMax); } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::CManagedFX::computeEndHour(sint32 cycle, CClientDate &resultDate, float cycleLength, float dayLength, const NLMISC::CNoiseValue &nv) const { FPU_CHECKER @@ -672,7 +672,7 @@ void CTimedFXManager::CManagedFX::computeEndHour(sint32 cycle, CClientDate &resu } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::dumpFXToAdd() const { FPU_CHECKER @@ -693,7 +693,7 @@ void CTimedFXManager::dumpFXToAdd() const } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::dumpFXToRemove() const { FPU_CHECKER @@ -714,7 +714,7 @@ void CTimedFXManager::dumpFXToRemove() const } } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::dumpFXInfo() const { FPU_CHECKER @@ -737,7 +737,7 @@ void CTimedFXManager::dumpFXInfo() const nlinfo("Num Intanciated FX = %d", (int) numInstance); } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::checkIntegrity() { FPU_CHECKER @@ -772,7 +772,7 @@ void CTimedFXManager::checkIntegrity() } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::setupUserParams(CManagedFX &fi, uint cycle) { FPU_CHECKER @@ -802,7 +802,7 @@ void CTimedFXManager::setupUserParams(CManagedFX &fi, uint cycle) } -//******************************************************************************************* +// ******************************************************************************************* // from a fx mode, get a description string const char *timedFXModeToStr(CSeasonFXSheet::TMode mode) { @@ -819,7 +819,7 @@ const char *timedFXModeToStr(CSeasonFXSheet::TMode mode) return "???"; } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::displayFXBoxes(TDebugDisplayMode displayMode) const { FPU_CHECKER @@ -897,7 +897,7 @@ void CTimedFXManager::displayFXBoxes(TDebugDisplayMode displayMode) const } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::linkCandidateFX(TCandidateFXListSortedByDist &targetList, float dist, CManagedFX *fx) { FPU_CHECKER @@ -915,7 +915,7 @@ void CTimedFXManager::linkCandidateFX(TCandidateFXListSortedByDist &targetList, targetList[rank] = fx; } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::linkInstanciatedFX(CManagedFX *&listHead, CManagedFX *fx) { FPU_CHECKER @@ -931,7 +931,7 @@ void CTimedFXManager::linkInstanciatedFX(CManagedFX *&listHead, CManagedFX *fx) listHead = fx; } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::updateInstanciatedFXList() { FPU_CHECKER @@ -1070,7 +1070,7 @@ void CTimedFXManager::updateInstanciatedFXList() _CandidateFXListTouched = false; } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::updateCandidateFXListSorting() { FPU_CHECKER @@ -1094,7 +1094,7 @@ void CTimedFXManager::updateCandidateFXListSorting() _CandidateFXListSortedByDist.swap(_CandidateFXListSortedByDistTmp); } -//******************************************************************************************* +// ******************************************************************************************* void CTimedFXManager::setMaxNumFXInstances(uint maxNumInstances) { FPU_CHECKER @@ -1103,7 +1103,7 @@ void CTimedFXManager::setMaxNumFXInstances(uint maxNumInstances) _CandidateFXListTouched; } -//******************************************************************************************* +// ******************************************************************************************* // temp, for debug NLMISC_COMMAND(dumpFXToAdd, "dumpFXToAdd", "<>") { @@ -1112,7 +1112,7 @@ NLMISC_COMMAND(dumpFXToAdd, "dumpFXToAdd", "<>") return true; } -//******************************************************************************************* +// ******************************************************************************************* // temp, for debug NLMISC_COMMAND(dumpFXToRemove, "dumpFXToRemove", "<>") { @@ -1122,7 +1122,7 @@ NLMISC_COMMAND(dumpFXToRemove, "dumpFXToRemove", "<>") } -//******************************************************************************************* +// ******************************************************************************************* // temp, for debug NLMISC_COMMAND(dumpFXInfo, "dumpFXInfo", "<>") { @@ -1134,7 +1134,7 @@ NLMISC_COMMAND(dumpFXInfo, "dumpFXInfo", "<>") extern class CIGCallback *IGCallbacks; -//******************************************************************************************* +// ******************************************************************************************* // temp, for debug NLMISC_COMMAND(updateSeason, "updateSeason", "<>") { @@ -1143,7 +1143,7 @@ NLMISC_COMMAND(updateSeason, "updateSeason", "<>") return true; } -//******************************************************************************************* +// ******************************************************************************************* // temp, for debug NLMISC_COMMAND(setMaxNumTimedFXs, "set the max number of timed fx that are visible at a time", "") { diff --git a/code/ryzom/client/src/water_map.cpp b/code/ryzom/client/src/water_map.cpp index ba2e5ca1b..d11a0a6d3 100644 --- a/code/ryzom/client/src/water_map.cpp +++ b/code/ryzom/client/src/water_map.cpp @@ -43,7 +43,7 @@ using namespace NLMISC; H_AUTO_DECL(RZ_WaterMap) -//********************************************************************************************************* +// ********************************************************************************************************* CWaterMap::CWaterMap() { H_AUTO_USE(RZ_WaterMap) @@ -54,7 +54,7 @@ CWaterMap::CWaterMap() } -//********************************************************************************************************* +// ********************************************************************************************************* void CWaterMap::init(const NLMISC::CVector2f &minCorner, const NLMISC::CVector2f &maxCorner, float cellSize /*=20.f*/) { H_AUTO_USE(RZ_WaterMap) @@ -80,7 +80,7 @@ void CWaterMap::init(const NLMISC::CVector2f &minCorner, const NLMISC::CVector2f Scene->setWaterCallback(this); } -//********************************************************************************************************* +// ********************************************************************************************************* void CWaterMap::release() { H_AUTO_USE(RZ_WaterMap) @@ -93,7 +93,7 @@ void CWaterMap::release() Scene->setWaterCallback(NULL); } -//********************************************************************************************************* +// ********************************************************************************************************* bool CWaterMap::getWaterHeight(const NLMISC::CVector2f &pos, float &height, bool &splashEnabled) { H_AUTO_USE(RZ_WaterMap) @@ -122,7 +122,7 @@ bool CWaterMap::getWaterHeight(const NLMISC::CVector2f &pos, float &height, bool return false; } -//********************************************************************************************************* +// ********************************************************************************************************* void CWaterMap::waterSurfaceAdded(const NLMISC::CPolygon2D &shape, const NLMISC::CMatrix &worldMatrix, bool splashEnabled, bool usesSceneWaterEnvMap) { if (ClientCfg.R2EDEnabled) @@ -211,7 +211,7 @@ void CWaterMap::waterSurfaceAdded(const NLMISC::CPolygon2D &shape, const NLMISC: } } -//********************************************************************************************************* +// ********************************************************************************************************* void CWaterMap::waterSurfaceRemoved(bool usesSceneWaterEnvMap) { H_AUTO_USE(RZ_WaterMap) @@ -233,7 +233,7 @@ static const NLMISC::CRGBA DebugCols[] = static const uint NumDebugCols = sizeof(DebugCols) / sizeof(DebugCols[0]); -//********************************************************************************************************* +// ********************************************************************************************************* void CWaterMap::dump(const std::string &filename) { H_AUTO_USE(RZ_WaterMap) @@ -295,7 +295,7 @@ void CWaterMap::dump(const std::string &filename) f.close(); } -//****************************************************************************************************************** +// ****************************************************************************************************************** void CWaterMap::render(const NLMISC::CVector2f &camPos, float maxDist /*=100.f*/) { H_AUTO_USE(RZ_WaterMap) @@ -332,7 +332,7 @@ void CWaterMap::render(const NLMISC::CVector2f &camPos, float maxDist /*=100.f*/ #if !FINAL_VERSION -//****************************************************************************************************************** +// ****************************************************************************************************************** // dump water map in a tga file NLMISC_COMMAND(dumpWaterMap, "dump water map", "") { @@ -342,7 +342,7 @@ NLMISC_COMMAND(dumpWaterMap, "dump water map", "") return true; } -//****************************************************************************************************************** +// ****************************************************************************************************************** // display the water map NLMISC_COMMAND(displayWaterMap, "dump water map", "<0 = on / 1 = off>") { diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt index 843e3048a..a9f1ec401 100644 --- a/code/ryzom/common/src/game_share/CMakeLists.txt +++ b/code/ryzom/common/src/game_share/CMakeLists.txt @@ -8,16 +8,16 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp) LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h) IF(WIN32) - ADD_LIBRARY(game_share STATIC ${SRC}) + ADD_LIBRARY(ryzom_gameshare STATIC ${SRC}) ELSE(WIN32) - ADD_LIBRARY(game_share SHARED ${SRC}) + ADD_LIBRARY(ryzom_gameshare SHARED ${SRC}) ENDIF(WIN32) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(game_share - ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} +TARGET_LINK_LIBRARIES(ryzom_gameshare + ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) -SET_TARGET_PROPERTIES(game_share PROPERTIES VERSION ${NL_VERSION}) +SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) # SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h") @@ -26,10 +26,10 @@ IF(WIN32) PROJECT_LABEL "Library: Game Share" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") + LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -INSTALL(TARGETS game_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) +INSTALL(TARGETS ryzom_gameshare LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) + diff --git a/code/ryzom/common/src/game_share/bg_downloader_msg.cpp b/code/ryzom/common/src/game_share/bg_downloader_msg.cpp index db33b6121..cca585e10 100644 --- a/code/ryzom/common/src/game_share/bg_downloader_msg.cpp +++ b/code/ryzom/common/src/game_share/bg_downloader_msg.cpp @@ -24,7 +24,7 @@ namespace BGDownloader { -extern const char *DownloaderMutexName = "RyzomBgDownloader"; +const char *DownloaderMutexName = "RyzomBgDownloader"; ucstring getWrittenSize(uint32 nSize) { diff --git a/code/ryzom/common/src/game_share/brick_families.h b/code/ryzom/common/src/game_share/brick_families.h index 81d96576a..248d454be 100644 --- a/code/ryzom/common/src/game_share/brick_families.h +++ b/code/ryzom/common/src/game_share/brick_families.h @@ -600,7 +600,7 @@ namespace BRICK_FAMILIES EndBonus = BPBGLA, // TITLE - //****** + // ****** BeginTitle, BPTEA = BeginTitle, EndTitle = BPTEA, diff --git a/code/ryzom/common/src/game_share/crypt.cpp b/code/ryzom/common/src/game_share/crypt.cpp index 42a55e081..7c9fa28fd 100644 --- a/code/ryzom/common/src/game_share/crypt.cpp +++ b/code/ryzom/common/src/game_share/crypt.cpp @@ -403,45 +403,45 @@ static unsigned char PC2[] = { /* permuted choice table 2 */ static unsigned char S[8][64] = { /* 48->32 bit substitution tables */ /* S[1] */ - 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, - 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, - 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, - 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13, + {14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, + 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, + 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, + 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13}, /* S[2] */ - 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, - 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, - 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, - 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9, + {15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, + 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, + 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, + 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9}, /* S[3] */ - 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, - 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, - 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, - 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12, + {10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, + 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, + 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, + 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12}, /* S[4] */ - 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, - 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, - 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, - 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14, + { 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, + 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, + 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, + 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14}, /* S[5] */ - 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, - 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, - 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, - 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3, + { 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, + 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, + 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, + 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3}, /* S[6] */ - 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, - 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, - 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, - 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13, + {12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, + 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, + 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, + 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13}, /* S[7] */ - 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, - 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6, - 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, - 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12, + { 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, + 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6, + 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, + 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12}, /* S[8] */ - 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, - 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, - 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, - 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11, + {13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, + 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, + 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, + 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11} }; static unsigned char P32Tr[] = { /* 32-bit permutation function */ diff --git a/code/ryzom/common/src/game_share/dms.h b/code/ryzom/common/src/game_share/dms.h index 6ecd37ca2..9347cdeed 100644 --- a/code/ryzom/common/src/game_share/dms.h +++ b/code/ryzom/common/src/game_share/dms.h @@ -80,7 +80,7 @@ namespace R2 public: virtual ~IServerEditionModule(){} virtual void createSessionWithoutSu(uint32 charId, NLMISC::CEntityId clientEid) = 0; - virtual TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const = 0; + virtual TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const = 0; virtual CScenario* getScenarioById(TSessionId sessionId) const = 0; // getEditing position (use AdminModule::getPosition for having a position in editing and animation mode) virtual bool getPosition(TSessionId sessionId, double& x, double& y, double& orient, uint8& season, uint32 locationIndex = 0) = 0; diff --git a/code/ryzom/common/src/game_share/magic_fx.cpp b/code/ryzom/common/src/game_share/magic_fx.cpp index 5f2caa752..ac4e604df 100644 --- a/code/ryzom/common/src/game_share/magic_fx.cpp +++ b/code/ryzom/common/src/game_share/magic_fx.cpp @@ -45,7 +45,7 @@ namespace MAGICFX NL_STRING_CONVERSION_TABLE_ENTRY (UnknownSpellCastStage) NL_END_STRING_CONVERSION_TABLE(TSpellCastStage, SpellCastStageConversion, UnknownSpellCastStage) // - //************************************************************************************* + // ************************************************************************************* const std::string& toString(TSpellMode mode) { return SpellModeConversion.toString(mode); @@ -56,19 +56,19 @@ namespace MAGICFX return SpellModeConversion.fromString(str); } - //************************************************************************************* + // ************************************************************************************* const std::string& toString(TSpellType mode) { return SpellTypeConversion.toString(mode); } - //************************************************************************************* + // ************************************************************************************* const std::string& toString(TSpellCastStage mode) { return SpellCastStageConversion.toString(mode); } - //************************************************************************************* + // ************************************************************************************* TMagicFx toMagicFx( DMGTYPE::EDamageType type ,bool /* Link */) { switch(type) @@ -89,7 +89,7 @@ namespace MAGICFX } } - //************************************************************************************* + // ************************************************************************************* TMagicFx toMagicFx( EFFECT_FAMILIES::TEffectFamily effect) { switch(effect) @@ -152,7 +152,7 @@ namespace MAGICFX } } - //************************************************************************************* + // ************************************************************************************* TMagicFx healtoMagicFx( sint32 healHp, sint32 healSap, sint32 healSta, bool link ) { if ( !link ) diff --git a/code/ryzom/common/src/game_share/mirror.cpp b/code/ryzom/common/src/game_share/mirror.cpp index 1317ed15e..1d2855678 100644 --- a/code/ryzom/common/src/game_share/mirror.cpp +++ b/code/ryzom/common/src/game_share/mirror.cpp @@ -30,12 +30,13 @@ using namespace NLMISC; using namespace NLNET; using namespace std; - -#ifdef FAST_MIRROR -# pragma message(NL_LOC_MSG "Using **** FAST_MIRROR ****") -#else -# pragma message(NL_LOC_MSG "Not using FAST_MIRROR") -#endif +#ifdef NL_OS_WINDOWS +# ifdef FAST_MIRROR +# pragma message(NL_LOC_MSG "Using **** FAST_MIRROR ****") +# else +# pragma message(NL_LOC_MSG "Not using FAST_MIRROR") +# endif +#endif // NL_OS_WINDOWS const string MirrorVersion = string("1.10-")+string(ListRowSizeString); // ADDED: Unidirectional Mode (don't wait for delta) @@ -841,7 +842,9 @@ void CMirror::releaseTrackers( NLNET::CMessage& msgin ) for ( istfar=smidsToFindAndRemove.begin(); istfar!=smidsToFindAndRemove.end(); ++istfar ) { if ( (*istfar) != InvalidSMId ) + { MIRROR_INFO( "MIRROR: Need to remove tracker with smid %d", (*istfar) ); + } } #endif diff --git a/code/ryzom/common/src/game_share/mirror_prop_value.h b/code/ryzom/common/src/game_share/mirror_prop_value.h index ebb34f195..553c73b96 100644 --- a/code/ryzom/common/src/game_share/mirror_prop_value.h +++ b/code/ryzom/common/src/game_share/mirror_prop_value.h @@ -1208,7 +1208,7 @@ public: protected: /// Default constructor - CMirrorPropValueList() : _PtFront(NULL), _Container(NULL), _PropLocation() {} + CMirrorPropValueList() : _Container(NULL), _PtFront(NULL), _PropLocation() {} TSharedListRow allocateNewCell(); diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.h b/code/ryzom/common/src/game_share/mode_and_behaviour.h index 15466fe8a..502c4c67c 100644 --- a/code/ryzom/common/src/game_share/mode_and_behaviour.h +++ b/code/ryzom/common/src/game_share/mode_and_behaviour.h @@ -318,7 +318,7 @@ namespace MBEHAV } /// Cons cast into behaviour enum - operator const EBehaviour () const + operator EBehaviour () const { return (EBehaviour)Behaviour8; } diff --git a/code/ryzom/common/src/game_share/multi_target.cpp b/code/ryzom/common/src/game_share/multi_target.cpp index 91bdcf3fb..43e74cf7f 100644 --- a/code/ryzom/common/src/game_share/multi_target.cpp +++ b/code/ryzom/common/src/game_share/multi_target.cpp @@ -19,7 +19,7 @@ #include "stdpch.h" #include "multi_target.h" -//*********************************************************************** +// *********************************************************************** void CMultiTarget::pack(uint64 *destVP, uint numVP) { nlassert(numVP * 4 >= Targets.size()); // not enough room to stores visual properties! @@ -37,7 +37,7 @@ void CMultiTarget::pack(uint64 *destVP, uint numVP) } } -//*********************************************************************** +// *********************************************************************** void CMultiTarget::unpack(const uint64 *srcVP, uint numVP) { Targets.clear(); diff --git a/code/ryzom/common/src/game_share/multi_target.h b/code/ryzom/common/src/game_share/multi_target.h index 4da329e7a..324b97c34 100644 --- a/code/ryzom/common/src/game_share/multi_target.h +++ b/code/ryzom/common/src/game_share/multi_target.h @@ -64,14 +64,14 @@ public: // INLINE // //////////// -//******************************************************************************************* +// ******************************************************************************************* inline uint16 CMultiTarget::CTarget::getPacked() const { //return (uint16) TargetSlot | ((uint16) (Resist ? 1 : 0) << 15) | ((uint16) Distance << 8); return (uint16) TargetSlot | (uint16(Info) << 8); } -//******************************************************************************************* +// ******************************************************************************************* inline void CMultiTarget::CTarget::setPacked(uint16 value) { TargetSlot = uint8(value & 0xff); diff --git a/code/ryzom/common/src/game_share/range_weapon_type.cpp b/code/ryzom/common/src/game_share/range_weapon_type.cpp index a75aac6c2..9a8d662c0 100644 --- a/code/ryzom/common/src/game_share/range_weapon_type.cpp +++ b/code/ryzom/common/src/game_share/range_weapon_type.cpp @@ -32,13 +32,13 @@ NL_END_STRING_CONVERSION_TABLE(TRangeWeaponType, RangeWeaponTypeConversion, Unkn -//********************************************************************************* +// ********************************************************************************* TRangeWeaponType stringToRangeWeaponType(const std::string &str) { return RangeWeaponTypeConversion.fromString(str); } -//********************************************************************************* +// ********************************************************************************* std::string toString(TRangeWeaponType type) { return RangeWeaponTypeConversion.toString(type); diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index a7a6f4ed9..3e178e12f 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -2572,7 +2572,7 @@ TUserRole CServerEditionModule::getRoleByCharId(TCharId charId) const } -TPioneersSessionsAllowed * const CServerEditionModule::getSessionAllowedForChar(TCharId charId) const +TPioneersSessionsAllowed * CServerEditionModule::getSessionAllowedForChar(TCharId charId) const { TPioneersSessionsAlloweds::const_iterator found = _PioneersSessionsAllowed.find(charId); if (found == _PioneersSessionsAllowed.end()) return NULL; diff --git a/code/ryzom/common/src/game_share/server_edition_module.h b/code/ryzom/common/src/game_share/server_edition_module.h index c98eeb586..71ca46d78 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.h +++ b/code/ryzom/common/src/game_share/server_edition_module.h @@ -474,7 +474,7 @@ namespace R2 TUserRole getRoleByCharId(TCharId charId) const; // get the session that is about to be joined by a client, or NULL if not found - TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const; + TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const; // get the scenario use by the user CScenario* getScenarioByCharId(TCharId charId) const; diff --git a/code/ryzom/common/src/game_share/visual_fx.h b/code/ryzom/common/src/game_share/visual_fx.h index b30e8c18f..57f8a961c 100644 --- a/code/ryzom/common/src/game_share/visual_fx.h +++ b/code/ryzom/common/src/game_share/visual_fx.h @@ -40,7 +40,7 @@ public: // INLINES // ///////////// -//********************************************************************************************** +// ********************************************************************************************** inline void CVisualFX::unpack(sint64 vp) { Aura = (MAGICFX::TAuraFX) (vp & 31); @@ -48,7 +48,7 @@ inline void CVisualFX::unpack(sint64 vp) AuraReceipt = (vp & (1 << 10)) != 0; } -//********************************************************************************************** +// ********************************************************************************************** inline void CVisualFX::pack(sint64 &dest) { dest = ((sint64) AuraReceipt << 10) | ((sint64) (Aura & 31)) | ((sint64) (Link & 31) << 5); diff --git a/code/ryzom/common/src/game_share/xml_auto_ptr.h b/code/ryzom/common/src/game_share/xml_auto_ptr.h index 70a011a00..36e67331b 100644 --- a/code/ryzom/common/src/game_share/xml_auto_ptr.h +++ b/code/ryzom/common/src/game_share/xml_auto_ptr.h @@ -34,7 +34,7 @@ public: operator std::string() const { return std::string(_Value); } bool operator ! () const { return _Value == NULL; } operator const unsigned char *() const { return (const unsigned char *) _Value; } - const char operator * () const { nlassert(_Value); return *_Value; } + char operator * () const { nlassert(_Value); return *_Value; } /// NB : This remove previous owned pointer with xmlFree CXMLAutoPtr &operator = (const char *other) {