Changed: #878 Fix typos in comments/code

This commit is contained in:
kervala 2010-06-14 10:02:51 +02:00
parent e0e1d495dc
commit 46707ef3bc
95 changed files with 163 additions and 172 deletions

View file

@ -188,7 +188,7 @@ public:
*/ */
float StringLine; float StringLine;
/// Optionnal: each render*() method can draw a subset of letters. Default is 0/FFFFFFFF /// Optional: each render*() method can draw a subset of letters. Default is 0/FFFFFFFF
uint32 SelectStart; uint32 SelectStart;
uint32 SelectSize; uint32 SelectSize;

View file

@ -572,7 +572,7 @@ private:
/** Just for build process. /** Just for build process.
* NB: we must store palette info by corner (not by vertex) because Matrix Block grouping may insert vertex * NB: we must store palette info by corner (not by vertex) because Matrix Block grouping may insert vertex
* discontinuities. eg: a vertex use Matrix18. After Matrix grouping (16matrix max), Matrix18 could be Matrix2 for a group * discontinuities. eg: a vertex use Matrix18. After Matrix grouping (16matrix max), Matrix18 could be Matrix2 for a group
* of face, but Matrix13 for an other!! * of face, but Matrix13 for another!!
*/ */
struct CCornerTmp : public CMesh::CCorner struct CCornerTmp : public CMesh::CCorner
{ {

View file

@ -72,7 +72,7 @@ public:
* - create a default camera, linked to the scene, and with default frustum as specified above. * - create a default camera, linked to the scene, and with default frustum as specified above.
* *
* After creation, use the CNELU::Camera to manipulates the camera of scene (but you may change all you want * After creation, use the CNELU::Camera to manipulates the camera of scene (but you may change all you want
* to this camera or create/use an other camera if you want...) * to this camera or create/use another camera if you want...)
* \param viewport the viewport, fullscreen by default. * \param viewport the viewport, fullscreen by default.
*/ */
static void initScene(CViewport viewport=CViewport()); static void initScene(CViewport viewport=CViewport());

View file

@ -509,7 +509,7 @@ public:
*/ */
void setupColorsFromTileFlags(const NLMISC::CRGBA colors[4]); void setupColorsFromTileFlags(const NLMISC::CRGBA colors[4]);
/** Set this patch flags from an other one. /** Set this patch flags from another one.
* The patchs must match * The patchs must match
*/ */
void copyTileFlagsFromPatch(const CPatch *src); void copyTileFlagsFromPatch(const CPatch *src);

View file

@ -117,7 +117,7 @@ public:
/** Detach a bindable object from this located. Ownership is transferred to the caller /** Detach a bindable object from this located. Ownership is transferred to the caller
* Any reference the object may have in the system is lost (targets..) * Any reference the object may have in the system is lost (targets..)
* After that is may be inserted an other system. * After that is may be inserted another system.
*/ */
CPSLocatedBindable *unbind(uint index); CPSLocatedBindable *unbind(uint index);

View file

@ -398,7 +398,7 @@ protected:
void releaseShapes(); void releaseShapes();
/** Compute (optionnal) mesh colors. /** Compute (optional) mesh colors.
* \param startIndex Index of the mesh being processed * \param startIndex Index of the mesh being processed
* \param toProcess Number of meshs to process * \param toProcess Number of meshs to process
*/ */

View file

@ -369,7 +369,7 @@ private:
void allocTileUv(TTileUvId id); void allocTileUv(TTileUvId id);
// delete a CTessNearVertex "id", removing it from Patch RenderList, for each not NULL TileFace of "this" face. // delete a CTessNearVertex "id", removing it from Patch RenderList, for each not NULL TileFace of "this" face.
void deleteTileUv(TTileUvId id); void deleteTileUv(TTileUvId id);
// Just ptr-copy a CTessNearVertex "id" from an other face/vertex id. Do this for each not NULL TileFace. // Just ptr-copy a CTessNearVertex "id" from another face/vertex id. Do this for each not NULL TileFace.
void copyTileUv(TTileUvId id, CTessFace *srcFace, TTileUvId srcId); void copyTileUv(TTileUvId id, CTessFace *srcFace, TTileUvId srcId);
// The Base NearVertex must be allocated before. // The Base NearVertex must be allocated before.

View file

@ -59,7 +59,7 @@ private:
public: public:
/// Copy this tile flags from an other tile /// Copy this tile flags from another tile
void copyFlagsFromOther(const CTileElement &other) { Flags = other.Flags; } void copyFlagsFromOther(const CTileElement &other) { Flags = other.Flags; }
/** The three tile ident. NL_TILE_ELM_LAYER_EMPTY means no Tile for this pass. Tile[0] should be !=NL_TILE_ELM_LAYER_EMPTY. /** The three tile ident. NL_TILE_ELM_LAYER_EMPTY means no Tile for this pass. Tile[0] should be !=NL_TILE_ELM_LAYER_EMPTY.

View file

@ -663,7 +663,7 @@ protected:
*/ */
virtual sint renderSkinGroupGeom(float /* alphaMRM */, uint /* remainingVertices */, uint8 * /* dest */) {return 0;} virtual sint renderSkinGroupGeom(float /* alphaMRM */, uint /* remainingVertices */, uint8 * /* dest */) {return 0;}
/** if supportSkinGrouping(), called to render the primitives of the already skinned vertices (VB activated in the driver) /** if supportSkinGrouping(), called to render the primitives of the already skinned vertices (VB activated in the driver)
* Optionnaly, fill specRdrPasses with specular rdrPass to sort (used for specular grouping). * Optionally, fill specRdrPasses with specular rdrPass to sort (used for specular grouping).
* \param baseVertex value to add to each PBlock index. * \param baseVertex value to add to each PBlock index.
*/ */
virtual void renderSkinGroupPrimitives(uint /* baseVertex */, std::vector<CSkinSpecularRdrPass> &/* specularRdrPasses */, uint /* skinIndex */) { } virtual void renderSkinGroupPrimitives(uint /* baseVertex */, std::vector<CSkinSpecularRdrPass> &/* specularRdrPasses */, uint /* skinIndex */) { }

View file

@ -107,7 +107,7 @@ public:
* setting <0 means -1 and so means DistMax = infinite (default in meshs but multilod meshes). * setting <0 means -1 and so means DistMax = infinite (default in meshs but multilod meshes).
* NB: This apply to the shape direclty!! ie All instances using same shape will be affected * NB: This apply to the shape direclty!! ie All instances using same shape will be affected
* *
* Note: If the skeleton himself is sticked to an other skeleton, this setup is not taken into account. * Note: If the skeleton himself is sticked to another skeleton, this setup is not taken into account.
* ie the skeleton clip follow the ancestor skeleton clip result (ie the first skeleton in hierarchy * ie the skeleton clip follow the ancestor skeleton clip result (ie the first skeleton in hierarchy
* which is not sticked). * which is not sticked).
* *

View file

@ -191,7 +191,7 @@ void splitString(const std::string &str, const std::string &separator, std::vec
void splitUCString(const ucstring &ucstr, const ucstring &separator, std::vector<ucstring> &retList); void splitUCString(const ucstring &ucstr, const ucstring &separator, std::vector<ucstring> &retList);
// *************************************************************************** // ***************************************************************************
/// In a string or ucstring, find a substr and replace it with an other. return true if replaced /// In a string or ucstring, find a substr and replace it with another. return true if replaced
template<class T, class U> template<class T, class U>
bool strFindReplace(T &str, const T &strFind, const U &strReplace) bool strFindReplace(T &str, const T &strFind, const U &strReplace)
{ {

View file

@ -572,7 +572,7 @@ public:
* \param tiled If false coordinate are clamped, else the bitmap is considered to tile * \param tiled If false coordinate are clamped, else the bitmap is considered to tile
*/ */
CRGBAF getColor (float x, float y) const; CRGBAF getColor (float x, float y) const;
// Get Color with optionnal tiling on axis // Get Color with optional tiling on axis
CRGBAF getColor (float x, float y, bool tileU, bool tileV) const; CRGBAF getColor (float x, float y, bool tileU, bool tileV) const;

View file

@ -28,7 +28,7 @@
namespace NLMISC namespace NLMISC
{ {
/** A simple invisible win32 window, with an optionnal message handling function. /** A simple invisible win32 window, with an optional message handling function.
* Possible uses include : * Possible uses include :
* - Creating an icon in the tray (require a window to be passed) * - Creating an icon in the tray (require a window to be passed)
* - Creating a message queue (in order to use an IPC mechanism such as WM_COPYDATA) * - Creating a message queue (in order to use an IPC mechanism such as WM_COPYDATA)
@ -42,7 +42,7 @@ class CDummyWindow
{ {
public: public:
CDummyWindow(); CDummyWindow();
/** Init a dummy window, with an optionnal message handling procedure /** Init a dummy window, with an optional message handling procedure
* \return true on success * \return true on success
*/ */
bool init(HINSTANCE hInstance, WNDPROC winProc = NULL); bool init(HINSTANCE hInstance, WNDPROC winProc = NULL);

View file

@ -120,7 +120,7 @@ public:
* \param quat a UNIT quaternion * \param quat a UNIT quaternion
*/ */
void setRot(const CQuat &quat); void setRot(const CQuat &quat);
/** Explicit setup the Rotation/Scale matrix (base) with the rotation part of an other matrix. /** Explicit setup the Rotation/Scale matrix (base) with the rotation part of another matrix.
* \param matrix the matrix to copy rot part. * \param matrix the matrix to copy rot part.
*/ */
void setRot(const CMatrix &matrix); void setRot(const CMatrix &matrix);

View file

@ -1779,35 +1779,30 @@ IDriver::TMessageBoxId CDriverD3D::systemMessageBox (const char* message, const
} }
// *************************************************************************** // ***************************************************************************
bool CDriverD3D::activate() bool CDriverD3D::activate()
{ {
return true; return true;
} }
// *************************************************************************** // ***************************************************************************
bool CDriverD3D::isActive () bool CDriverD3D::isActive ()
{ {
return (IsWindow(_HWnd) != 0); return (IsWindow(_HWnd) != 0);
} }
// *************************************************************************** // ***************************************************************************
nlWindow CDriverD3D::getDisplay() nlWindow CDriverD3D::getDisplay()
{ {
return _HWnd; return _HWnd;
} }
// *************************************************************************** // ***************************************************************************
NLMISC::IEventEmitter *CDriverD3D::getEventEmitter() NLMISC::IEventEmitter *CDriverD3D::getEventEmitter()
{ {
return &_EventEmitter; return &_EventEmitter;
} }
// *************************************************************************** // ***************************************************************************
void CDriverD3D::getWindowSize (uint32 &width, uint32 &height) void CDriverD3D::getWindowSize (uint32 &width, uint32 &height)
{ {
H_AUTO_D3D(CDriverD3D_getWindowSize); H_AUTO_D3D(CDriverD3D_getWindowSize);
@ -1825,7 +1820,6 @@ void CDriverD3D::getWindowPos (sint32 &x, sint32 &y)
} }
// *************************************************************************** // ***************************************************************************
uint32 CDriverD3D::getImplementationVersion () const uint32 CDriverD3D::getImplementationVersion () const
{ {
H_AUTO_D3D(CDriverD3D_getImplementationVersion); H_AUTO_D3D(CDriverD3D_getImplementationVersion);
@ -1833,21 +1827,18 @@ uint32 CDriverD3D::getImplementationVersion () const
} }
// *************************************************************************** // ***************************************************************************
const char *CDriverD3D::getDriverInformation () const char *CDriverD3D::getDriverInformation ()
{ {
return "Directx 9 NeL Driver"; return "Directx 9 NeL Driver";
} }
// *************************************************************************** // ***************************************************************************
uint8 CDriverD3D::getBitPerPixel () uint8 CDriverD3D::getBitPerPixel ()
{ {
return _CurrentMode.Depth; return _CurrentMode.Depth;
} }
// *************************************************************************** // ***************************************************************************
bool CDriverD3D::clear2D(CRGBA rgba) bool CDriverD3D::clear2D(CRGBA rgba)
{ {
H_AUTO_D3D(CDriverD3D_clear2D); H_AUTO_D3D(CDriverD3D_clear2D);
@ -2712,7 +2703,7 @@ const char *CDriverD3D::getVideocardInformation ()
return name; return name;
} }
else else
return "Can't get video card informations"; return "Can't get video card information";
} }
// *************************************************************************** // ***************************************************************************
@ -3077,14 +3068,14 @@ bool CDriverD3D::setMonitorColorProperties (const CMonitorColorProperties &prope
} }
// *************************************************************************** // ***************************************************************************
//**************************************************************************** // ****************************************************************************
bool CDriverD3D::supportEMBM() const bool CDriverD3D::supportEMBM() const
{ {
H_AUTO_D3D(CDriverD3D_supportEMBM); H_AUTO_D3D(CDriverD3D_supportEMBM);
return _EMBMSupported; return _EMBMSupported;
} }
//**************************************************************************** // ****************************************************************************
bool CDriverD3D::isEMBMSupportedAtStage(uint stage) const bool CDriverD3D::isEMBMSupportedAtStage(uint stage) const
{ {
H_AUTO_D3D(CDriverD3D_isEMBMSupportedAtStage); H_AUTO_D3D(CDriverD3D_isEMBMSupportedAtStage);
@ -3092,7 +3083,7 @@ bool CDriverD3D::isEMBMSupportedAtStage(uint stage) const
return stage < _NbNeLTextureStages - 1; return stage < _NbNeLTextureStages - 1;
} }
//**************************************************************************** // ****************************************************************************
void CDriverD3D::setEMBMMatrix(const uint stage, const float mat[4]) void CDriverD3D::setEMBMMatrix(const uint stage, const float mat[4])
{ {
H_AUTO_D3D(CDriverD3D_setEMBMMatrix); H_AUTO_D3D(CDriverD3D_setEMBMMatrix);

View file

@ -774,7 +774,7 @@ public:
virtual void forceTextureResize(uint divisor); virtual void forceTextureResize(uint divisor);
virtual void forceNativeFragmentPrograms(bool /* nativeOnly */) {} // ignored virtual void forceNativeFragmentPrograms(bool /* nativeOnly */) {} // ignored
// Driver informations // Driver information
virtual uint getNumAdapter() const; virtual uint getNumAdapter() const;
virtual bool getAdapter(uint adapter, CAdapter &desc) const; virtual bool getAdapter(uint adapter, CAdapter &desc) const;
virtual bool setAdapter(uint adapter); virtual bool setAdapter(uint adapter);

View file

@ -161,7 +161,7 @@ void CLandscapeModel::clipAndRenderLandscape()
CRenderTrav &renderTrav= getOwnerScene()->getRenderTrav(); CRenderTrav &renderTrav= getOwnerScene()->getRenderTrav();
// Yes, this is ugly, but the clip pass is finished in render(), for clipping TessBlocks. // Yes, this is ugly, but the clip pass is finished in render(), for clipping TessBlocks.
// This saves an other Landscape patch traversal, so this is faster... // This saves another Landscape patch traversal, so this is faster...
// Order them in order which clip faster (first horizontal, then vertical). // Order them in order which clip faster (first horizontal, then vertical).
// NB: TessBlock are ALWAYS clipped with the frustum pyramid, not the clustered one (faster clip for most common cases). // NB: TessBlock are ALWAYS clipped with the frustum pyramid, not the clustered one (faster clip for most common cases).
CurrentPyramid[0]= clipTrav.WorldFrustumPyramid[NL3D_CLIP_PLANE_LEFT]; CurrentPyramid[0]= clipTrav.WorldFrustumPyramid[NL3D_CLIP_PLANE_LEFT];

View file

@ -297,7 +297,7 @@ float CMRMBuilder::computeEdgeCost(const CMRMEdge &edge)
{ {
/* The edge is between 2 interfaces but not the same. If we collide it we'll have holes! /* The edge is between 2 interfaces but not the same. If we collide it we'll have holes!
This problem arise if space beetween interfaces is small. eg: if we setup an interface beetween This problem arise if space beetween interfaces is small. eg: if we setup an interface beetween
hair and head, and an other one beetween head and torso, then we'll have this problem in the hair and head, and another one beetween head and torso, then we'll have this problem in the
back of the neck. back of the neck.
The solution is to make a big big cost to hope we'll never collide them (else Holes...)!! The solution is to make a big big cost to hope we'll never collide them (else Holes...)!!
Don't use FLT_MAX to still have a correct order if we don't have choice... Don't use FLT_MAX to still have a correct order if we don't have choice...
@ -1030,7 +1030,7 @@ void CMRMBuilder::saveCoarserMesh(CMRMMesh &coarserMesh)
index++; index++;
} }
else else
vert.CoarserIndex=-1; // indicate that this vertex no more exist and is to be geomorphed to an other. vert.CoarserIndex=-1; // indicate that this vertex no more exist and is to be geomorphed to another.
} }
@ -1059,7 +1059,7 @@ void CMRMBuilder::saveCoarserMesh(CMRMMesh &coarserMesh)
index++; index++;
} }
else else
wedge.CoarserIndex=-1; // indicate that this wedge no more exist and is to be geomorphed to an other. wedge.CoarserIndex=-1; // indicate that this wedge no more exist and is to be geomorphed to another.
} }
} }

View file

@ -559,7 +559,7 @@ void CShapeBank::cancelLoadAsync (const std::string &shapeNameNotLwr)
- mesh load async is ended, and the texture is not found in the driver - mesh load async is ended, and the texture is not found in the driver
=> texture generate()-d too => texture generate()-d too
- mesh state is AsyncLoad_Texture, and begin (but doesn't end) to upload the texture - mesh state is AsyncLoad_Texture, and begin (but doesn't end) to upload the texture
- an other mesh is created syncrhonously using also this texture (thus - another mesh is created syncrhonously using also this texture (thus
found in driver, and so just referencing it, no generate) found in driver, and so just referencing it, no generate)
- the async mesh is then canceled, while the texture has not end to load! - the async mesh is then canceled, while the texture has not end to load!
- the texture is still in memory (the sync mesh still point to it), but with - the texture is still in memory (the sync mesh still point to it), but with
@ -742,7 +742,7 @@ void CShapeBank::linkShapeToShapeCache(const string &shapeNameNotLwr, const stri
// abort, since same cache name / cache ptr // abort, since same cache name / cache ptr
return; return;
// If The shape is In the cache of an other Shape Cache, abort. // If The shape is In the cache of another Shape Cache, abort.
if( shapeInfo.isAdded ) if( shapeInfo.isAdded )
// Abort, because impossible. // Abort, because impossible.
return; return;

View file

@ -2470,7 +2470,7 @@ void CTessFace::averageTesselationVertices()
{ {
// NB: here, just need to compute average of myself with FLeft, because my neighbor FBase // NB: here, just need to compute average of myself with FLeft, because my neighbor FBase
// is on same patch (see splitRectangular()), and is average with its FLeft neighbor is done // is on same patch (see splitRectangular()), and is average with its FLeft neighbor is done
// on an other branch of the recurs call. // on another branch of the recurs call.
neighbor= FLeft; neighbor= FLeft;
} }
@ -2514,7 +2514,7 @@ void CTessFace::refreshTesselationGeometry()
/* NB: rectangular case: just need to take SonLeft->VBase, because my neighbor on FBase will compute his son /* NB: rectangular case: just need to take SonLeft->VBase, because my neighbor on FBase will compute his son
on an other branch of the recurs call. on another branch of the recurs call.
*/ */
// re-compute this position (maybe with new noise geometry in Tile Edition). // re-compute this position (maybe with new noise geometry in Tile Edition).
SonLeft->VBase->EndPos= Patch->computeVertex(SonLeft->PVBase.getS(), SonLeft->PVBase.getT()); SonLeft->VBase->EndPos= Patch->computeVertex(SonLeft->PVBase.getS(), SonLeft->PVBase.getT());

View file

@ -180,7 +180,7 @@ void CTrackSampledCommon::buildCommon(const std::vector<uint16> &timeList, float
//=================== //===================
_BeginTime= beginTime; _BeginTime= beginTime;
_EndTime= endTime; _EndTime= endTime;
// compute deltatime for a frame to an other // compute deltatime for a frame to another
uint totalFrameCount= timeList[numKeys-1] - timeList[0]; uint totalFrameCount= timeList[numKeys-1] - timeList[0];
nlassert(totalFrameCount>0); nlassert(totalFrameCount>0);
_DeltaTime= (_EndTime-_BeginTime) / totalFrameCount; _DeltaTime= (_EndTime-_BeginTime) / totalFrameCount;

View file

@ -149,20 +149,20 @@ static const char *WaterVpBump1LayersCode =
ADD R0, R2, -R1; #compute reflection vector \n\ ADD R0, R2, -R1; #compute reflection vector \n\
MAD o[TEX1], R0, c[8], c[8]; \n\ MAD o[TEX1], R0, c[8], c[8]; \n\
"; ";
/** Optionnal diffuse texture in stage 3 /** Optional diffuse texture in stage 3
*/ */
static const char *WaterVpDiffuseMapStage3Code = static const char *WaterVpDiffuseMapStage3Code =
"DP4 o[TEX3].x, R4, c[13]; #compute uv for diffuse texture \n\ "DP4 o[TEX3].x, R4, c[13]; #compute uv for diffuse texture \n\
DP4 o[TEX3].y, R4, c[14]; \n\ DP4 o[TEX3].y, R4, c[14]; \n\
"; ";
/** Optionnal diffuse texture in stage 2 /** Optional diffuse texture in stage 2
*/ */
static const char *WaterVpDiffuseMapStage2Code = static const char *WaterVpDiffuseMapStage2Code =
"DP4 o[TEX2].x, R4, c[13]; #compute uv for diffuse texture \n\ "DP4 o[TEX2].x, R4, c[13]; #compute uv for diffuse texture \n\
DP4 o[TEX2].y, R4, c[14]; \n\ DP4 o[TEX2].y, R4, c[14]; \n\
"; ";
/** Optionnal diffuse texture in stage 1 /** Optional diffuse texture in stage 1
*/ */
static const char *WaterVpDiffuseMapStage1Code = static const char *WaterVpDiffuseMapStage1Code =
"DP4 o[TEX1].x, R4, c[13]; #compute uv for diffuse texture \n\ "DP4 o[TEX1].x, R4, c[13]; #compute uv for diffuse texture \n\

View file

@ -538,7 +538,7 @@ void CZone::compile(CLandscape *landscape, TZoneMap &loadedZones)
nlassert(zone!=this); nlassert(zone!=this);
// insert the zone in the neigborood (if not done...). // insert the zone in the neigborood (if not done...).
neighborZones[zoneto]= zone; neighborZones[zoneto]= zone;
// Doesn't matter if BaseVertices is already linked to an other zone... // Doesn't matter if BaseVertices is already linked to another zone...
// This should be the same pointer in this case... // This should be the same pointer in this case...
BaseVertices[cur]= zone->getBaseVertex(vertto); BaseVertices[cur]= zone->getBaseVertex(vertto);
} }

View file

@ -80,7 +80,7 @@ bool testWildCard(const char *strIn, const char *wildCard)
if( testWildCard(strIn+pos+token.size(), wildCard) ) if( testWildCard(strIn+pos+token.size(), wildCard) )
// if succeed, end // if succeed, end
return true; return true;
// fails=> test with an other occurence of token in the string. // fails=> test with another occurence of token in the string.
pos= sCopy.find(token, pos+1); pos= sCopy.find(token, pos+1);
} }

View file

@ -88,7 +88,7 @@ bool CAsyncFileManager::cancelLoadTask(const CAsyncFileManager::ICancelCallback
// If not found, the current running task may be the one we want to cancel. Must wait it. // If not found, the current running task may be the one we want to cancel. Must wait it.
// Beware that this code works because of the CUnfairSynchronized access we made above (ensure that the // Beware that this code works because of the CUnfairSynchronized access we made above (ensure that the
// taskmanager will end just the current task async (if any) and won't start an other one. // taskmanager will end just the current task async (if any) and won't start another one.
waitCurrentTaskToComplete (); waitCurrentTaskToComplete ();
return false; return false;

View file

@ -59,7 +59,7 @@ public:
///\name Object ///\name Object
//@{ //@{
/** Create a keyboard device, that must then be deleted by the caller /** Create a keyboard device, that must then be deleted by the caller
* An optionnal WinEventEmiter can be provided, so that its flags can be in sync * An optional WinEventEmiter can be provided, so that its flags can be in sync
* with a win32 keyboard flags (shift, ctrl, and alt) * with a win32 keyboard flags (shift, ctrl, and alt)
*/ */
static CDIKeyboard *createKeyboardDevice(IDirectInput8 *di8, static CDIKeyboard *createKeyboardDevice(IDirectInput8 *di8,

View file

@ -1530,7 +1530,7 @@ void CMatrix::serial(IStream &f)
// ====================================================================================================== // ======================================================================================================
void CMatrix::setArbitraryRotI(const CVector &idir) void CMatrix::setArbitraryRotI(const CVector &idir)
{ {
// avoid gimbal lock. if idir == nearly K, use an other second lead vector // avoid gimbal lock. if idir == nearly K, use another second lead vector
if( fabs(idir.z)<0.9f ) if( fabs(idir.z)<0.9f )
setRot(idir, CVector::J, CVector::K); setRot(idir, CVector::J, CVector::K);
else else
@ -1540,7 +1540,7 @@ void CMatrix::setArbitraryRotI(const CVector &idir)
void CMatrix::setArbitraryRotJ(const CVector &jdir) void CMatrix::setArbitraryRotJ(const CVector &jdir)
{ {
// avoid gimbal lock. if jdir == nearly K, use an other second lead vector // avoid gimbal lock. if jdir == nearly K, use another second lead vector
if(fabs(jdir.z)<0.9f) if(fabs(jdir.z)<0.9f)
setRot(CVector::I, jdir, CVector::K); setRot(CVector::I, jdir, CVector::K);
else else
@ -1550,7 +1550,7 @@ void CMatrix::setArbitraryRotJ(const CVector &jdir)
void CMatrix::setArbitraryRotK(const CVector &kdir) void CMatrix::setArbitraryRotK(const CVector &kdir)
{ {
// avoid gimbal lock. if kdir == nearly I, use an other second lead vector // avoid gimbal lock. if kdir == nearly I, use another second lead vector
if( fabs(kdir.y)<0.9f ) if( fabs(kdir.y)<0.9f )
setRot(CVector::I, CVector::J, kdir); setRot(CVector::I, CVector::J, kdir);
else else

View file

@ -329,7 +329,7 @@ float CEdgeCollide::testCircleMove(const CVector2f &start, const CVector2f &del
It is important for CGlobalRetriever::testCollisionWithCollisionChains() because of the It is important for CGlobalRetriever::testCollisionWithCollisionChains() because of the
"SURFACEMOVE NOT DETECTED" Problem. "SURFACEMOVE NOT DETECTED" Problem.
Suppose we can walk on this chain SA/SB (separate Surface A/SurfaceB). Suppose we are near this edge, Suppose we can walk on this chain SA/SB (separate Surface A/SurfaceB). Suppose we are near this edge,
and on Surface SA, and suppose there is an other chain SB/SC the circle collide with. If we and on Surface SA, and suppose there is another chain SB/SC the circle collide with. If we
return 1 (no collision), SB/SC won't be detected (because only SA/?? chains will be tested) and return 1 (no collision), SB/SC won't be detected (because only SA/?? chains will be tested) and
so the cylinder will penetrate SB/SC... so the cylinder will penetrate SB/SC...
This case arise at best if chains SA/SB and chain SB/SC do an angle of 45deg This case arise at best if chains SA/SB and chain SB/SC do an angle of 45deg

View file

@ -1269,7 +1269,7 @@ void NLPACS::CGlobalRetriever::findCollisionChains(CCollisionSurfaceTemp &cst, c
// LeftSurface retrieverInstance is always curInstance. // LeftSurface retrieverInstance is always curInstance.
cc.LeftSurface.RetrieverInstanceId= curInstance; cc.LeftSurface.RetrieverInstanceId= curInstance;
// If RightSurface is not an "edgeId" ie a pointer on a neighbor surface on an other retrieverInstance. // If RightSurface is not an "edgeId" ie a pointer on a neighbor surface on another retrieverInstance.
const CChain &originalChain= localRetriever.getChain(cc.ChainId); const CChain &originalChain= localRetriever.getChain(cc.ChainId);
if( !originalChain.isBorderChainId(cc.RightSurface.SurfaceId) ) if( !originalChain.isBorderChainId(cc.RightSurface.SurfaceId) )
{ {

View file

@ -2569,7 +2569,7 @@ void CSourceDSound::crossFade()
_Buffer->getFormat(sampleFormat, freq); _Buffer->getFormat(sampleFormat, freq);
// The source is currently playing an other buffer. We will do a hot // The source is currently playing another buffer. We will do a hot
// swap between the old and the new buffer. DirectSound maintains two // swap between the old and the new buffer. DirectSound maintains two
// cursors into the buffer: the play cursor and the write cursor. // cursors into the buffer: the play cursor and the write cursor.
// The write cursor indicates where we can start writing the new samples. // The write cursor indicates where we can start writing the new samples.

View file

@ -59,7 +59,7 @@ void alTestWarning(const char *src)
switch (errcode) switch (errcode)
{ {
case AL_NO_ERROR: break; case AL_NO_ERROR: break;
case AL_INVALID_NAME: nlwarning("AL: Invalid Name paramater passed to AL call (%s)", src); break; case AL_INVALID_NAME: nlwarning("AL: Invalid Name parameter passed to AL call (%s)", src); break;
case AL_INVALID_ENUM: nlwarning("AL: Invalid parameter passed to AL call (%s)", src); break; case AL_INVALID_ENUM: nlwarning("AL: Invalid parameter passed to AL call (%s)", src); break;
case AL_INVALID_VALUE: nlwarning("AL: Invalid enum parameter value (%s)", src); break; case AL_INVALID_VALUE: nlwarning("AL: Invalid enum parameter value (%s)", src); break;
case AL_INVALID_OPERATION: nlwarning("AL: Illegal call (%s)", src); break; case AL_INVALID_OPERATION: nlwarning("AL: Illegal call (%s)", src); break;

View file

@ -78,7 +78,7 @@ void CMusicSound::importForm(const std::string& filename, NLGEORGES::UFormElm&
uint32 CMusicSound::getDuration() uint32 CMusicSound::getDuration()
{ {
// Cannot know the length of this music sound. // Cannot know the length of this music sound.
// Since its not really a sound (played in an other "channel"), suppose 0 // Since its not really a sound (played in another "channel"), suppose 0
return 0; return 0;
} }

View file

@ -37,7 +37,7 @@ recursive_search_pathes=
// can load dds if the tga is not available // can load dds if the tga is not available
extensions_remapping = { "tga", "dds" }; extensions_remapping = { "tga", "dds" };
camera_focal = 75; // this is optionnal camera_focal = 75; // this is optional
// sound related vars // sound related vars
packed_sheet_path = "R:\code\ryzom\data\sound"; packed_sheet_path = "R:\code\ryzom\data\sound";
@ -46,33 +46,33 @@ sample_path = "R:\code\ryzom\data\sound\samplebanks\";
// //
// Vegetable Landscape Setup (for vegetable edition). search_pathes must be OK. // Vegetable Landscape Setup (for vegetable edition). search_pathes must be OK.
veget_tile_bank= ""; // this is optionnal, but obligatory for Vegetable Edit to work properly veget_tile_bank= ""; // this is optional, but obligatory for Vegetable Edit to work properly
veget_tile_far_bank= ""; // this is optionnal, but obligatory for Vegetable Edit to work properly veget_tile_far_bank= ""; // this is optional, but obligatory for Vegetable Edit to work properly
veget_landscape_zones= // this is optionnal, but obligatory for Vegetable Edit to work properly veget_landscape_zones= // this is optional, but obligatory for Vegetable Edit to work properly
{ {
}; };
veget_landscape_threshold= 0.01; // this is optionnal veget_landscape_threshold= 0.01; // this is optional
veget_landscape_tile_near= 50; // this is optionnal veget_landscape_tile_near= 50; // this is optional
veget_landscape_ambient = {17, 54, 100} ; // this is optionnal veget_landscape_ambient = {17, 54, 100} ; // this is optional
veget_landscape_diffuse = {241, 226, 244} ; // this is optionnal veget_landscape_diffuse = {241, 226, 244} ; // this is optional
veget_landscape_snap_height= 1.70; // this is optionnal veget_landscape_snap_height= 1.70; // this is optional
// veget setup // veget setup
veget_texture= ""; // this is optionnal, but important for Vegetable Edit to behave properly veget_texture= ""; // this is optional, but important for Vegetable Edit to behave properly
veget_ambient= {80, 80, 80}; // this is optionnal veget_ambient= {80, 80, 80}; // this is optional
veget_diffuse= {255, 255, 255}; // this is optionnal. NB: works like veget_landscape_diffuse (ie maxLightFactor possible) veget_diffuse= {255, 255, 255}; // this is optional. NB: works like veget_landscape_diffuse (ie maxLightFactor possible)
veget_light_dir= {0, 1, -1}; // this is optionnal veget_light_dir= {0, 1, -1}; // this is optional
veget_wind_dir= {1, 1, 0}; // this is optionnal veget_wind_dir= {1, 1, 0}; // this is optional
veget_wind_freq= 0.5; // this is optionnal veget_wind_freq= 0.5; // this is optional
veget_wind_power= 1; // this is optionnal veget_wind_power= 1; // this is optional
veget_wind_bend_min= 0; // this is optionnal veget_wind_bend_min= 0; // this is optional
// scene_light setup // scene_light setup
scene_light_enabled = 1; // this is optionnal. Usefull to load Igs with lights and see correct ligthing scene_light_enabled = 1; // this is optional. Usefull to load Igs with lights and see correct ligthing
scene_light_sun_specular= {255, 255, 255}; // this is optionnal scene_light_sun_specular= {255, 255, 255}; // this is optional
scene_light_sun_diffuse = {255, 255, 255}; // this is optionnal scene_light_sun_diffuse = {255, 255, 255}; // this is optional
scene_light_sun_ambiant = {64, 64, 64}; // this is optionnal scene_light_sun_ambiant = {64, 64, 64}; // this is optional
scene_light_sun_dir = {1, 0, -1}; // this is optionnal scene_light_sun_dir = {1, 0, -1}; // this is optional
// scale the played position of all the skeletons by this value (default 1). // scale the played position of all the skeletons by this value (default 1).

View file

@ -345,7 +345,7 @@ public:
// @} // @}
/** an interface for objects that want to be called during the loop /** an interface for objects that want to be called during the loop
* First use : display of an optionnal bbox for a particle system * First use : display of an optional bbox for a particle system
*/ */
struct IMainLoopCallBack struct IMainLoopCallBack
{ {

View file

@ -1318,14 +1318,14 @@ END
IDD_VEGETABLE_SELECT_OTHER DIALOG DISCARDABLE 0, 0, 187, 146 IDD_VEGETABLE_SELECT_OTHER DIALOG DISCARDABLE 0, 0, 187, 146
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select An Other Vegetable" CAPTION "Select Another Vegetable"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,129,7,50,14 DEFPUSHBUTTON "OK",IDOK,129,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
LISTBOX IDC_LIST1,5,5,95,130,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | LISTBOX IDC_LIST1,5,5,95,130,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_TABSTOP WS_TABSTOP
LTEXT "Selet the vegetable to copy colors from",IDC_STATIC,110, LTEXT "Select the vegetable to copy colors from",IDC_STATIC,110,
75,75,35 75,75,35
END END

View file

@ -191,10 +191,10 @@ public:
// Init default values // Init default values
CParameter (); CParameter ();
// The parameter name (optionnal) // The parameter name (optional)
std::string Name; std::string Name;
// The parameter localized name (optionnal) // The parameter localized name (optional)
std::string LocalizedName; std::string LocalizedName;
// Default value // Default value

View file

@ -279,7 +279,7 @@ void CBGDownloaderAccess::CDownloadCoTask::run()
for (uint catIndex = 0; catIndex < bnpCatSet.categoryCount(); ++catIndex) for (uint catIndex = 0; catIndex < bnpCatSet.categoryCount(); ++catIndex)
{ {
const CBNPCategory &cat = bnpCatSet.getCategory(catIndex); const CBNPCategory &cat = bnpCatSet.getCategory(catIndex);
if (cat.isOptional()) // NB : 'optionnal' flag meaning has changed : it now means 'Mainland Patch' if (cat.isOptional()) // NB : 'optional' flag meaning has changed : it now means 'Mainland Patch'
// until an enum is added // until an enum is added
{ {
for (uint f = 0; f < cat.fileCount(); ++f) for (uint f = 0; f < cat.fileCount(); ++f)

View file

@ -4371,7 +4371,7 @@ bool CCharacterCL::createCurrentAttackEndPart(CProjectileBuild &destPB,
// //
destPB.LocalizedImpact = sheet.IsImpactLocalised; destPB.LocalizedImpact = sheet.IsImpactLocalised;
// If this is a secondary projectile, it may start from an other location, which is the impact point of the previous projectile // If this is a secondary projectile, it may start from another location, which is the impact point of the previous projectile
// (so it doesn't start from the caster hand, or any around settings that is read from the spell sheet) // (so it doesn't start from the caster hand, or any around settings that is read from the spell sheet)
if (sm) // start stickmode wanted ? if (sm) // start stickmode wanted ?
{ {

View file

@ -167,7 +167,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
if(bf != BRICK_FAMILIES::Unknown) if(bf != BRICK_FAMILIES::Unknown)
OptionalFamilies.push_back( bf ); OptionalFamilies.push_back( bf );
else else
nlwarning("Unknown optionnal family %s",sTmp.c_str()); nlwarning("Unknown optional family %s",sTmp.c_str());
} }
} }

View file

@ -533,7 +533,7 @@ void CGroundFXManager::update(const NLMISC::CVectorD &camPos)
{ {
// NB : we dont activate emitters has soon as the fx is allocated by an entity, because of the way the fx works. // NB : we dont activate emitters has soon as the fx is allocated by an entity, because of the way the fx works.
// As a matter of fact, if an object move from A to B, the fx may spawn several particles on [AB] in a single frame // As a matter of fact, if an object move from A to B, the fx may spawn several particles on [AB] in a single frame
// So if the FX was previously used by an other entity, a trail of particles may appear between the 2 entities when // So if the FX was previously used by another entity, a trail of particles may appear between the 2 entities when
// fx is deallocated from first entity and allocated by the new one // fx is deallocated from first entity and allocated by the new one
if (!_SortedInstances[k]->FXHandle->FX.empty()) if (!_SortedInstances[k]->FXHandle->FX.empty())
{ {
@ -550,7 +550,7 @@ void CGroundFXManager::update(const NLMISC::CVectorD &camPos)
{ {
// NB : we dont activate emitters has soon as the fx is allocated by an entity, because of the way the fx works. // NB : we dont activate emitters has soon as the fx is allocated by an entity, because of the way the fx works.
// As a matter of fact, if an object move from A to B, the fx may spawn several particles on [AB] in a single frame // As a matter of fact, if an object move from A to B, the fx may spawn several particles on [AB] in a single frame
// So if the FX was previously used by an other entity, a trail of particles may appear between the 2 entities when // So if the FX was previously used by another entity, a trail of particles may appear between the 2 entities when
// fx is deallocated from first entity and allocated by the new one // fx is deallocated from first entity and allocated by the new one
if (!_SortedInstances[k]->FXHandle->FXUnderWater.empty()) if (!_SortedInstances[k]->FXHandle->FXUnderWater.empty())
{ {

View file

@ -114,7 +114,7 @@ bool InitMouseWithCursor (bool hardware)
return false; return false;
} }
// Update mouse informations // Update mouse information
UpdateMouse (); UpdateMouse ();
if (InitMouseFirstTime) if (InitMouseFirstTime)

View file

@ -532,7 +532,7 @@ public:
CCDBNodeLeaf *progs = im->getDbProp("SERVER:TARGET:PROGRAMMES", false); CCDBNodeLeaf *progs = im->getDbProp("SERVER:TARGET:PROGRAMMES", false);
if (!progs) if (!progs)
{ {
nlwarning("<CHandlerContextMissions::execute> can't retrieve programms."); nlwarning("<CHandlerContextMissions::execute> can't retrieve programs.");
return; return;
} }
bool missionsToDo = (progs->getValue32() & (1 << BOTCHATTYPE::AvailableMissionFamily)) != 0; bool missionsToDo = (progs->getValue32() & (1 << BOTCHATTYPE::AvailableMissionFamily)) != 0;

View file

@ -687,7 +687,7 @@ static void validateStackItem(CDBCtrlSheet *pCSSrc, CDBCtrlSheet *pCSDst, sint32
// *************************************************************************** // ***************************************************************************
/** Swap an item with an other in the inventory. /** Swap an item with another in the inventory.
* eg: place in sword in the set, or place an armor in the kit, or swap 2 items in bags * eg: place in sword in the set, or place an armor in the kit, or swap 2 items in bags
*/ */
class CHandlerSwapItem: public IActionHandler class CHandlerSwapItem: public IActionHandler

View file

@ -63,7 +63,7 @@ struct CChatWindowDesc
std::string AHOnCloseButton; std::string AHOnCloseButton;
std::string AHOnCloseButtonParams; std::string AHOnCloseButtonParams;
std::string HeaderColor; std::string HeaderColor;
// default ctor : build optionnal parameters with their default values // default ctor : build optional parameters with their default values
CChatWindowDesc(); CChatWindowDesc();
}; };
@ -224,7 +224,7 @@ public:
// dtor // dtor
~CChatWindowManager(); ~CChatWindowManager();
/** Create a new chat window. Each chat window should have a unique name /** Create a new chat window. Each chat window should have a unique name
* The window should be inserted in an other container by the caller. * The window should be inserted in another container by the caller.
* \param name A unique title to affect to that window * \param name A unique title to affect to that window
* \param listener A listener to react to the event of the window * \param listener A listener to react to the event of the window
* \return A pointer on the window, or NULL, if creation failed or if name already exists. * \return A pointer on the window, or NULL, if creation failed or if name already exists.

View file

@ -2709,7 +2709,7 @@ bool CDBCtrlSheet::handleEvent (const CEventDescriptor &event)
// In all case, quit // In all case, quit
_Draging = false; _Draging = false;
_LastDraggedSheet = NULL; _LastDraggedSheet = NULL;
// In call case, end of drag => consider handled to not call an other action // In call case, end of drag => consider handled to not call another action
return true; return true;
} }
} }

View file

@ -226,7 +226,7 @@ public:
CCtrlSheetInfo::TSheetType getType () const; CCtrlSheetInfo::TSheetType getType () const;
void setType (CCtrlSheetInfo::TSheetType type); void setType (CCtrlSheetInfo::TSheetType type);
// Swap the content with an other ctrl_sheet (debug): SheetId, Quantity and Quality // Swap the content with another ctrl_sheet (debug): SheetId, Quantity and Quality
void swapSheet(CDBCtrlSheet *other); void swapSheet(CDBCtrlSheet *other);
void setSheetId(sint32 val) {_SheetId.setSInt32(val);} void setSheetId(sint32 val) {_SheetId.setSInt32(val);}
void setQuality(sint32 val) {_Quality.setSInt32(val);} void setQuality(sint32 val) {_Quality.setSInt32(val);}
@ -355,7 +355,7 @@ public:
/// Special ContextHelp for ctrl sheet. /// Special ContextHelp for ctrl sheet.
virtual void getContextHelp(ucstring &help) const; virtual void getContextHelp(ucstring &help) const;
/** true if an item of an other ctrlSheet can be dropped on this slot. /** true if an item of another ctrlSheet can be dropped on this slot.
* also return true if src is 0, or if _ItemSlot==UNDEFINED * also return true if src is 0, or if _ItemSlot==UNDEFINED
*/ */
bool canDropItem(CDBCtrlSheet *src) const; bool canDropItem(CDBCtrlSheet *src) const;
@ -670,7 +670,7 @@ protected:
// For an Item only. Usefull for LeftHand Filtering: must have a pointer to the right hand // For an Item only. Usefull for LeftHand Filtering: must have a pointer to the right hand
CDBCtrlSheet *_OtherHandItemFilter; CDBCtrlSheet *_OtherHandItemFilter;
// This String is optionnal and usage dependent for Item, Macro, or Sentence // This String is optional and usage dependent for Item, Macro, or Sentence
std::string _OptString; std::string _OptString;
CCDBNodeLeaf *_GrayedLink; CCDBNodeLeaf *_GrayedLink;

View file

@ -464,7 +464,7 @@ void CDBGroupBuildPhrase::fillSelectionMain(uint index)
filterBrickSetuped(bricks); filterBrickSetuped(bricks);
} }
// For optionnal or credit, filter by BrickExclusion. // For optional or credit, filter by BrickExclusion.
if(index>=1/*+_NumMandatories*/) if(index>=1/*+_NumMandatories*/)
filterBrickExclusion(bricks, index); filterBrickExclusion(bricks, index);
@ -967,7 +967,7 @@ void CDBGroupBuildPhrase::updateParamHrc(uint index)
// **** From the current View setup of 'word', build the Parameter Hierarchy (in simple tree form) // **** From the current View setup of 'word', build the Parameter Hierarchy (in simple tree form)
CParamTreeNode rootNode(NULL); CParamTreeNode rootNode(NULL);
// NB: here rootNode represent the Main (ie mandatory, optionnal or credit) brick. Therefore, it is not a real parameter. // NB: here rootNode represent the Main (ie mandatory, optional or credit) brick. Therefore, it is not a real parameter.
rootNode.Brick= word->Slot.Brick->asSBrickSheet(); rootNode.Brick= word->Slot.Brick->asSBrickSheet();
rootNode.Valid= true; rootNode.Valid= true;
rootNode.ViewParamFamilies= word->Slot.ViewParamFamilies; rootNode.ViewParamFamilies= word->Slot.ViewParamFamilies;

View file

@ -106,7 +106,7 @@ public:
// enable disaply and set the brick // enable disaply and set the brick
void setBrick(uint32 sheetId); void setBrick(uint32 sheetId);
void setParamBrick(uint param, uint32 sheetId); void setParamBrick(uint param, uint32 sheetId);
// for optional delete, copy state from an other word // for optional delete, copy state from another word
void copySetup(const CWord &w); void copySetup(const CWord &w);
CWord() CWord()

View file

@ -25,7 +25,7 @@
// *************************************************************************** // ***************************************************************************
/** /**
* Special IconList for displaying Phrase Sheet. Optionnaly display progression info * Special IconList for displaying Phrase Sheet. Optionally display progression info
* \author Lionel Berenguier * \author Lionel Berenguier
* \author Nevrax France * \author Nevrax France
* \date 2004 * \date 2004

View file

@ -25,7 +25,7 @@
// *************************************************************************** // ***************************************************************************
/** /**
* Special TextList for displaying Phrase Sheet. Optionnaly display progression info * Special TextList for displaying Phrase Sheet. Optionally display progression info
* \author Lionel Berenguier * \author Lionel Berenguier
* \author Nevrax France * \author Nevrax France
* \date 2003 * \date 2003

View file

@ -672,7 +672,7 @@ bool scanHTMLColor(const char *src, CRGBA &dest)
src = scanColorComponent(src, result.A); src = scanColorComponent(src, result.A);
if (!src) if (!src)
{ {
// Alpha is optionnal // Alpha is optional
result.A = 255; result.A = 255;
} }
dest = result; dest = result;

View file

@ -33,7 +33,7 @@ class CGroupTree : public CInterfaceGroup
public: public:
struct SNode; struct SNode;
// optionnal callback that is called when a node has been added // optional callback that is called when a node has been added
struct INodeAddedCallback struct INodeAddedCallback
{ {
/** A node has just been added in the CGroupTree object /** A node has just been added in the CGroupTree object

View file

@ -2258,7 +2258,7 @@ void CInterfaceManager::drawContextHelp ()
// *************** // ***************
// **** try to disable // **** try to disable
// *************** // ***************
// test disable first, so can recheck asap if an other present. see below // test disable first, so can recheck asap if another present. see below
if(_CurCtrlContextHelp) if(_CurCtrlContextHelp)
{ {
if(x!=_LastXContextHelp || y!=_LastYContextHelp) if(x!=_LastXContextHelp || y!=_LastYContextHelp)
@ -4469,7 +4469,7 @@ void CInterfaceManager::setMode(uint8 newMode)
CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(*itw); CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(*itw);
if ((pGC != NULL)&&(pGC->getActive())) if ((pGC != NULL)&&(pGC->getActive()))
{ {
// if this GC is a Full modal window, or if it is a modal son of an other GC, // if this GC is a Full modal window, or if it is a modal son of another GC,
if (pGC->isModal() || pGC->isModalSon()) if (pGC->isModal() || pGC->isModalSon())
{ {
setTopWindow(pGC); setTopWindow(pGC);

View file

@ -1362,7 +1362,7 @@ bool CInterfaceParser::parseLink(xmlNodePtr cur, CInterfaceGroup * parentGroup)
{ {
splitLinkTargets(std::string((const char*)ptr), parentGroup, targets); splitLinkTargets(std::string((const char*)ptr), parentGroup, targets);
} }
// optionnal action handler // optional action handler
std::string action; std::string action;
std::string params; std::string params;
std::string cond; std::string cond;
@ -3065,7 +3065,7 @@ bool CInterfaceParser::parseCareerGenerator(xmlNodePtr /* cur */)
return false; return false;
// knownWindow (optionnal) // knownWindow (optional)
prop = xmlGetProp (cur, (xmlChar*)"known_window"); prop = xmlGetProp (cur, (xmlChar*)"known_window");
if(prop) knownWindow= (const char*)prop; if(prop) knownWindow= (const char*)prop;

View file

@ -246,7 +246,7 @@ public:
const void *toPointer(int index = -1); const void *toPointer(int index = -1);
/** Helper functions : get value of the wanted type in the top table after conversion /** Helper functions : get value of the wanted type in the top table after conversion
* A default value is used if the stack entry is NULL. * A default value is used if the stack entry is NULL.
* If conversion fails then an exception is thrown (with optionnal msg) * If conversion fails then an exception is thrown (with optional msg)
*/ */
bool getTableBooleanValue(const char *name, bool defaultValue= false); bool getTableBooleanValue(const char *name, bool defaultValue= false);
double getTableNumberValue(const char *name, double defaultValue= 0); double getTableNumberValue(const char *name, double defaultValue= 0);

View file

@ -885,7 +885,7 @@ int CLuaIHM::luaUINewIndex(CLuaState &ls)
} }
CInterfaceElement *pIE = dynamic_cast<CInterfaceElement *>(pRPT); CInterfaceElement *pIE = dynamic_cast<CInterfaceElement *>(pRPT);
// ** try to get an other UI (child or parent) // ** try to get another UI (child or parent)
CInterfaceElement *uiRelative= getUIRelative(pIE, propName); CInterfaceElement *uiRelative= getUIRelative(pIE, propName);
if(uiRelative) if(uiRelative)
{ {

View file

@ -149,7 +149,7 @@ bool CHugeListObs::init()
_HasNext = im->getDbProp(dbPath + ":HAS_NEXT", false); _HasNext = im->getDbProp(dbPath + ":HAS_NEXT", false);
if (!_HasNext) return false; if (!_HasNext) return false;
// optionnal (rolemaster Trading only) // optional (rolemaster Trading only)
_RoleMasterFlagDB = im->getDbProp(dbPath + ":ROLEMASTER_FLAGS", false); _RoleMasterFlagDB = im->getDbProp(dbPath + ":ROLEMASTER_FLAGS", false);
_RoleMasterRaceDB = im->getDbProp(dbPath + ":ROLEMASTER_RACE", false); _RoleMasterRaceDB = im->getDbProp(dbPath + ":ROLEMASTER_RACE", false);

View file

@ -67,7 +67,7 @@ public:
CPeopleList(); CPeopleList();
/** create a list of people from the given description /** create a list of people from the given description
* \param desc description of the people list * \param desc description of the people list
* \param chat optionnal chat box in the list * \param chat optional chat box in the list
* \return true if the list could be * \return true if the list could be
*/ */
bool create(const CPeopleListDesc &desc, const CChatWindowDesc *chat = NULL); bool create(const CPeopleListDesc &desc, const CChatWindowDesc *chat = NULL);

View file

@ -82,10 +82,10 @@ public:
// Or operation with a SkillValue. // Or operation with a SkillValue.
void orV(const CSkillValue &req); void orV(const CSkillValue &req);
// And operation with an other Req Skill Formula. NB: if this.empty, ope= // And operation with another Req Skill Formula. NB: if this.empty, ope=
void andV(const CReqSkillFormula &req); void andV(const CReqSkillFormula &req);
// Or operation with an other Req Skill Formula // Or operation with another Req Skill Formula
void orV(const CReqSkillFormula &req); void orV(const CReqSkillFormula &req);
// empty formula? // empty formula?

View file

@ -122,7 +122,7 @@ protected:
// If true, setTextFormatted() is used instead of setText() // If true, setTextFormatted() is used instead of setText()
bool _IsTextFormatTaged; bool _IsTextFormatTaged;
// Optionnal ucstring modifier // Optional ucstring modifier
IOnReceiveTextId *_StringModifier; IOnReceiveTextId *_StringModifier;
#if defined(NL_DEBUG) #if defined(NL_DEBUG)

View file

@ -1580,7 +1580,7 @@ void initPatch()
} }
// *************************************************************************** // ***************************************************************************
// Called after the check has been done. The page is full of optionnal categories that must be selected for patching // Called after the check has been done. The page is full of optional categories that must be selected for patching
class CAHLoginPatch : public IActionHandler class CAHLoginPatch : public IActionHandler
{ {
virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
@ -1638,7 +1638,7 @@ class CAHLoginPatch : public IActionHandler
REGISTER_ACTION_HANDLER (CAHLoginPatch, "login_patch"); REGISTER_ACTION_HANDLER (CAHLoginPatch, "login_patch");
// *************************************************************************** // ***************************************************************************
// Called after the check has been done. The page is full of optionnal categories that must be selected for patching // Called after the check has been done. The page is full of optional categories that must be selected for patching
class CAHClosePatch : public IActionHandler class CAHClosePatch : public IActionHandler
{ {
virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
@ -2174,7 +2174,7 @@ void initDataScan()
} }
// *************************************************************************** // ***************************************************************************
// Called after the check has been done. The page is full of optionnal categories that must be selected for patching // Called after the check has been done. The page is full of optional categories that must be selected for patching
class CAHOnScanDataStart : public IActionHandler class CAHOnScanDataStart : public IActionHandler
{ {
virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)

View file

@ -3018,10 +3018,10 @@ void CScanDataThread::run ()
// **************************************************************************** // ****************************************************************************
uint32 CPatchManager::SPatchInfo::getAvailablePatchsBitfield() const uint32 CPatchManager::SPatchInfo::getAvailablePatchsBitfield() const
{ {
// About the test (until a patch enum is added, we use the 'optionnal' flag) // About the test (until a patch enum is added, we use the 'optional' flag)
// Non optionnal -> must patch it (will be for RoS) // Non optional -> must patch it (will be for RoS)
// Optionnal -> Will be for Mainland // Optional -> Will be for Mainland
// Required : stands for 'bnp' required by the Optionnal bnps !! so ignore only RoS is wanted // Required : stands for 'bnp' required by the Optional bnps !! so ignore only RoS is wanted
uint32 result = 0; uint32 result = 0;
if (!NonOptCat.empty()) if (!NonOptCat.empty())

View file

@ -89,7 +89,7 @@ public:
struct SFileToPatch struct SFileToPatch
{ {
std::string FileName; // Dest file for the patch std::string FileName; // Dest file for the patch
std::string SrcFileName; // Optionnal src file to which apply patch (empty unless some version of the file, possibly with std::string SrcFileName; // Optional src file to which apply patch (empty unless some version of the file, possibly with
// all patchs applied, was found in the /unpack directory due to a download by the background downloader) // all patchs applied, was found in the /unpack directory due to a download by the background downloader)
std::vector<uint32> Patches; std::vector<uint32> Patches;
std::vector<uint32> PatcheSizes; std::vector<uint32> PatcheSizes;
@ -178,7 +178,7 @@ public:
// if the checkThread ended and is ok then the getDesc* methods can be called // if the checkThread ended and is ok then the getDesc* methods can be called
bool isCheckThreadEnded(bool &ok); bool isCheckThreadEnded(bool &ok);
// Get all the optionnal categories to display for patching // Get all the optional categories to display for patching
void getInfoToDisp(SPatchInfo &piOut); void getInfoToDisp(SPatchInfo &piOut);
void forceStopCheckThread(); void forceStopCheckThread();

View file

@ -400,11 +400,11 @@ bool computeAnimSet(const CAnimationSet *&animSet, MBEHAV::EMode mode, const str
//----------------------------------------------- //-----------------------------------------------
// dump : // dump :
// Create a file with informations to debug. // Create a file with information to debug.
//----------------------------------------------- //-----------------------------------------------
void dump(const std::string &name) void dump(const std::string &name)
{ {
// Write informations to start as the version // Write information to start as the version
COFile fStart; COFile fStart;
if(fStart.open(name + "_start.rec", false, false)) if(fStart.open(name + "_start.rec", false, false))
{ {
@ -477,7 +477,7 @@ void loadDump(const std::string &name)
{ {
CVectorD currentPos; CVectorD currentPos;
// Load informations to start as the version // Load information to start as the version
CIFile fStart; CIFile fStart;
if(fStart.open(name + "_start.rec", false)) if(fStart.open(name + "_start.rec", false))
{ {

View file

@ -249,7 +249,7 @@ He can change the current act
- getRuntimeActs() : return act description - getRuntimeActs() : return act description
- requestStartAct(): ask the DSS to start another act - requestStartAct(): ask the DSS to start another act
- updateActPositionDescriptions(): update the description of acts - updateActPositionDescriptions(): update the description of acts
He can use DM function such teleport himself to an other character He can use DM function such teleport himself to another character
- requestTeleportOneCharacterToAnother: teleport the dm to another plyer character. - requestTeleportOneCharacterToAnother: teleport the dm to another plyer character.
He can dynamically change the Weather or the Season. He can dynamically change the Weather or the Season.
- requestSetWeather: change the current weather at runtime or edit mode - requestSetWeather: change the current weather at runtime or edit mode
@ -380,7 +380,7 @@ Sessions infos:
- getAiInstance: get the id of the current AiInstance. One AiInstance is created by session. - getAiInstance: get the id of the current AiInstance. One AiInstance is created by session.
- getSessionType: get the type of the current session (edition / animation) - getSessionType: get the type of the current session (edition / animation)
- isSessionOwner: is the player the owner of the current session - isSessionOwner: is the player the owner of the current session
- getEditSessionLink: is the current session linked to an other session - getEditSessionLink: is the current session linked to another session
- getScenarioHeader: get header info of current scenario (animation function). Enable to know divers info set into the header of a scenario. - getScenarioHeader: get header info of current scenario (animation function). Enable to know divers info set into the header of a scenario.
Quotas infos: Quotas infos:
- getMaxNpcs: get the maximal number of npc allowed by scenario. - getMaxNpcs: get the maximal number of npc allowed by scenario.
@ -502,7 +502,7 @@ public:
const std::string& instanceId, const std::string& attrName, sint32 position, const std::string& instanceId, const std::string& attrName, sint32 position,
const std::string& key, CObject* value); const std::string& key, CObject* value);
/*! Move a node form the current Scenario from a position to an other (in edition Mode) /*! Move a node form the current Scenario from a position to another (in edition Mode)
The initial position is defined by instanceId, attrName, position. The initial position is defined by instanceId, attrName, position.
The final position is defined by desInstanceId, destAttrName, destPosition. The final position is defined by desInstanceId, destAttrName, destPosition.
*/ */
@ -679,7 +679,7 @@ public:
const TActPositionDescriptions& getRuntimeActs() const { return _ActPositionDescriptions; } const TActPositionDescriptions& getRuntimeActs() const { return _ActPositionDescriptions; }
/*! /*!
DM function that enable the dm to teleport to an other character (player). DM function that enable the dm to teleport to another character (player).
(Right click in the participant list) (Right click in the participant list)
\param sessionId The id of the session \param sessionId The id of the session
\param sourceCharId The id of the character that will be teleport \param sourceCharId The id of the character that will be teleport

View file

@ -59,7 +59,7 @@ void CToolMaintainedAction::cancel()
bool CToolMaintainedAction::onMouseLeftButtonDown() bool CToolMaintainedAction::onMouseLeftButtonDown()
{ {
//H_AUTO(R2_CToolMaintainedAction_onMouseLeftButtonDown) //H_AUTO(R2_CToolMaintainedAction_onMouseLeftButtonDown)
CTool::TSmartPtr holdThis(this); // prevent deletion by son (if they set an other tool) CTool::TSmartPtr holdThis(this); // prevent deletion by son (if they set another tool)
// TODO nico : find a more general system than this, because // TODO nico : find a more general system than this, because
if (_State == Action) return true; // may happen if focus was lost if (_State == Action) return true; // may happen if focus was lost
if (_State == Canceling) if (_State == Canceling)

View file

@ -55,7 +55,7 @@ CVariable<string> SaveShardRoot("variables", "SaveShardRoot", "Root directory of
// stats variables // stats variables
CVariable<NLMISC::TTime> BSLastAckTime("BSIF", "BSLastAckTime", "The timestamp of the last ack received from backup system", 0, 0, true); CVariable<NLMISC::TTime> BSLastAckTime("BSIF", "BSLastAckTime", "The timestamp of the last ack received from backup system", 0, 0, true);
CVariable<NLMISC::TTime> BSTimeSinceLastAck("BSIF", "BSTimeSinceLastAck", "The time since the last ack from the backup system", 0, 0, true); CVariable<NLMISC::TTime> BSTimeSinceLastAck("BSIF", "BSTimeSinceLastAck", "The time since the last ack from the backup system", 0, 0, true);
CVariable<NLMISC::TTime> BSLastAckDelay("BSIF", "BSLastAckDelay", "The time it took for the last received ack to be recieved from slowest of our connected BS services", 0, 0, true); CVariable<NLMISC::TTime> BSLastAckDelay("BSIF", "BSLastAckDelay", "The time it took for the last received ack to be received from slowest of our connected BS services", 0, 0, true);
CVariable<uint32> BSResponseTime("BSIF", "BSResponseTime", "Latest/average time (in sec) between BS request and response", 0, 20, false ); CVariable<uint32> BSResponseTime("BSIF", "BSResponseTime", "Latest/average time (in sec) between BS request and response", 0, 20, false );
@ -220,7 +220,7 @@ NLMISC::CSmartPtr<IBackupGenericAckCallback> CBackupInterfaceSingleton::popGener
// if there are untreated callbacks in the generic responses container then yell // if there are untreated callbacks in the generic responses container then yell
while (!_GenericResponses.empty() && sint32(_GenericResponses.front().first-requestId)<0) while (!_GenericResponses.empty() && sint32(_GenericResponses.front().first-requestId)<0)
{ {
STOP("Skipping untreated generic callback for request: "<<_GenericResponses.front().first<<" becuase we are treating request id: "<<requestId); STOP("Skipping untreated generic callback for request: "<<_GenericResponses.front().first<<" because we are treating request id: "<<requestId);
_GenericResponses.pop_front(); _GenericResponses.pop_front();
} }

View file

@ -170,7 +170,7 @@ private:
* To be used by both IOS & EGS * To be used by both IOS & EGS
* *
* \TODO : Would be good to generalize the pattern used as something like NLMISC::CBinaryRelation<CompoundA, CompoundB, Relation> * \TODO : Would be good to generalize the pattern used as something like NLMISC::CBinaryRelation<CompoundA, CompoundB, Relation>
* This would avoid to have fields for one service that aren't used by an other (like the historic...) * This would avoid to have fields for one service that aren't used by another (like the historic...)
* *
* \author Nicolas Vizerie * \author Nicolas Vizerie
* \author Nevrax France * \author Nevrax France

View file

@ -861,7 +861,7 @@ namespace RYMSG
bool _DontFollow; bool _DontFollow;
// if that bot is a building bot it will be caught by outpost system // if that bot is a building bot it will be caught by outpost system
bool _BuildingBot; bool _BuildingBot;
// optionnal and rare properties // optional and rare properties
std::vector< std::string > _OptionalProperties; std::vector< std::string > _OptionalProperties;
// List of news channel. // List of news channel.
std::vector< std::string > _NewsChannels; std::vector< std::string > _NewsChannels;
@ -1224,7 +1224,7 @@ namespace RYMSG
_BuildingBot = value; _BuildingBot = value;
} }
// optionnal and rare properties // optional and rare properties
const std::vector< std::string > &getOptionalProperties() const const std::vector< std::string > &getOptionalProperties() const
{ {
return _OptionalProperties; return _OptionalProperties;

View file

@ -69,7 +69,7 @@ namespace R2
std::string getSheetAccessInfo(const std::string& sheetClient, const std::string& sheetServer="") const; std::string getSheetAccessInfo(const std::string& sheetClient, const std::string& sheetServer="") const;
std::string getIslandAccessInfo(const std::string& islandeName) const; std::string getIslandAccessInfo(const std::string& islandeName) const;
void getRingAccessAsMap(const std::string& ringAccess, std::map<std::string, int> & ringAccessAsMap) const; void getRingAccessAsMap(const std::string& ringAccess, std::map<std::string, int> & ringAccessAsMap) const;
// Upgrade a ring access by an other eg "d1:f3:l1" + "d3:f1:j1" => "d3:f2:l1:j1" // Upgrade a ring access by another eg "d1:f3:l1" + "d3:f1:j1" => "d3:f2:l1:j1"
std::string upgradeRingAccess(const std::string& defaultValue, const std::string& bonusValue) const; std::string upgradeRingAccess(const std::string& defaultValue, const std::string& bonusValue) const;
bool verifyRight(const std::string& askedAcces, const std::string& allowedAccess) const; bool verifyRight(const std::string& askedAcces, const std::string& allowedAccess) const;
bool verifyRight(const std::map<std::string, int>& askedAccesMap, const std::map<std::string, int>& allowedAccessMap, std::string& package, int& neededLevel, int& charLevel) const; bool verifyRight(const std::map<std::string, int>& askedAccesMap, const std::map<std::string, int>& allowedAccessMap, std::string& package, int& neededLevel, int& charLevel) const;

View file

@ -3289,7 +3289,7 @@ bool CServerEditionModule::unkickPioneerImpl(TSessionId sessionId, TCharId charI
if (connectedSessionId != sessionId) if (connectedSessionId != sessionId)
{ {
outMsg += NLMISC::toString( outMsg += NLMISC::toString(
"Refuse to unkick the character %u from session %u because he is connected to an other session %u", "Refuse to unkick the character %u from session %u because he is connected to another session %u",
charId, sessionId.asInt(), connectedSessionId.asInt() ) ; charId, sessionId.asInt(), connectedSessionId.asInt() ) ;
return false; return false;
} }
@ -3362,7 +3362,7 @@ bool CServerEditionModule::kickPioneerImpl(TSessionId sessionId, TCharId charId,
if (connectedSessionId != sessionId) if (connectedSessionId != sessionId)
{ {
outMsg += NLMISC::toString( outMsg += NLMISC::toString(
"Refuse to kick the character %u from session %u because he is connected to an other session %u", "Refuse to kick the character %u from session %u because he is connected to another session %u",
charId, sessionId.asInt(), connectedSessionId.asInt() ) ; charId, sessionId.asInt(), connectedSessionId.asInt() ) ;
return false; return false;
} }
@ -3409,7 +3409,7 @@ bool CServerEditionModule::kickPioneerImpl(TSessionId sessionId, TCharId charId,
if (allowedChar->second.SessionId != sessionId) if (allowedChar->second.SessionId != sessionId)
{ {
outMsg += NLMISC::toString( outMsg += NLMISC::toString(
"R2Ed: Refuse to kick the character %u from session %u because he is connecting to an other session %u", "R2Ed: Refuse to kick the character %u from session %u because he is connecting to another session %u",
charId, sessionId.asInt(), allowedChar->second.SessionId.asInt() charId, sessionId.asInt(), allowedChar->second.SessionId.asInt()
); );
@ -3472,7 +3472,7 @@ bool CServerEditionModule::removeCharacterFromSessionImpl(TSessionId sessionId,
TSessionId connectedSessionId = foundPioneerSession->second; TSessionId connectedSessionId = foundPioneerSession->second;
if (connectedSessionId != sessionId) if (connectedSessionId != sessionId)
{ {
outMsg += NLMISC::toString("Refuse to remove the character %u from session %u because he is connected to an other session %u", outMsg += NLMISC::toString("Refuse to remove the character %u from session %u because he is connected to another session %u",
charId, sessionId.asInt(), connectedSessionId.asInt() ); charId, sessionId.asInt(), connectedSessionId.asInt() );
return false; return false;
} }
@ -3503,7 +3503,7 @@ bool CServerEditionModule::removeCharacterFromSessionImpl(TSessionId sessionId,
if (allowedChar->second.SessionId != sessionId) if (allowedChar->second.SessionId != sessionId)
{ {
outMsg += NLMISC::toString("R2Ed: Refuse to remove the character %u from session %u because he is connecting to an other session %u", outMsg += NLMISC::toString("R2Ed: Refuse to remove the character %u from session %u because he is connecting to another session %u",
charId, sessionId.asInt(), allowedChar->second.SessionId.asInt()); charId, sessionId.asInt(), allowedChar->second.SessionId.asInt());
return false; return false;
@ -3567,7 +3567,7 @@ bool CServerEditionModule::teleportOneCharacterToAnotherImpl(TSessionId sessionI
if (session) { scenario = session->getScenario(); } if (session) { scenario = session->getScenario(); }
if (!session || !scenario) if (!session || !scenario)
{ {
msg = toString("Try to teleport a character %u to an other character %u but in a session %u that do not exist", source, dest, session); msg = toString("Try to teleport a character %u to another character %u but in a session %u that do not exist", source, dest, session);
return false; return false;
} }
@ -3578,7 +3578,7 @@ bool CServerEditionModule::teleportOneCharacterToAnotherImpl(TSessionId sessionI
if (! sourceCharOk || !destCharOk) if (! sourceCharOk || !destCharOk)
{ {
msg = toString("Try to teleport a character %u %sto an other character %u %sin the session %u", msg = toString("Try to teleport a character %u %sto another character %u %sin the session %u",
source, sourceCharOk?"":"that is not present in the current session ", source, sourceCharOk?"":"that is not present in the current session ",
dest, destCharOk?"":"that is not present in the current session ", dest, destCharOk?"":"that is not present in the current session ",
session); session);
@ -3596,7 +3596,7 @@ bool CServerEditionModule::teleportOneCharacterToAnotherImpl(TSessionId sessionI
if (_CharacterControlProxy.isNull()) if (_CharacterControlProxy.isNull())
{ {
msg="Try to tp to an other player but no EGS?"; msg="Try to tp to another player but no EGS?";
return false; return false;
} }
CCharacterControlItfProxy proxy(_CharacterControlProxy); CCharacterControlItfProxy proxy(_CharacterControlProxy);

View file

@ -163,7 +163,7 @@ namespace R2
virtual void characterKicked(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId charId); virtual void characterKicked(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId charId);
virtual void characterUnkicked(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId charId); virtual void characterUnkicked(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId charId);
// Session manager report that a character must be teleport to an other location // Session manager report that a character must be teleport to another location
virtual void teleportOneCharacterToAnother(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId sourceCharId, TCharId destCharId); virtual void teleportOneCharacterToAnother(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId sourceCharId, TCharId destCharId);
virtual void teleportWhileUploadingScenario(NLNET::IModuleProxy *sender, const std::string& island, const std::string& entryPoint, const std::string& season); virtual void teleportWhileUploadingScenario(NLNET::IModuleProxy *sender, const std::string& island, const std::string& entryPoint, const std::string& season);
@ -340,7 +340,7 @@ namespace R2
NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, listPioneers, "display the list of pionnieers", "no args") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, listPioneers, "display the list of pionnieers", "no args")
NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, kickPioneer, "Kick a player out of a session", "<sesionId> <charId>") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, kickPioneer, "Kick a player out of a session", "<sesionId> <charId>")
NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, unkickPioneer, "Unkick a player from a session", "<sesionId> <charId>") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, unkickPioneer, "Unkick a player from a session", "<sesionId> <charId>")
NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, teleportOneCharacterToAnother, "Teleport a player to an other player in the same session", "<sesionId> <charId> <targetCharId>") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, teleportOneCharacterToAnother, "Teleport a player to another player in the same session", "<sesionId> <charId> <targetCharId>")
NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, displayPioneer, "display a pionnieer", "<charId>") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, displayPioneer, "display a pionnieer", "<charId>")

View file

@ -183,7 +183,7 @@ namespace ADMIN
// precompute the service name // precompute the service name
_ServiceAlias = makeServiceAlias(); _ServiceAlias = makeServiceAlias();
// loop for an optionnal 'dontUseShardOrders' flag in init params // loop for an optional 'dontUseShardOrders' flag in init params
const TParsedCommandLine *duso = pcl.getParam("dontUseShardOrders"); const TParsedCommandLine *duso = pcl.getParam("dontUseShardOrders");
if (duso != NULL) if (duso != NULL)
_DontUseShardOrders = (duso->ParamValue == "true" || duso->ParamName == "1"); _DontUseShardOrders = (duso->ParamValue == "true" || duso->ParamName == "1");

View file

@ -1518,7 +1518,7 @@ void receiveMissionItems_ssc_(CStateInstance* entity, CScriptStack& stack)
} }
} }
// A npc give a mission to take an item given by an other npc // A npc give a mission to take an item given by another npc
// but the item instead of being a r2_plot_item is a normal item like system_mp or big armor // but the item instead of being a r2_plot_item is a normal item like system_mp or big armor
if ( r2PlotItemSheetId.find(sheetId) == r2PlotItemSheetId.end()) if ( r2PlotItemSheetId.find(sheetId) == r2PlotItemSheetId.end())
{ {
@ -1683,7 +1683,7 @@ void giveMissionItems_ssc_(CStateInstance* entity, CScriptStack& stack)
} }
} }
// A npc give a mission to give a item to an other npc // A npc give a mission to give a item to another npc
// but the item instead of being a r2_plot_item is a normal item like system_mp or big armor // but the item instead of being a r2_plot_item is a normal item like system_mp or big armor
if ( r2PlotItemSheetId.find(sheetId) == r2PlotItemSheetId.end()) if ( r2PlotItemSheetId.find(sheetId) == r2PlotItemSheetId.end())
{ {

View file

@ -671,7 +671,7 @@ static void addGroupDescriptionToEventAction(const CAIAliasDescriptionNode *tree
case AITypeFolder: case AITypeFolder:
{ {
string cname = nodeClass(child); string cname = nodeClass(child);
// parse optionnal group descriptions // parse optional group descriptions
if (cname == "group_descriptions") if (cname == "group_descriptions")
{ {
CAIActions::exec("SETACTN", treeNode?treeNode->getAlias():uniqueId); CAIActions::exec("SETACTN", treeNode?treeNode->getAlias():uniqueId);

View file

@ -1280,7 +1280,7 @@ void CCreature::setBotDescription( const CGenNpcDescMsgImp& description )
_ContextTexts[i].second = description.getContextOptions()[i].getDetail(); _ContextTexts[i].second = description.getContextOptions()[i].getDetail();
} }
// let's parse optionnal properties // let's parse optional properties
for ( uint i = 0; i < description.getOptionalProperties().size(); i++ ) for ( uint i = 0; i < description.getOptionalProperties().size(); i++ )
{ {
std::vector< std::string > result; std::vector< std::string > result;

View file

@ -559,7 +559,7 @@ void CStaticBrick::readStaticBrick( const NLGEORGES::UFormElm &root, const NLMIS
if(bf != BRICK_FAMILIES::Unknown) if(bf != BRICK_FAMILIES::Unknown)
OptionalFamilies.insert( bf ); OptionalFamilies.insert( bf );
else else
nlwarning("Unknown optionnal family %s",value.c_str()); nlwarning("Unknown optional family %s",value.c_str());
} }
} }

View file

@ -457,7 +457,7 @@ public:
// get brick from family/index // get brick from family/index
static const CStaticBrick *getBrickFromFamilyIndex(uint16 family, uint16 index); static const CStaticBrick *getBrickFromFamilyIndex(uint16 family, uint16 index);
/// called to copy from an other sheet (operator= + care ptrs) /// called to copy from another sheet (operator= + care ptrs)
void reloadSheet(const CStaticBrick &o); void reloadSheet(const CStaticBrick &o);
private: private:

View file

@ -835,7 +835,7 @@ public:
/// called when the sheet is removed /// called when the sheet is removed
void removed() {} void removed() {}
/// called to copy from an other sheet (operator= + care ptrs) /// called to copy from another sheet (operator= + care ptrs)
void reloadSheet(const CStaticItem &o); void reloadSheet(const CStaticItem &o);
/** Get the base weigth for an item. /** Get the base weigth for an item.

View file

@ -185,7 +185,7 @@ public :
/// called when the sheet is removed /// called when the sheet is removed
void removed() {} void removed() {}
/// called to copy from an other sheet (operator= + care ptrs) /// called to copy from another sheet (operator= + care ptrs)
void reloadSheet(const CStaticXpStagesTable &o); void reloadSheet(const CStaticXpStagesTable &o);
std::vector< SStageTable > XpStagesTables; std::vector< SStageTable > XpStagesTables;
@ -647,7 +647,7 @@ public:
/// called when the sheet is removed /// called when the sheet is removed
void removed() { } void removed() { }
/// called to copy from an other sheet (operator= + care ptrs) /// called to copy from another sheet (operator= + care ptrs)
void reloadSheet(const CStaticCreatures &o); void reloadSheet(const CStaticCreatures &o);
/// recompute CreatureDamagePerHit according to success chance table and CreatureDamagePerHitWithoutAverageDodge /// recompute CreatureDamagePerHit according to success chance table and CreatureDamagePerHitWithoutAverageDodge

View file

@ -60,7 +60,7 @@ public:
/// Removed /// Removed
void removed() {} void removed() {}
/// called to copy from an other sheet (operator= + care ptrs) /// called to copy from another sheet (operator= + care ptrs)
void reloadSheet(const CStaticRolemasterPhrase &o); void reloadSheet(const CStaticRolemasterPhrase &o);
public: public:

View file

@ -218,7 +218,7 @@ void CStaticSuccessTable::readGeorges (const CSmartPtr<UForm> &form, const CShee
//-------------------------------------------------------------- //--------------------------------------------------------------
// reloadSheet // reloadSheet
//-------------------------------------------------------------- //--------------------------------------------------------------
/// called to copy from an other sheet (operator= + care ptrs) /// called to copy from another sheet (operator= + care ptrs)
void CStaticSuccessTable::reloadSheet(const CStaticSuccessTable &o) void CStaticSuccessTable::reloadSheet(const CStaticSuccessTable &o)
{ {
// nothing special, but check correct size // nothing special, but check correct size

View file

@ -96,7 +96,7 @@ public:
/// called when the sheet is removed /// called when the sheet is removed
void removed() {} void removed() {}
/// called to copy from an other sheet (operator= + care ptrs) /// called to copy from another sheet (operator= + care ptrs)
void reloadSheet(const CStaticSuccessTable &o); void reloadSheet(const CStaticSuccessTable &o);
/** /**

View file

@ -58,7 +58,7 @@ void CAIInfosOnEntityMsgImp::callback (const std::string &name, NLNET::TServiceI
CEntityBase *entity = CEntityBaseManager::getEntityBasePtr(EntityRowId); CEntityBase *entity = CEntityBaseManager::getEntityBasePtr(EntityRowId);
if (!entity) if (!entity)
{ {
nlwarning("<CAIInfosOnEntityMsgImp> recieved infos on unknown entity"); nlwarning("<CAIInfosOnEntityMsgImp> received infos on unknown entity");
return; return;
} }

View file

@ -4886,7 +4886,7 @@ void CCombatPhrase::flushDelayedEvents()
case EventDodge: case EventDodge:
case EventParry: case EventParry:
{ {
// don't send a flying text if some damage is done (for instance on an other entity or with the left weapon) // don't send a flying text if some damage is done (for instance on another entity or with the left weapon)
// don't send a flying text if not wanted // don't send a flying text if not wanted
bool sendFlyingText= _Behaviour.DeltaHP==0 && ae.SendFlyingText; bool sendFlyingText= _Behaviour.DeltaHP==0 && ae.SendFlyingText;
// don't send a dodge/parry flying text if both Miss and DodgeParry happened (eg: can happen if right weapon attack miss, and left weapon attack is dodged) // don't send a dodge/parry flying text if both Miss and DodgeParry happened (eg: can happen if right weapon attack miss, and left weapon attack is dodged)

View file

@ -327,7 +327,7 @@ protected:
/// Atomic flag: is the branch an atomic group, or is the leaf a member of an atomic group /// Atomic flag: is the branch an atomic group, or is the leaf a member of an atomic group
bool _Atomic; bool _Atomic;
/// Optionnal callback pointer. /// Optional callback pointer.
TNodeChangeCallback _ChangeCallback; TNodeChangeCallback _ChangeCallback;
}; };

View file

@ -1304,7 +1304,7 @@ public:
sint processMissionMultipleEvent( CMissionEvent & event, TAIAlias alias = CAIAliasTranslator::Invalid); sint processMissionMultipleEvent( CMissionEvent & event, TAIAlias alias = CAIAliasTranslator::Invalid);
/// process a mission event for the missions took by this player /// process a mission event for the missions took by this player
bool processMissionUserEvent(std::list< CMissionEvent* > & eventList,TAIAlias alias); bool processMissionUserEvent(std::list< CMissionEvent* > & eventList,TAIAlias alias);
/// process a mission event for a specific mission and optionnally for a specific step /// process a mission event for a specific mission and optionally for a specific step
bool processMissionStepUserEvent(std::list< CMissionEvent* > & eventList, uint missionAlias, uint32 stepIndex ); bool processMissionStepUserEvent(std::list< CMissionEvent* > & eventList, uint missionAlias, uint32 stepIndex );
/// make a mission advance through bot chat /// make a mission advance through bot chat
void botChatMissionAdvance( uint8 index ); void botChatMissionAdvance( uint8 index );

View file

@ -615,7 +615,7 @@ NLMISC_COMMAND( displayChatClients, "Display the list of clients", "" )
return true; return true;
} }
NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionnaly, display universe chat group and/or player audience groups", "[universe] [player]" ) NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionally, display universe chat group and/or player audience groups", "[universe] [player]" )
{ {
bool displayUniverse = false; bool displayUniverse = false;
bool playerAudience = false; bool playerAudience = false;
@ -638,7 +638,7 @@ NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionnaly,
return true; return true;
} }
NLMISC_COMMAND( displayChatAudience, "Display the current chat dynamic audience for a player, optionnaly, force the update", "<playerId> [update]" ) NLMISC_COMMAND( displayChatAudience, "Display the current chat dynamic audience for a player, optionally, force the update", "<playerId> [update]" )
{ {
bool update = false; bool update = false;
if (args.size() < 1) if (args.size() < 1)

View file

@ -733,7 +733,7 @@ bool CQueryParser::parseDATE(CQueryParser::iterator &it, CQueryParser::iterator
goto noHour; goto noHour;
if (!parseINT(it, end)) if (!parseINT(it, end))
goto noHour; goto noHour;
// optionnal sec // optional sec
rew = it; rew = it;
if (getNextToken(it, end).TokenType != tt_COLON) if (getNextToken(it, end).TokenType != tt_COLON)
goto noHour; goto noHour;

View file

@ -83,7 +83,7 @@ bool CNameManager::assignName(uint32 charId, const ucstring & ucName, uint32 hom
if (_Names.getBToAMap().find(charSlot) != _Names.getBToAMap().end()) if (_Names.getBToAMap().find(charSlot) != _Names.getBToAMap().end())
{ {
// the character is associated to an other name // the character is associated to another name
_Names.removeWithB(charSlot); _Names.removeWithB(charSlot);
} }

View file

@ -115,7 +115,7 @@ public:
return _VarName; return _VarName;
} }
/// Evaluate the content of the variable with an optionnal sub part. /// Evaluate the content of the variable with an optional sub part.
virtual std::string evalVar(const std::string &subPart) = 0; virtual std::string evalVar(const std::string &subPart) = 0;
/** Factory method to create new variable. Caller become responsible /** Factory method to create new variable. Caller become responsible
@ -435,7 +435,7 @@ public:
/** Install the generated script into the destination primitive files */ /** Install the generated script into the destination primitive files */
bool installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, const std::string &primFileName); bool installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, const std::string &primFileName);
/// Publish the modified to the path paramater /// Publish the modified to the path parameter
bool publishFiles(const std::string &serverPathPrim, const std::string &serverPathText, const std::string &localPathText); bool publishFiles(const std::string &serverPathPrim, const std::string &serverPathText, const std::string &localPathText);
/// Search for text in the file : add it if it's not in /// Search for text in the file : add it if it's not in

View file

@ -1741,7 +1741,7 @@ class CContentKill : public CContentObjective
} }
// add optionnal place // add optional place
if (!_Place._VarValue.empty()) if (!_Place._VarValue.empty())
{ {
for (uint i=0; i<predef.size(); ++i) for (uint i=0; i<predef.size(); ++i)

View file

@ -448,7 +448,7 @@ public:
} }
} }
} }
// look for an optionnal jump // look for an optional jump
child = getPrimitiveChild(prim, TPrimitiveClassPredicate("jump_to")); child = getPrimitiveChild(prim, TPrimitiveClassPredicate("jump_to"));
if (child) if (child)
{ {

View file

@ -457,7 +457,7 @@ private:
string _ReqSkill; string _ReqSkill;
/// The list of properties /// The list of properties
vector<TItemProperty> _Properties; vector<TItemProperty> _Properties;
// Optionnal action (enchantement) // Optional action (enchantement)
string _Action; string _Action;
// Name of the item // Name of the item
CPhrase _ItemPhrase; CPhrase _ItemPhrase;

View file

@ -153,7 +153,7 @@ void showUsage(char *exeName)
LOG(" extract_bot_names [-r]\n"); LOG(" extract_bot_names [-r]\n");
LOG(" extract_new_sheet_names [-r]\n"); LOG(" extract_new_sheet_names [-r]\n");
LOG("\n"); LOG("\n");
LOG("Language code are ISO 639-2 + optionnaly ISO 3166 country code.\n"); LOG("Language code are ISO 639-2 + optionally ISO 3166 country code.\n");
LOG("Reference language is always the first language in languages.txt\n"); LOG("Reference language is always the first language in languages.txt\n");
} }