mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-22 07:06:13 +00:00
Changed: Typo fixes (thanks to Vagrant!)
This commit is contained in:
kervala
parent
2dd0bed9d9
commit
98606fb5b5
115 changed files with 176 additions and 176 deletions
|
|
@ -71,7 +71,7 @@ public:
|
|||
// For clipTrav. cleared at beginning of CClipTrav::traverse
|
||||
void clearVisibleList();
|
||||
|
||||
// For ClipTrav only. NB: list is cleared at begining of traverse(). NB: only CTransform are supported
|
||||
// For ClipTrav only. NB: list is cleared at begininng of traverse(). NB: only CTransform are supported
|
||||
void addVisibleModel(CTransform *model)
|
||||
{
|
||||
_VisibleList[_CurrentNumVisibleModels]= model;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ public:
|
|||
class CCamera : public CTransform
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ public:
|
|||
|
||||
/// \name Visible List mgt. Those visible models are updated each traverse().
|
||||
//@{
|
||||
// NB: list is cleared at begining of traverse().
|
||||
// NB: list is cleared at beginning of traverse().
|
||||
void addVisibleModel(CTransform *model)
|
||||
{
|
||||
model->_IndexInVisibleList= _CurrentNumVisibleModels;
|
||||
|
|
|
|||
|
|
@ -81,14 +81,14 @@ class IDriver;
|
|||
class CLandscapeGlobals
|
||||
{
|
||||
public:
|
||||
// LANDSCAPE RENDERING CONTEXT. Landscape must setup it at the begining at refine()/render().
|
||||
// LANDSCAPE RENDERING CONTEXT. Landscape must setup it at the beginning at refine()/render().
|
||||
// The current date of LandScape for refine only.
|
||||
static sint CurrentDate;
|
||||
// The current date of LandScape for render only.
|
||||
static sint CurrentRenderDate;
|
||||
// The center view for refinement.
|
||||
static CVector RefineCenter;
|
||||
// What is the treshold for tessellation.
|
||||
// What is the threshold for tessellation.
|
||||
static float RefineThreshold;
|
||||
// Guess.
|
||||
static float OORefineThreshold;
|
||||
|
|
@ -143,7 +143,7 @@ public:
|
|||
static CLandscapeVBAllocator *CurrentTileVBAllocator;
|
||||
|
||||
|
||||
// PATCH GLOBAL INTERFACE. patch must setup them at the begining at refine()/render().
|
||||
// PATCH GLOBAL INTERFACE. patch must setup them at the beginning at refine()/render().
|
||||
// NO!!! REMIND: can't have any patch global, since a propagated split()/updateErrorMetric()
|
||||
// can arise. must use Patch pointer.
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ const NLMISC::CClassId LandscapeModelId=NLMISC::CClassId(0x5a573b55, 0x6b395829
|
|||
class CLandscapeModel : public CTransform
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ public:
|
|||
// For clipTrav. cleared at beginning of CClipTrav::traverse
|
||||
void clearVisibleList();
|
||||
|
||||
// For ClipTrav only. NB: list is cleared at begining of traverse().
|
||||
// For ClipTrav only. NB: list is cleared at beginning of traverse().
|
||||
void addVisibleModel(CTransform *model)
|
||||
{
|
||||
_VisibleList[_CurrentNumVisibleModels]= model;
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ const NLMISC::CClassId MeshBaseInstanceId=NLMISC::CClassId(0xef44331, 0x739f6bc
|
|||
class CMeshBaseInstance : public CTransformShape
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ const NLMISC::CClassId MeshInstanceId=NLMISC::CClassId(0x6bfe0a34, 0x23b26dc9);
|
|||
class CMeshInstance : public CMeshBaseInstance
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ const NLMISC::CClassId MeshMRMInstanceId=NLMISC::CClassId(0xec608f3, 0x1111c33)
|
|||
class CMeshMRMInstance : public CMeshBaseInstance
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ const NLMISC::CClassId MeshMRMSkinnedInstanceId=NLMISC::CClassId(0x6cfd2619, 0x
|
|||
class CMeshMRMSkinnedInstance : public CMeshBaseInstance
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public:
|
|||
Lod0Blend = 0x1,
|
||||
};
|
||||
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
/// Last Matrix date for Lods
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace NL3D {
|
|||
|
||||
|
||||
/**
|
||||
* This vertex program is used to perform perpixel lighting with meshs. Its ouputs are :
|
||||
* This vertex program is used to perform perpixel lighting with meshs. Its outputs are :
|
||||
*
|
||||
* Coord Tex 0 : duplicate the tex Coord 0 set from the v.b.
|
||||
* Coord Tex 1 : The light vector in tangent space.
|
||||
|
|
|
|||
|
|
@ -808,7 +808,7 @@ private:
|
|||
CTessFarVertex BaseFarVertices[4];
|
||||
|
||||
|
||||
// Local info for CTessFace tiles. CPatch must setup them at the begining at refine()/render().
|
||||
// Local info for CTessFace tiles. CPatch must setup them at the beginning at refine()/render().
|
||||
// For Far Texture coordinates.
|
||||
float Far0UScale, Far0VScale, Far0UBias, Far0VBias;
|
||||
float Far1UScale, Far1VScale, Far1UBias, Far1VBias;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const NLMISC::CClassId PointLightModelId=NLMISC::CClassId(0x7e842eba, 0x140b6c6
|
|||
class CPointLightModel : public CTransform
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace NL3D {
|
|||
/*
|
||||
* In this file, we define several template that helps to create attributes maker such as gradient (of float, int, vector etc)
|
||||
* attributes maker are used in the particle system to generate values, such as size, color etc. see ps_attrib_maker.h
|
||||
* for more informations
|
||||
* for more information
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const NLMISC::CClassId QuadGridClipManagerId=NLMISC::CClassId(0x1ffb079a, 0x6c5
|
|||
class CQuadGridClipManager : public CTransform
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ public:
|
|||
enum {MaxVPLight= 4};
|
||||
|
||||
/** reset the lighting setup in the driver (all lights are disabled).
|
||||
* called at begining of traverse(). Must be called by any model (before and after rendering)
|
||||
* called at beginning of traverse(). Must be called by any model (before and after rendering)
|
||||
* that wish to use CDriver::setLight() instead of the standard behavior with changeLightSetup()
|
||||
*/
|
||||
void resetLightSetup();
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ const NLMISC::CClassId RootModelId=NLMISC::CClassId(0x25f0505d, 0x75c69f9);
|
|||
class CRootModel : public CTransform
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public:
|
|||
CSegRemanence(CSegRemanence &other);
|
||||
CSegRemanence &operator = (CSegRemanence &other);
|
||||
//@}
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
/// to instanciate that model from a scene
|
||||
static CTransform *creator() { return new CSegRemanence; }
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ public:
|
|||
/// max number of bones supported in skeleton
|
||||
enum { MaxNumBones = 256 };
|
||||
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ const NLMISC::CClassId TransformId=NLMISC::CClassId(0x174750cb, 0xf952024);
|
|||
class CTransform : public ITransformable
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
/// get the scene which has created us
|
||||
|
|
@ -113,7 +113,7 @@ public:
|
|||
/**
|
||||
* Extra init for a model. this method is called by the framework at the very end of CScene::createModel()
|
||||
* Warning! if the model is a CTransformShape, then when initModel() is called, Shape and other related member/setup
|
||||
* of IShape::createInstance() are not yet done (because createModel() is called at the begining in createInstance()).
|
||||
* of IShape::createInstance() are not yet done (because createModel() is called at the beginning in createInstance()).
|
||||
*
|
||||
* Because initModel() is called at the very end, deriver could implement anything like creating other models,
|
||||
* but not deleting this model...
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const NLMISC::CClassId TransformShapeId=NLMISC::CClassId(0x1e6115e6, 0x63502517
|
|||
class CTransformShape : public CTransform
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ const NLMISC::CClassId VegetableBlendLayerModelId=NLMISC::CClassId(0x77375163,
|
|||
class CVegetableBlendLayerModel : public CTransform
|
||||
{
|
||||
public:
|
||||
/// Call at the begining of the program, to register the model
|
||||
/// Call at the beginning of the program, to register the model
|
||||
static void registerBasic();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ namespace NLMISC {
|
|||
* will assert when allocations will occur).
|
||||
*
|
||||
* To construct a container which use this allocator, do like this:
|
||||
* list<uint, CSTLBlockAllocator<uint>> myList( ptrOnBlockMemory );
|
||||
* list<uint, CSTLBlockAllocator<uint> > myList( ptrOnBlockMemory );
|
||||
*
|
||||
* But see CSTLBlockList for easier list instanciation, because using it, you'll do like this:
|
||||
* CSTLBlockList<uint> myList(ptrOnBlockMemory);
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ namespace NLMISC
|
|||
* return true and advance the it iterator if match is found.
|
||||
*/
|
||||
bool matchString(std::string::iterator &it, std::string::iterator end, const char *text);
|
||||
/// Advance up to the begining of the next line, incrementing the in/out param lineCount
|
||||
/// Advance up to the beginning of the next line, incrementing the in/out param lineCount
|
||||
void skipLine(std::string::iterator &it, std::string::iterator end, uint32 &lineCount);
|
||||
///@}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# nel-config
|
||||
#
|
||||
# Script printing NeL's install library/include paths and some other
|
||||
# informations like NeL's version
|
||||
# information like NeL's version
|
||||
#
|
||||
|
||||
prefix=@prefix@
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ This sample show:
|
|||
- Managing several dynamic world image
|
||||
- Moving PACS primitives
|
||||
- Managing collisions
|
||||
- Get triggered informations by collisions (flashes)
|
||||
- Get triggered information by collisions (flashes)
|
||||
|
||||
----------------
|
||||
|
||||
|
|
|
|||
|
|
@ -640,7 +640,7 @@ public:
|
|||
void *lock (uint size, uint stride, uint &offset);
|
||||
void unlock ();
|
||||
|
||||
// Runtime reset (called at the begining of the frame rendering), blocking lock here.
|
||||
// Runtime reset (called at the beginning of the frame rendering), blocking lock here.
|
||||
void reset ();
|
||||
};
|
||||
|
||||
|
|
@ -670,7 +670,7 @@ public:
|
|||
void *lock (uint size, uint &offset);
|
||||
void unlock ();
|
||||
|
||||
// Runtime reset (called at the begining of the frame rendering), blocking lock here.
|
||||
// Runtime reset (called at the beginning of the frame rendering), blocking lock here.
|
||||
void reset ();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ CTessFace::~CTessFace()
|
|||
// ***************************************************************************
|
||||
float CTessFace::computeNearLimit()
|
||||
{
|
||||
// General formula for Level, function of Size, treshold etc...:
|
||||
// General formula for Level, function of Size, threshold etc...:
|
||||
// WantedLevel= log2(BaseSize / sqrdist / RefineThreshold);
|
||||
// <=> WantedLevel= log2( CurSize*2^Level / sqrdist / RefineThreshold).
|
||||
// <=> WantedLevel= log2( ProjectedSize* 2^Level / RefineThreshold).
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ bool CVPParser::parseOperand(CVPOperand &operand, bool outputOperand, std::strin
|
|||
break;
|
||||
case 'A': result = parseAddressRegister(operand, errorOutput); break;
|
||||
case '-':
|
||||
errorOutput = "Negation not allowed on ouput register.";
|
||||
errorOutput = "Negation not allowed on output register.";
|
||||
return false;
|
||||
default:
|
||||
errorOutput = "Output, Address, or Temporary register expected as an output operand.";
|
||||
|
|
@ -365,7 +365,7 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
|
|||
operand.Type = CVPOperand::OutputRegister;
|
||||
if (*_CurrChar != '[')
|
||||
{
|
||||
errorOutput = "'[' expected when parsing an ouput register.";
|
||||
errorOutput = "'[' expected when parsing an output register.";
|
||||
return false;
|
||||
}
|
||||
++_CurrChar;
|
||||
|
|
@ -565,7 +565,7 @@ bool CVPParser::parseAddressRegister(CVPOperand &operand, std::string &errorOutp
|
|||
bool CVPParser::parseOp2(CVPInstruction &instr,std::string &errorOutput)
|
||||
{
|
||||
skipSpacesAndComments();
|
||||
// parse ouput
|
||||
// parse output
|
||||
if (!parseOperand(instr.Dest, true, errorOutput)) return false;
|
||||
// Can't write in input or consant register
|
||||
if (instr.Dest.Type == CVPOperand::Constant || instr.Dest.Type == CVPOperand::InputRegister)
|
||||
|
|
|
|||
|
|
@ -2781,7 +2781,7 @@ void CZoneLighter::computeTileFlagsOnly (CLandscape &landscape, CZone& output, u
|
|||
|
||||
// can't copy tile flags
|
||||
if(!ok)
|
||||
throw Exception("The input zonew, and ouput zonel are too different: not same patchs!!");
|
||||
throw Exception("The input zonew, and output zonel are too different: not same patchs!!");
|
||||
|
||||
/// copy the tiles flags from the zone to light to the output zone
|
||||
copyTileFlags(output, zonew);
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ void CLogicStateMachine::setVerbose( string varName, bool b )
|
|||
filter = 1;
|
||||
}
|
||||
else
|
||||
// xxx* => we look for a string with xxx at the begining
|
||||
// xxx* => we look for a string with xxx at the beginning
|
||||
if( varName[varName.size()-1]=='*' )
|
||||
{
|
||||
motif = varName.substr(0,varName.size()-1);
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ inst: VARIABLE ADD_ASSIGN expression SEMICOLON
|
|||
}
|
||||
else
|
||||
{
|
||||
// this var has been created in a parent Cfg, append at the begining of the array
|
||||
// this var has been created in a parent Cfg, append at the beginning of the array
|
||||
Var.add ((*((vector<NLMISC::CConfigFile::CVar>*)(YYPARSE_PARAM)))[i]);
|
||||
if (Var != (*((vector<NLMISC::CConfigFile::CVar>*)(YYPARSE_PARAM)))[i] && Var.Callback != NULL)
|
||||
(Var.Callback)(Var);
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ CMessage::CMessage (NLMISC::CMemStream &memstr) :
|
|||
else
|
||||
invert(); // calls readType()
|
||||
if ( ! reading )
|
||||
invert(); // set ouput mode back if necessary
|
||||
invert(); // set output mode back if necessary
|
||||
seek( pos, begin ); // sets the same position as the one in the memstream
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -276,7 +276,7 @@ void CContextSound::init()
|
|||
if (i == _BaseName.size())
|
||||
{
|
||||
// The base name is ok, check that the next char is a digit (avoid conflit if some
|
||||
// sound have a longeur base name with same begining)
|
||||
// sound have a longeur base name with same beginning)
|
||||
if (soundName[i] >= '0' && soundName[i] <= '9')
|
||||
_ContextSounds->addSound(CAudioMixerUser::instance()->getSoundId(*first), _BaseName);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
// additionnal paths to search for masks textures
|
||||
//additionnal_paths = { "panoply" };
|
||||
|
||||
// the ouput path for result textures
|
||||
// the output path for result textures
|
||||
output_path = "tga";
|
||||
|
||||
// A character that is used to generate output names when a mask is not defined for a texture.
|
||||
|
|
|
|||
|
|
@ -116,13 +116,13 @@ bool BNPFileHandle::readHeader(const std::string &filePath)
|
|||
uint32 nFileSize = bnp.getFileSize();
|
||||
bnp.seek(nFileSize-sizeof(uint32), IStream::begin);
|
||||
|
||||
uint32 nOffsetFromBegining;
|
||||
uint32 nOffsetFromBeginning;
|
||||
|
||||
bnp.serial(nOffsetFromBegining);
|
||||
bnp.serial(nOffsetFromBeginning);
|
||||
|
||||
if ( !bnp.seek (nOffsetFromBegining, IStream::begin) )
|
||||
if ( !bnp.seek (nOffsetFromBeginning, IStream::begin) )
|
||||
{
|
||||
nlwarning("Could not read offset from begining");
|
||||
nlwarning("Could not read offset from beginning");
|
||||
bnp.close();
|
||||
return false;
|
||||
}
|
||||
|
|
@ -206,7 +206,7 @@ void BNPFileHandle::fileNames(std::vector<std::string> &fileNames)
|
|||
// ***************************************************************************
|
||||
void BNPFileHandle::addFiles( const vector<string> &filePathes)
|
||||
{
|
||||
uint32 OffsetFromBegining = 0;
|
||||
uint32 OffsetFromBeginning = 0;
|
||||
|
||||
// create packed files and add them to the private vector
|
||||
vector<string>::const_iterator it_vec = filePathes.begin();
|
||||
|
|
@ -233,13 +233,13 @@ void BNPFileHandle::addFiles( const vector<string> &filePathes)
|
|||
{
|
||||
append(m_openedBNPFile + ".tmp", *it_packed);
|
||||
// Set now the new offset for the new header
|
||||
it_packed->m_pos = OffsetFromBegining;
|
||||
OffsetFromBegining += it_packed->m_size;
|
||||
it_packed->m_pos = OffsetFromBeginning;
|
||||
OffsetFromBeginning += it_packed->m_size;
|
||||
|
||||
it_packed++;
|
||||
}
|
||||
|
||||
writeHeader(m_openedBNPFile + ".tmp", OffsetFromBegining);
|
||||
writeHeader(m_openedBNPFile + ".tmp", OffsetFromBeginning);
|
||||
|
||||
// Delete any previous existing file
|
||||
if (CFile::fileExists( m_openedBNPFile ))
|
||||
|
|
@ -252,7 +252,7 @@ void BNPFileHandle::deleteFiles( const vector<string>& fileNames)
|
|||
{
|
||||
vector<string>::const_iterator it_vec;
|
||||
TPackedFilesList::iterator it_packed;
|
||||
uint32 OffsetFromBegining = 0;
|
||||
uint32 OffsetFromBeginning = 0;
|
||||
string tmpFile = m_openedBNPFile + ".tmp";
|
||||
|
||||
// create a new temporary bnp file with extension *.tmp
|
||||
|
|
@ -270,14 +270,14 @@ void BNPFileHandle::deleteFiles( const vector<string>& fileNames)
|
|||
{
|
||||
append(tmpFile, *it_packed);
|
||||
// Set now the new offset for the new header
|
||||
it_packed->m_pos = OffsetFromBegining;
|
||||
OffsetFromBegining += it_packed->m_size;
|
||||
it_packed->m_pos = OffsetFromBeginning;
|
||||
OffsetFromBeginning += it_packed->m_size;
|
||||
|
||||
it_packed++;
|
||||
}
|
||||
}
|
||||
|
||||
writeHeader(tmpFile, OffsetFromBegining);
|
||||
writeHeader(tmpFile, OffsetFromBeginning);
|
||||
|
||||
CFile::deleteFile( m_openedBNPFile );
|
||||
string src = m_openedBNPFile + ".tmp";
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@
|
|||
<item row="4" column="0" colspan="2">
|
||||
<widget class="QLabel" name="blurTreshholdLabel">
|
||||
<property name="text">
|
||||
<string>Fake motion blur treshold:</string>
|
||||
<string>Fake motion blur threshold:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<item row="0" column="0">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="title">
|
||||
<string>FTP Server informations</string>
|
||||
<string>FTP Server information</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
|
|
|
|||
|
|
@ -855,7 +855,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
|
||||
<source>Fake motion blur treshold:</source>
|
||||
<source>Fake motion blur threshold:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -855,7 +855,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
|
||||
<source>Fake motion blur treshold:</source>
|
||||
<source>Fake motion blur threshold:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -855,7 +855,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
|
||||
<source>Fake motion blur treshold:</source>
|
||||
<source>Fake motion blur threshold:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -855,7 +855,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
|
||||
<source>Fake motion blur treshold:</source>
|
||||
<source>Fake motion blur threshold:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ additionnal_paths = { "panoply", "data" };
|
|||
// The input path for textures
|
||||
input_path = "panoply";
|
||||
|
||||
// the ouput path for result textures
|
||||
// the output path for result textures
|
||||
output_path = "png";
|
||||
|
||||
// output files format used
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
SUMMARY
|
||||
|
||||
-> Export those informations from stdmat
|
||||
-> Export those information from stdmat
|
||||
-> How to use lightmaps
|
||||
-> How to use "color vertex"
|
||||
-> How to use "alpha vertex"
|
||||
|
|
@ -15,7 +15,7 @@ SUMMARY
|
|||
|
||||
-------------------------------------------------
|
||||
|
||||
-> Export those informations from stdmat
|
||||
-> Export those information from stdmat
|
||||
|
||||
* Ambiant color
|
||||
* Diffuse color
|
||||
|
|
|
|||
|
|
@ -714,7 +714,7 @@ void CNelExport::viewMesh (TimeValue time)
|
|||
// Delete the pointer
|
||||
IObjectViewer::releaseInterface (view);
|
||||
|
||||
// Collisions informations are no more used.
|
||||
// Collisions information are no more used.
|
||||
delete slInfo.RetrieverBank;
|
||||
delete slInfo.GlobalRetriever;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ void SLightBuild::convertFromMaxLight (INode *node,TimeValue tvTime)
|
|||
}
|
||||
#endif // (MAX_RELEASE < 4000)
|
||||
|
||||
// Get Soft Shadow informations
|
||||
// Get Soft Shadow information
|
||||
string sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_RADIUS, toString(NEL3D_APPDATA_SOFTSHADOW_RADIUS_DEFAULT));
|
||||
this->rSoftShadowRadius = (float)atof(sTmp.c_str());
|
||||
sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_CONELENGTH, toString(NEL3D_APPDATA_SOFTSHADOW_CONELENGTH_DEFAULT));
|
||||
|
|
|
|||
|
|
@ -1470,7 +1470,7 @@ bool CExportNel::mirrorPhysiqueSelection(INode &node, TimeValue tvTime, const st
|
|||
}
|
||||
|
||||
|
||||
// **** Build the ouput vertices
|
||||
// **** Build the output vertices
|
||||
std::vector<uint> vertOut;
|
||||
vertOut.reserve(tempVertex.size());
|
||||
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ RPatchMesh::RPatchMesh (PatchMesh *pmesh)
|
|||
SetNumVerts (pmesh->getNumVerts());
|
||||
}
|
||||
|
||||
// Getback the binding informations
|
||||
// Getback the binding information
|
||||
for (int v=0; v<pmesh->hooks.Count(); v++)
|
||||
{
|
||||
int hookPoint=pmesh->hooks[v].hookPoint;
|
||||
|
|
|
|||
|
|
@ -320,7 +320,7 @@ rollout assets_png_rollout "Properties"
|
|||
-- This script is a base script to include to add multiple functionality to your script
|
||||
|
||||
-- To use this script
|
||||
-- Include it in your script into the rollout at the begining.
|
||||
-- Include it in your script into the rollout at the beginning.
|
||||
-- Implement a do_it function to do the job in your rollout.
|
||||
-- The function should retun -1 if an arror occured, else the count of modification done
|
||||
-- It the function returns <1, the project will not be overwritten
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
-- This script is a base script to include to add multiple functionality to your script
|
||||
|
||||
-- To use this script
|
||||
-- Include it in your script into the rollout at the begining.
|
||||
-- Include it in your script into the rollout at the beginning.
|
||||
-- Implement a do_it function to do the job in your rollout.
|
||||
-- The function should retun -1 if an arror occured, else the count of modification done
|
||||
-- It the function returns <1, the project will not be overwritten
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
-- This script is a base script to include to add multiple functionality to your script
|
||||
|
||||
-- To use this script
|
||||
-- Include it in your script into the rollout at the begining.
|
||||
-- Include it in your script into the rollout at the beginning.
|
||||
-- Implement a do_it function to do the job in your rollout.
|
||||
-- The function should retun -1 if an arror occured, else the count of modification done
|
||||
-- It the function returns <1, the project will not be overwritten
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ int main(int argc, char* argv[])
|
|||
// Get the current pos
|
||||
sint32 curPos=output.getPos ();
|
||||
|
||||
// File at the begining
|
||||
// File at the beginning
|
||||
output.seek (0, NLMISC::IStream::begin);
|
||||
|
||||
// Write the triangle count
|
||||
|
|
|
|||
|
|
@ -529,10 +529,10 @@ int main( int argc, char ** argv )
|
|||
|
||||
// output path
|
||||
sint lastSeparator = CFile::getLastSeparator(outputFileName);
|
||||
string ouputPath;
|
||||
string outputPath;
|
||||
if( lastSeparator != -1 )
|
||||
{
|
||||
ouputPath = outputFileName.substr(0,lastSeparator+1);
|
||||
outputPath = outputFileName.substr(0,lastSeparator+1);
|
||||
}
|
||||
|
||||
// erase the unwanted extensions from map (modify the map, save it, and quit)
|
||||
|
|
@ -568,7 +568,7 @@ int main( int argc, char ** argv )
|
|||
if( dumpExtensions )
|
||||
{
|
||||
FILE * extListOutput;
|
||||
string extListFileName = ouputPath + "sheet_ext.txt";
|
||||
string extListFileName = outputPath + "sheet_ext.txt";
|
||||
if( !(extListOutput = fopen(extListFileName.c_str(),"w")) )
|
||||
{
|
||||
nlwarning("Can't open output file %s",extListFileName.c_str());
|
||||
|
|
@ -608,7 +608,7 @@ int main( int argc, char ** argv )
|
|||
// display the map
|
||||
//display();
|
||||
|
||||
string sheetListFileName = ouputPath + "sheets.txt";
|
||||
string sheetListFileName = outputPath + "sheets.txt";
|
||||
COFile output;
|
||||
if( !output.open(sheetListFileName,false,true) )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1170,7 +1170,7 @@ static void getRegisteredServicesFromCfgFile()
|
|||
|
||||
static void cbAESInfo(CMessage &msgin, const std::string &serviceName, TServiceId sid)
|
||||
{
|
||||
nlinfo("Updating all informations for AES and hosted service");
|
||||
nlinfo("Updating all information for AES and hosted service");
|
||||
|
||||
//
|
||||
// setup the list of all registered services
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ CREATE TABLE `shard` (
|
|||
`Version` varchar(64) collate latin1_general_ci NOT NULL default '',
|
||||
`DynPatchURL` varchar(255) collate latin1_general_ci NOT NULL default '',
|
||||
PRIMARY KEY (`ShardId`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards informations for login system';
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards information for login system';
|
||||
|
||||
|
||||
|
||||
|
|
@ -58,5 +58,5 @@ CREATE TABLE `user` (
|
|||
`ExtendedPrivilege` varchar(45) collate latin1_general_ci NOT NULL default '',
|
||||
`Cookie` varchar(255) collate latin1_general_ci NOT NULL default '',
|
||||
PRIMARY KEY (`UId`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users informations for login system';
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users information for login system';
|
||||
|
||||
|
|
|
|||
|
|
@ -1276,7 +1276,7 @@ Sur les nodes qui contiennent des fils on peut setuper la valeur de d
|
|||
h6_font_size="16" // Headline 6 font size
|
||||
paragraph_begin_space="12" // Space between paragraphs
|
||||
multi_line_space_factor="0.25" // Space between 2 lines of a paragraph. Factor of the font size
|
||||
td_begin_space="0" // Space at the begining of a table cell
|
||||
td_begin_space="0" // Space at the beginning of a table cell
|
||||
li_begin_space="4" // H space when "<IL>"
|
||||
ul_begin_space="12" // H space when "<UL>"
|
||||
li_indent="-10" // W space when "<LI>"
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@
|
|||
oncandrop="inv_can_drop" ondrop="inv_drop"
|
||||
item_slot="LEFT_HAND" value="%hand_l" other_hand_slot="handr" auto_grayed="false" />
|
||||
|
||||
<! - Must update some things when the item equiped change - >
|
||||
<! - Must update some things when the item equipped change - >
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)" action="phrase_update_from_hand" />
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)" action="phrase_update_from_hand" />
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:ENCHANT)" action="phrase_update_from_hand" />
|
||||
|
|
@ -1114,7 +1114,7 @@
|
|||
other_hand_slot="handr"
|
||||
auto_grayed="false"
|
||||
tooltip_parent="win" />
|
||||
<!-- Must update some things when the item equiped change -->
|
||||
<!-- Must update some things when the item equipped change -->
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)"
|
||||
action="phrase_update_from_hand" />
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)"
|
||||
|
|
|
|||
|
|
@ -757,7 +757,7 @@ struct CClientConfig
|
|||
// LUA //
|
||||
/////////
|
||||
|
||||
/// Allow Lua commands (commands begining with Lua)
|
||||
/// Allow Lua commands (commands beginning with Lua)
|
||||
bool AllowDebugLua;
|
||||
bool LoadLuaDebugger;
|
||||
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ public:
|
|||
float Bulk;
|
||||
/// Equip Time
|
||||
uint32 EquipTime;
|
||||
/// true if this item can be hidden when equiped
|
||||
/// true if this item can be hidden when equipped
|
||||
bool NeverHideWhenEquiped;
|
||||
|
||||
// FX
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ public:
|
|||
void setBuyMean(TBuyMean buyMean) { _BuyMean = buyMean; }
|
||||
// set the title of the window (actually applied when 'begin' is called)
|
||||
void setTitle(const ucstring &title) { _Title = title; }
|
||||
// update the 'buy' dialog window for the given sphrase sheet (the player has changed an equiped weapon => action stats change)
|
||||
// update the 'buy' dialog window for the given sphrase sheet (the player has changed an equipped weapon => action stats change)
|
||||
void updateSPhraseBuyDialog();
|
||||
// invalidate window coords
|
||||
void invalidateCoords();
|
||||
|
|
|
|||
|
|
@ -447,7 +447,7 @@ REGISTER_INTERFACE_USER_FCT("switch", userFctSwitch)
|
|||
/////////////////////////////////
|
||||
static DECLARE_INTERFACE_USER_FCT(userFctMax)
|
||||
{
|
||||
// compute type of ouput
|
||||
// compute type of output
|
||||
if (!promoteToNumericalBestType(args))
|
||||
{
|
||||
nlwarning("max : invalid entry");
|
||||
|
|
@ -479,7 +479,7 @@ REGISTER_INTERFACE_USER_FCT("max", userFctMax)
|
|||
/////////////////////////////////
|
||||
static DECLARE_INTERFACE_USER_FCT(userFctMin)
|
||||
{
|
||||
// compute type of ouput
|
||||
// compute type of output
|
||||
if (!promoteToNumericalBestType(args))
|
||||
{
|
||||
nlwarning("max : invalid entry");
|
||||
|
|
|
|||
|
|
@ -866,7 +866,7 @@ void CInventoryManager::equip(const std::string &bagPath, const std::string &inv
|
|||
const string sMsg = "ITEM:EQUIP";
|
||||
if (GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
|
||||
{
|
||||
// Fill the message (equiped inventory, equiped inventory slot, bag slot)
|
||||
// Fill the message (equipped inventory, equipped inventory slot, bag slot)
|
||||
out.serial(inventory);
|
||||
out.serial(invSlot);
|
||||
out.serial(indexInBag);
|
||||
|
|
@ -977,7 +977,7 @@ void CInventoryManager::unequip(const std::string &invPath)
|
|||
const string sMsg = "ITEM:UNEQUIP";
|
||||
if (GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
|
||||
{
|
||||
// Fill the message (equiped inventory, equiped inventory slot)
|
||||
// Fill the message (equipped inventory, equipped inventory slot)
|
||||
out.serial(inventory);
|
||||
out.serial(invSlot);
|
||||
NetMngr.push (out);
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ public:
|
|||
void equip(const std::string &bagPath, const std::string &invPath);
|
||||
// UnEquip a part of the player (same format as equip method)
|
||||
void unequip(const std::string &invPath);
|
||||
// auto equip an item (given by index) from the bag (return true if equiped)
|
||||
// auto equip an item (given by index) from the bag (return true if equipped)
|
||||
bool autoEquip(sint bagEntryIndex, bool allowReplace);
|
||||
|
||||
void dropOrDestroyItem(CDBCtrlSheet *item, NLMISC::CBitMemStream &out, uint16 quantity);
|
||||
|
|
|
|||
|
|
@ -1018,7 +1018,7 @@ void CViewText::updateTextContextMultiLineJustified(uint nMaxWidth, bool expandS
|
|||
}
|
||||
}
|
||||
|
||||
// Detect change of wordFormat at the begining of the word
|
||||
// Detect change of wordFormat at the beginning of the word
|
||||
if(isFormatTagChange((uint)spaceEnd, formatTagIndex))
|
||||
{
|
||||
getFormatTagChange((uint)spaceEnd, formatTagIndex, wordFormat);
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ void COSD::drawBorders(float bSizeW, float bSizeH, float x0, float y0, float x1,
|
|||
|
||||
//-----------------------------------------------
|
||||
// drawText :
|
||||
// Draw a text with all informations needed.
|
||||
// Draw a text with all information needed.
|
||||
//-----------------------------------------------
|
||||
void COSD::drawText(float x, float y, const ucstring &text, const CPen &pen)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ private:
|
|||
void drawTB();
|
||||
/// Draw the resize borders.
|
||||
void drawBorders(float bSizeW, float bSizeH, float x0, float y0, float x1, float y1, const CRGBA &color);
|
||||
/// Draw a text with all informations needed.
|
||||
/// Draw a text with all information needed.
|
||||
void drawText(float x, float y, const ucstring &text, const CPen &pen);
|
||||
|
||||
/// Test the mode of the OSD.
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ static void ColouriseBaanDoc(unsigned int startPos, int length, int initStyle, W
|
|||
}
|
||||
}
|
||||
if (sc.atLineEnd) {
|
||||
// Reset states to begining of colourise so no surprises
|
||||
// Reset states to beginning of colourise so no surprises
|
||||
// if different sets of lines lexed.
|
||||
visibleChars = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
|
|||
}
|
||||
|
||||
if (sc.atLineEnd) {
|
||||
// Reset states to begining of colourise so no surprises
|
||||
// Reset states to beginning of colourise so no surprises
|
||||
// if different sets of lines lexed.
|
||||
chPrevNonWhite = ' ';
|
||||
visibleChars = 0;
|
||||
|
|
|
|||
|
|
@ -495,7 +495,7 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName,
|
|||
}
|
||||
|
||||
/* If the object is sticked (ie not a skin), decide to delete the Current instance. Why? because the animation
|
||||
is changed according to the equiped item.
|
||||
is changed according to the equipped item.
|
||||
|
||||
Hence, For example, if a sword would be changed for a gun, then the new gun animation would take place,
|
||||
while Keeping the old sword shape. BAD.
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ void CPlayerR2CL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName
|
|||
}
|
||||
|
||||
/* If the object is sticked (ie not a skin), decide to delete the Current instance. Why? because the animation
|
||||
is changed according to the equiped item.
|
||||
is changed according to the equipped item.
|
||||
|
||||
Hence, For example, if a sword would be changed for a gun, then the new gun animation would take place,
|
||||
while Keeping the old sword shape. BAD.
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public:
|
|||
CActionHistoric();
|
||||
~CActionHistoric();
|
||||
void setDMC(IDynamicMapClient *dmc) { _DMC = dmc; }
|
||||
/** Signal the begining of a new action. Calling this twice in a row will not create
|
||||
/** Signal the beginning of a new action. Calling this twice in a row will not create
|
||||
* an empty action.
|
||||
*/
|
||||
void newSingleAction(const ucstring &name);
|
||||
|
|
|
|||
|
|
@ -1403,7 +1403,7 @@ void CSceneParser::updateCamera(double timeInSec)
|
|||
UAnimation *animation = _AnimationSet->getAnimation(idAnim);
|
||||
if(animation)
|
||||
{
|
||||
// Get Camera informations from the animation (Pos, Target, Roll).
|
||||
// Get Camera information from the animation (Pos, Target, Roll).
|
||||
UTrack* trackRollCam = animation->getTrackByName("Camera.roll");
|
||||
UTrack* trackFovCam = animation->getTrackByName("Camera.fov");
|
||||
UTrack* trackPosCam = animation->getTrackByName("Camera.PathPos");
|
||||
|
|
|
|||
|
|
@ -355,11 +355,11 @@
|
|||
<leaf name="EQUIP"
|
||||
sendto="EGS"
|
||||
format="u16 u16 u16"
|
||||
description="the client equip character (equiped inventory, equiped inventory slot, bag slot)" />
|
||||
description="the client equip character (equipped inventory, equipped inventory slot, bag slot)" />
|
||||
<leaf name="UNEQUIP"
|
||||
sendto="EGS"
|
||||
format="u16 u16"
|
||||
description="the client unequip character (equiped inventory, equiped inventory slot)" />
|
||||
description="the client unequip character (equipped inventory, equipped inventory slot)" />
|
||||
<leaf name="TEMP_TO_BAG"
|
||||
sendto="EGS"
|
||||
format="u16"
|
||||
|
|
|
|||
|
|
@ -723,7 +723,7 @@ lang=EN-US style='mso-ansi-language:EN-US'> <o:p></o:p></span></p>
|
|||
style='mso-ansi-language:EN-US'>sheet_client</span></u></b><span lang=EN-US
|
||||
style='mso-ansi-language:EN-US'> : This is sheet from which all
|
||||
non-modified attributes are extracted for the customized bot. NB: all visual
|
||||
informations are still extracted from the original sheet of the bot. <b
|
||||
information are still extracted from the original sheet of the bot. <b
|
||||
style='mso-bidi-font-weight:normal'><u><o:p></o:p></u></b></span></p>
|
||||
|
||||
<p class=MsoNormal><span lang=EN-US style='mso-ansi-language:EN-US'><o:p> </o:p></span></p>
|
||||
|
|
|
|||
|
|
@ -105,10 +105,10 @@ public:
|
|||
uint32 LacustreMagicResistance;
|
||||
uint32 JungleMagicResistance;
|
||||
uint32 PrimaryRootMagicResistance;
|
||||
sint32 HpBuff; // hp buff / debuff gived when item is equiped
|
||||
sint32 SapBuff; // sap buff / debuff gived when item is equiped
|
||||
sint32 StaBuff; // sta buff / debuff gived when item is equiped
|
||||
sint32 FocusBuff; // focus buff / debuff gived when item is equiped
|
||||
sint32 HpBuff; // hp buff / debuff gived when item is equipped
|
||||
sint32 SapBuff; // sap buff / debuff gived when item is equipped
|
||||
sint32 StaBuff; // sta buff / debuff gived when item is equipped
|
||||
sint32 FocusBuff; // focus buff / debuff gived when item is equipped
|
||||
|
||||
SKILLS::ESkills RequiredSkill; // required skill
|
||||
uint16 RequiredSkillLevel; // required skill level
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ public:
|
|||
sint8 HairType; // 0 - 3
|
||||
sint8 HairColor; // 0 - 5
|
||||
|
||||
// color for equipement slots (Only for pre-equiped perso created with sheet)
|
||||
// color for equipement slots (Only for pre-equipped perso created with sheet)
|
||||
sint8 JacketColor;
|
||||
sint8 TrousersColor;
|
||||
sint8 HatColor;
|
||||
|
|
@ -258,7 +258,7 @@ public:
|
|||
f.serial( EyesColor ); // 0 - 7
|
||||
f.serial( Tattoo ); // 0 = neutral, 1 - 64 Tattoo
|
||||
|
||||
// color for equipement slots (Only for pre-equiped perso created with sheet)
|
||||
// color for equipement slots (Only for pre-equipped perso created with sheet)
|
||||
f.serial( JacketColor );
|
||||
f.serial( TrousersColor );
|
||||
f.serial( HatColor );
|
||||
|
|
@ -307,7 +307,7 @@ public:
|
|||
f.serial( EyesColor ); // 0 - 7
|
||||
f.serial( Tattoo ); // 0 = neutral, 1 - 15 Tattoo
|
||||
|
||||
// color for equipement slots (Only for pre-equiped perso created with sheet)
|
||||
// color for equipement slots (Only for pre-equipped perso created with sheet)
|
||||
f.serial( JacketColor );
|
||||
f.serial( TrousersColor );
|
||||
f.serial( HatColor );
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@
|
|||
|
||||
<!-- __________________________________________________________ -->
|
||||
<invoke name="updateSessionInfo" msg="USS">
|
||||
<doc line="Update the informations of a planned or running session"/>
|
||||
<doc line="Update the information of a planned or running session"/>
|
||||
<doc line="Return 'invokeResult' : 0 : ok, session updated"/>
|
||||
<doc line=" 1 : unknown character"/>
|
||||
<doc line=" 2 : unknown session"/>
|
||||
|
|
|
|||
|
|
@ -1165,7 +1165,7 @@ ElectricityJewelProtection = 0.01001;
|
|||
MaxMagicProtection = 10; // Maximum protection can be gived by jewelry (clamp value), de 0 à 100 (pourcentage)
|
||||
HominBaseProtection = 10; // Homin base protection in generic magic damage type
|
||||
HominRacialProtection = 10; // Homin base protection in racial magic damage type
|
||||
MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equiped jewels recommandeds) * factor)
|
||||
MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equipped jewels recommandeds) * factor)
|
||||
//////////////////////////////
|
||||
// JEWEL RESISTANCE
|
||||
DesertResistance = 1; // In skill points bonus
|
||||
|
|
|
|||
|
|
@ -1203,7 +1203,7 @@ ElectricityJewelProtection = 0.01001;
|
|||
MaxMagicProtection = 10; // Maximum protection can be gived by jewelry (clamp value), de 0 à 100 (pourcentage)
|
||||
HominBaseProtection = 10; // Homin base protection in generic magic damage type
|
||||
HominRacialProtection = 10; // Homin base protection in racial magic damage type
|
||||
MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equiped jewels recommandeds) * factor)
|
||||
MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equipped jewels recommandeds) * factor)
|
||||
//////////////////////////////
|
||||
// JEWEL RESISTANCE
|
||||
DesertResistance = 1; // In skill points bonus
|
||||
|
|
|
|||
|
|
@ -569,7 +569,7 @@ namespace ADMIN
|
|||
FILE *fp = fopen("aes_nagios_report.txt", "wt");
|
||||
if (fp != NULL)
|
||||
{
|
||||
// ouput the current date
|
||||
// output the current date
|
||||
time_t t = now;
|
||||
fprintf(fp, "AESReportDate=%s", ::ctime(&t));
|
||||
|
||||
|
|
|
|||
|
|
@ -2513,10 +2513,10 @@ NLMISC_COMMAND(displayFightSheet,"display the sheet","<sheet name>")
|
|||
log.displayNL("value means the number of attacker sensitivity of the bot, equals to zero means the bot never mind the number of attackers on the target");
|
||||
|
||||
log.displayNL("- ScoreModulator [0 1]: %f score>ScoreModulator", sheet->ScoreModulator());
|
||||
log.displayNL("value means the minimum value (treshold) needed for the bot to attack, 0 means always, 1 never (also impossible)");
|
||||
log.displayNL("value means the minimum value (threshold) needed for the bot to attack, 0 means always, 1 never (also impossible)");
|
||||
|
||||
log.displayNL("- FearModulator [0 1]: %f score>FearModulator", sheet->FearModulator());
|
||||
log.displayNL("value means the minimum value (treshold) needed for the bot to flee, 0 means always, 1 never (also impossible)");
|
||||
log.displayNL("value means the minimum value (threshold) needed for the bot to flee, 0 means always, 1 never (also impossible)");
|
||||
|
||||
log.displayNL("- LifeLevelModulator [0 1]: %f value=LifeLevelModulator*lifeCoef+(1.f-LifeLevelModulator)*levelCoef", sheet->LifeLevelModulator());
|
||||
log.displayNL("value means the ratio between the life and level ratio, 1 means life is only take in count, 0 means level only take in count");
|
||||
|
|
@ -2545,10 +2545,10 @@ NLMISC_COMMAND(displayFightSheet,"display the sheet","<sheet name>")
|
|||
// value means the number of attacker sensitivity of the bot, equals to zero means the bot never mind the number of attackers on the target
|
||||
//
|
||||
// - ScoreModulator [0 1]: score>ScoreModulator
|
||||
// value means the minimum value (treshold) needed for the bot to attack, 0 means always, 1 never (also impossible)
|
||||
// value means the minimum value (threshold) needed for the bot to attack, 0 means always, 1 never (also impossible)
|
||||
//
|
||||
// - FearModulator [0 1]: score>FearModulator
|
||||
// value means the minimum value (treshold) needed for the bot to flee, 0 means always, 1 never (also impossible)
|
||||
// value means the minimum value (threshold) needed for the bot to flee, 0 means always, 1 never (also impossible)
|
||||
//
|
||||
// - LifeLevelModulator [0 1]: value=LifeLevelModulator*lifeCoef+(1.f-LifeLevelModulator)*levelCoef
|
||||
// value means the ratio between the life and level ratio, 1 means life is only take in count, 0 means level only take in count
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ The parsing is in fact done in 2 steps, and is not done the same in all services
|
|||
|
||||
The first step is common although not being done at the same time. It load the primitive file as a DOM document and check its XML validity and its content according to the world_editor_classes.xml file. In the EGS, this step is done at loading for all files declared in the common.cfg file. On the AIS, this is done after the service initialization, even after the service starts to tick, in commands in the config file. Thus a file can be loaded well after shard initialization while it is already running for a while.
|
||||
|
||||
The second step consist in interpreting that DOM tree loaded by the first step. This step differs greatly from one service to another. In the EGS, each manager (an EGS manager is a singleton which manage an aspect of the game) parses all primive files and extract the primitive nodes it needs. In the AIS, a special function is called just after the first step. That function parses the DOM tree and reacts to the nodes it encounters almost like a SAX parser. It extracts the current node informations (including its type, name, and eventually some simple field subnodes like its alias) and generates some NeL like commands, and then parses the primitive children. The commands are interpreted in a kind of state machine which constructs objects roughly reflecting the primitives.
|
||||
The second step consist in interpreting that DOM tree loaded by the first step. This step differs greatly from one service to another. In the EGS, each manager (an EGS manager is a singleton which manage an aspect of the game) parses all primive files and extract the primitive nodes it needs. In the AIS, a special function is called just after the first step. That function parses the DOM tree and reacts to the nodes it encounters almost like a SAX parser. It extracts the current node information (including its type, name, and eventually some simple field subnodes like its alias) and generates some NeL like commands, and then parses the primitive children. The commands are interpreted in a kind of state machine which constructs objects roughly reflecting the primitives.
|
||||
|
||||
The main advantage of that method is that it's possible to cache a binary representation of the commands to speedup the loading of the AIS. The drawback is the complexity involved by this dual parsing scheme and the difficulty to modify it and add new primitive types.
|
||||
|
||||
|
|
|
|||
|
|
@ -898,7 +898,7 @@ CCompiler::CCompiler()
|
|||
while (!file.eof())
|
||||
{
|
||||
file.getline(buffer, bufferSize);
|
||||
if (buffer[0]=='#' || buffer[0]=='\0') // Skip lines begining with a # and empty lines
|
||||
if (buffer[0]=='#' || buffer[0]=='\0') // Skip lines beginning with a # and empty lines
|
||||
continue;
|
||||
string line = buffer;
|
||||
const string sep1 = ": ";
|
||||
|
|
|
|||
|
|
@ -510,7 +510,7 @@ exp: lValue TOKEN_ASSIGNATOR expression
|
|||
NODE2 ($$, $3, $1);
|
||||
}
|
||||
| lValue TOKEN_ASSIGNATOR TOKEN_LP expression { ERROR_DETECTED ($$, "missing ')' at the end of the expression"); }
|
||||
| lValue TOKEN_ASSIGNATOR expression TOKEN_RP { ERROR_DETECTED ($$, "missing '(' at the begining of the expression");}
|
||||
| lValue TOKEN_ASSIGNATOR expression TOKEN_RP { ERROR_DETECTED ($$, "missing '(' at the beginning of the expression");}
|
||||
|
||||
printContent: printContent TOKEN_SEPARATOR TOKEN_CHAIN { NODE3 ($$, $1, CScriptVM::PUSH_PRINT_STRING, $3); }
|
||||
| TOKEN_CHAIN { NODE2 ($$, CScriptVM::PUSH_PRINT_STRING, $1); }
|
||||
|
|
@ -532,7 +532,7 @@ openStatement: TOKEN_IF TOKEN_LP condition TOKEN_RP statement
|
|||
NODE4 ($$, $3, CScriptVM::JE, sizeToJump, $5);
|
||||
}
|
||||
| TOKEN_IF TOKEN_LP condition statement {ERROR_DETECTED ($$, "missing ')' at the end of the if condition");}
|
||||
| TOKEN_IF condition TOKEN_RP statement {ERROR_DETECTED ($$, "missing '(' at the begining of the if condition");}
|
||||
| TOKEN_IF condition TOKEN_RP statement {ERROR_DETECTED ($$, "missing '(' at the beginning of the if condition");}
|
||||
| TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE openStatement
|
||||
{
|
||||
int sizeToJump0 = (int)$5.ByteCode->size() + 3; // 2 jump instructions to escape
|
||||
|
|
@ -540,7 +540,7 @@ openStatement: TOKEN_IF TOKEN_LP condition TOKEN_RP statement
|
|||
NODE7 ($$, $3, CScriptVM::JE, sizeToJump0, $5, CScriptVM::JUMP, sizeToJump1, $7);
|
||||
}
|
||||
| TOKEN_IF TOKEN_LP condition closedStatement TOKEN_ELSE openStatement { ERROR_DETECTED ($$, "missing ')' at the end of the if condition");}
|
||||
| TOKEN_IF condition TOKEN_RP closedStatement TOKEN_ELSE openStatement { ERROR_DETECTED ($$, "missing '(' at the begining of the if condition");}
|
||||
| TOKEN_IF condition TOKEN_RP closedStatement TOKEN_ELSE openStatement { ERROR_DETECTED ($$, "missing '(' at the beginning of the if condition");}
|
||||
| TOKEN_WHILE TOKEN_LP condition TOKEN_RP openStatement
|
||||
{
|
||||
int sizeToJump0 = (int)$5.ByteCode->size() + 3; // 2 jump instructions to escape
|
||||
|
|
@ -548,7 +548,7 @@ openStatement: TOKEN_IF TOKEN_LP condition TOKEN_RP statement
|
|||
NODE6 ($$, $3, CScriptVM::JE, sizeToJump0, $5, CScriptVM::JUMP, sizeToJump1);
|
||||
}
|
||||
| TOKEN_WHILE TOKEN_LP condition openStatement { ERROR_DETECTED ($$, "missing ')' at the end of the while condition");}
|
||||
| TOKEN_WHILE condition TOKEN_RP openStatement { ERROR_DETECTED ($$, "missing '(' at the begining of the while condition");}
|
||||
| TOKEN_WHILE condition TOKEN_RP openStatement { ERROR_DETECTED ($$, "missing '(' at the beginning of the while condition");}
|
||||
|
||||
closedStatement:TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE closedStatement
|
||||
{
|
||||
|
|
@ -565,7 +565,7 @@ closedStatement:TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE
|
|||
NODE6 ($$, $3, CScriptVM::JE, sizeToJump0, $5, CScriptVM::JUMP, sizeToJump1);
|
||||
}
|
||||
| TOKEN_WHILE TOKEN_LP condition closedStatement { ERROR_DETECTED ($$, "missing ')' at the end of the while condition");}
|
||||
| TOKEN_WHILE condition TOKEN_RP closedStatement { ERROR_DETECTED ($$, "missing '(' at the begining of the while condition");}
|
||||
| TOKEN_WHILE condition TOKEN_RP closedStatement { ERROR_DETECTED ($$, "missing '(' at the beginning of the while condition");}
|
||||
| exp TOKEN_PV { $$ = $1; }
|
||||
| printString TOKEN_PV { $$ = $1; }
|
||||
| logString TOKEN_PV { $$ = $1; }
|
||||
|
|
@ -583,10 +583,10 @@ closedStatement:TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE
|
|||
| TOKEN_INCRDECR context TOKEN_NAME TOKEN_PV { NODE7 ($$, $2, CScriptVM::PUSH_CONTEXT_VAR_VAL, $3, $1, $2, CScriptVM::SET_CONTEXT_VAR_VAL, $3); }
|
||||
| TOKEN_NAME TOKEN_ASSIGN expression TOKEN_PV { NODE6 ($$, CScriptVM::PUSH_VAR_VAL, $1, $3, $2, CScriptVM::SET_VAR_VAL, $1); }
|
||||
| TOKEN_NAME TOKEN_ASSIGN TOKEN_LP expression TOKEN_PV { ERROR_DETECTED ($$, "missing ')' at the end of the expression");}
|
||||
| TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the begining of the expression");}
|
||||
| TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the beginning of the expression");}
|
||||
| context TOKEN_NAME TOKEN_ASSIGN expression TOKEN_PV { NODE8 ($$, $1, CScriptVM::PUSH_CONTEXT_VAR_VAL, $1, $4, $3, $1, CScriptVM::SET_CONTEXT_VAR_VAL, $2); }
|
||||
| context TOKEN_NAME TOKEN_ASSIGN TOKEN_LP expression TOKEN_PV { ERROR_DETECTED ($$, "missing ')' at the end of the expression");}
|
||||
| context TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the begining of the expression");}
|
||||
| context TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the beginning of the expression");}
|
||||
| statementBlock { NODE1 ($$, $1); }
|
||||
| error TOKEN_PV { NODE0 ($$); }
|
||||
|
||||
|
|
@ -715,8 +715,8 @@ switch: TOKEN_SWITCH TOKEN_LP expression TOKEN_RP TOKEN_LA cases TOKEN_RA
|
|||
}
|
||||
}
|
||||
| TOKEN_SWITCH TOKEN_LP expression TOKEN_LA cases TOKEN_RA {ERROR_DETECTED ($$, "missing ')' at the end of the switch expression");}
|
||||
| TOKEN_SWITCH expression TOKEN_RP TOKEN_LA cases TOKEN_RA {ERROR_DETECTED ($$, "missing '(' at the begining of the switch expression");}
|
||||
| TOKEN_SWITCH TOKEN_LP expression TOKEN_RP cases TOKEN_RA {ERROR_DETECTED ($$, "missing '{' at the begining of the switch cases");}
|
||||
| TOKEN_SWITCH expression TOKEN_RP TOKEN_LA cases TOKEN_RA {ERROR_DETECTED ($$, "missing '(' at the beginning of the switch expression");}
|
||||
| TOKEN_SWITCH TOKEN_LP expression TOKEN_RP cases TOKEN_RA {ERROR_DETECTED ($$, "missing '{' at the beginning of the switch cases");}
|
||||
|
||||
|
||||
statementBlock: TOKEN_LA statements TOKEN_RA { $$ = $2; }
|
||||
|
|
|
|||
|
|
@ -1942,7 +1942,7 @@ yyreduce:
|
|||
|
||||
case 58:
|
||||
#line 544 "ai_service/script_parser.yacc"
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the expression");;}
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the expression");;}
|
||||
break;
|
||||
|
||||
case 59:
|
||||
|
|
@ -2010,7 +2010,7 @@ yyreduce:
|
|||
|
||||
case 71:
|
||||
#line 566 "ai_service/script_parser.yacc"
|
||||
{ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the if condition");;}
|
||||
{ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the if condition");;}
|
||||
break;
|
||||
|
||||
case 72:
|
||||
|
|
@ -2029,7 +2029,7 @@ yyreduce:
|
|||
|
||||
case 74:
|
||||
#line 574 "ai_service/script_parser.yacc"
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the if condition");;}
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the if condition");;}
|
||||
break;
|
||||
|
||||
case 75:
|
||||
|
|
@ -2048,7 +2048,7 @@ yyreduce:
|
|||
|
||||
case 77:
|
||||
#line 582 "ai_service/script_parser.yacc"
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the while condition");;}
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the while condition");;}
|
||||
break;
|
||||
|
||||
case 78:
|
||||
|
|
@ -2086,7 +2086,7 @@ yyreduce:
|
|||
|
||||
case 83:
|
||||
#line 599 "ai_service/script_parser.yacc"
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the while condition");;}
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the while condition");;}
|
||||
break;
|
||||
|
||||
case 84:
|
||||
|
|
@ -2176,7 +2176,7 @@ yyreduce:
|
|||
|
||||
case 101:
|
||||
#line 619 "ai_service/script_parser.yacc"
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the expression");;}
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the expression");;}
|
||||
break;
|
||||
|
||||
case 102:
|
||||
|
|
@ -2191,7 +2191,7 @@ yyreduce:
|
|||
|
||||
case 104:
|
||||
#line 625 "ai_service/script_parser.yacc"
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the expression");;}
|
||||
{ ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the expression");;}
|
||||
break;
|
||||
|
||||
case 105:
|
||||
|
|
@ -2361,12 +2361,12 @@ yyreduce:
|
|||
|
||||
case 117:
|
||||
#line 754 "ai_service/script_parser.yacc"
|
||||
{ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the switch expression");;}
|
||||
{ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the switch expression");;}
|
||||
break;
|
||||
|
||||
case 118:
|
||||
#line 755 "ai_service/script_parser.yacc"
|
||||
{ERROR_DETECTED (yyval.ByteCode, "missing '{' at the begining of the switch cases");;}
|
||||
{ERROR_DETECTED (yyval.ByteCode, "missing '{' at the beginning of the switch cases");;}
|
||||
break;
|
||||
|
||||
case 119:
|
||||
|
|
|
|||
|
|
@ -665,7 +665,7 @@ void addParam(const std::string ¶mStr, std::vector<TBrickParam::IIdPtr> &Par
|
|||
case TBrickParam::STA_WEIGHT_FACTOR:
|
||||
// $*STRUCT CSBrickParamStaWeightFactor TBrickParam::STA_WEIGHT_FACTOR
|
||||
// $*-i float StaFactor=0 // quantity of STA FACTOR of WEIGHT to use
|
||||
// $*-i unsigned StaConst=0 // quantity of STA Constante to use, used STA = StaFactor * (weight of equiped weapons) + StaConst
|
||||
// $*-i unsigned StaConst=0 // quantity of STA Constante to use, used STA = StaFactor * (weight of equipped weapons) + StaConst
|
||||
Params.push_back(new CSBrickParamStaWeightFactor(tail));
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -1029,7 +1029,7 @@ void CEntityBase::resetEntityModifier()
|
|||
_Skills._Skills[ i ].Modifier = 0;
|
||||
}
|
||||
|
||||
// Apply effect product by equiped items on local variables if race is homin
|
||||
// Apply effect product by equipped items on local variables if race is homin
|
||||
if( _Race < EGSPD::CPeople::EndHumanoid )
|
||||
{
|
||||
for( i = 0; i < SLOT_EQUIPMENT::NB_SLOT_EQUIPMENT; ++i )
|
||||
|
|
@ -1117,7 +1117,7 @@ void CEntityBase::resetEntityModifier()
|
|||
}
|
||||
}
|
||||
|
||||
// if current slot is equiped, get a pointer of form corresponding to item
|
||||
// if current slot is equipped, get a pointer of form corresponding to item
|
||||
if( id != CSheetId() )
|
||||
{
|
||||
const CStaticItem* itemForm = CSheets::getForm( id );
|
||||
|
|
|
|||
|
|
@ -1657,7 +1657,7 @@ void CFameManager::tickUpdate()
|
|||
|
||||
if (!_LastUpdatedRow.isValid())
|
||||
{
|
||||
// not a valid row restart at begining
|
||||
// not a valid row restart at beginning
|
||||
if (!_FamesOwners.empty())
|
||||
{
|
||||
it = _FamesOwners.begin();
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ void CSpecialPowerEnchantWeapon::apply()
|
|||
|
||||
// Test some cases that should be avoided on client (so don't bother adding an error message)
|
||||
|
||||
// If we have no equiped item
|
||||
// If we have no equipped item
|
||||
if (inv->getSlotCount()<=0)
|
||||
return;
|
||||
|
||||
// If equiped item is invalid
|
||||
// If equipped item is invalid
|
||||
CGameItemPtr item = inv->getItem(0);
|
||||
if (item == NULL)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -9938,7 +9938,7 @@ void CCharacter::sellItem( INVENTORIES::TInventory inv, uint32 slot, uint32 quan
|
|||
|
||||
if (item->getRefInventory() == _Inventory[INVENTORIES::equipment])
|
||||
{
|
||||
nlwarning("<CCharacter sellItem> character %s try to sell an equiped item %s, must not permited by client", _Id.toString().c_str(), sheet.toString().c_str() );
|
||||
nlwarning("<CCharacter sellItem> character %s try to sell an equipped item %s, must not permited by client", _Id.toString().c_str(), sheet.toString().c_str() );
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -937,7 +937,7 @@ void CCharacter::equipCharacter(INVENTORIES::TInventory dstInvId, uint32 dstSlot
|
|||
return;
|
||||
}
|
||||
|
||||
// if item is already referenced (maybe equiped), do not equip it
|
||||
// if item is already referenced (maybe equipped), do not equip it
|
||||
if (item->getRefInventory() != NULL)
|
||||
return;
|
||||
|
||||
|
|
@ -1097,7 +1097,7 @@ void CCharacter::unequipCharacter(INVENTORIES::TInventory invId, uint32 slot, bo
|
|||
CPhraseManager::getInstance().disengage( _EntityRowId, true );
|
||||
}
|
||||
|
||||
// Remove enchant weapon effects as they are linked to equiped item
|
||||
// Remove enchant weapon effects as they are linked to equipped item
|
||||
if (invId==INVENTORIES::handling && slot==0)
|
||||
{
|
||||
CSEffectPtr const effect = lookForActiveEffect(EFFECT_FAMILIES::PowerEnchantWeapon);
|
||||
|
|
@ -1784,7 +1784,7 @@ CGameItemPtr CCharacter::removeItemFromInventory(INVENTORIES::TInventory invId,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
// if item is equiped, unequip
|
||||
// if item is equipped, unequip
|
||||
// TODO : still needed ?
|
||||
// bool hand;
|
||||
// uint16 slotImg;
|
||||
|
|
|
|||
|
|
@ -2312,7 +2312,7 @@ ucstring CChatManager::filterClientInput(ucstring &text)
|
|||
{
|
||||
ucstring result;
|
||||
result.reserve(text.size());
|
||||
// 1st, remove any begining or ending white space
|
||||
// 1st, remove any beginning or ending white space
|
||||
ucstring::size_type pos = 0;
|
||||
|
||||
// skip begin white spaces
|
||||
|
|
|
|||
|
|
@ -582,7 +582,7 @@ bool CMonitorService::update ()
|
|||
if (var && (var->Type == CConfigFile::CVar::T_INT))
|
||||
count = var->asInt();
|
||||
|
||||
// Loop to the begining
|
||||
// Loop to the beginning
|
||||
if (primitiveToUpdate >= Entites.size())
|
||||
primitiveToUpdate = 0;
|
||||
|
||||
|
|
@ -687,7 +687,7 @@ bool CMonitorService::update ()
|
|||
// Next primitive
|
||||
primitiveToUpdate++;
|
||||
|
||||
// Loop to the begining
|
||||
// Loop to the beginning
|
||||
if (primitiveToUpdate >= Entites.size())
|
||||
primitiveToUpdate = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ CREATE TABLE `shard` (
|
|||
`DynPatchURL` varchar(255) default NULL,
|
||||
`FixedSessionId` int(10) unsigned default '0',
|
||||
PRIMARY KEY (`ShardId`)
|
||||
) TYPE=MyISAM COMMENT='contains all shards informations for login system';
|
||||
) TYPE=MyISAM COMMENT='contains all shards information for login system';
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1736,7 +1736,7 @@ endOfWelcomeUserResult:
|
|||
(session->getAccessType()==TAccessType::at_public), session->getLang(), session->getOrientation(), session->getDescription());
|
||||
}
|
||||
|
||||
// Update the informations of a planned or running session
|
||||
// Update the information of a planned or running session
|
||||
// Return 'invokeResult' : 0 : ok, session updated
|
||||
// 1 : unknown character
|
||||
// 2 : unknown session
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ public:
|
|||
bool CTestingTool::testSentence( const std::vector< NLMISC::CSheetId >& s1, const std::vector< NLMISC::CSheetId >& s2 );
|
||||
|
||||
private:
|
||||
// Sheet informations
|
||||
// Sheet information
|
||||
std::string _TestDescription;
|
||||
uint16 _IterationCount;
|
||||
uint16 _LevelMini;
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ protected:
|
|||
// Operations
|
||||
public:
|
||||
|
||||
// Plugin informations
|
||||
// Plugin information
|
||||
class CPlugin
|
||||
{
|
||||
public:
|
||||
|
|
@ -274,7 +274,7 @@ public:
|
|||
NLGEORGES::IEditPlugin *Plugin;
|
||||
};
|
||||
|
||||
// Array of plugin informations
|
||||
// Array of plugin information
|
||||
std::vector<CPlugin> PluginArray;
|
||||
|
||||
// Overrides
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// check howto for more informations : \\server\_RYZOM\how_to\leveldesign\ht_icon_search_en.doc
|
||||
// check howto for more information : \\server\_RYZOM\how_to\leveldesign\ht_icon_search_en.doc
|
||||
|
||||
SearchClientSrc = 0;
|
||||
ClientSrcPath = "R:\code\ryzom\src_v2\";
|
||||
|
|
|
|||
|
|
@ -777,7 +777,7 @@ void CExport::treatPattern (sint32 x, sint32 y,
|
|||
|
||||
// 4 - Cut the big zone into a set of unit zones
|
||||
|
||||
// - Build patch informations
|
||||
// - Build patch information
|
||||
|
||||
// Retrieve source patches
|
||||
vector<CPatchInfo> SrcPI;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue