Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2017-12-02 16:46:44 +01:00
parent 7b2b0c9310
commit e2dda1585d
7 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/misc/common.cpp
View file

@ -1356,7 +1356,7 @@ std::string escapeArgument(const std::string &arg)
// we can't escape %VARIABLE% on command-line under Windows
return arg;
#else
// characters to escapce, only " and $ (to prevent a $something replaced by an environment variable)
// characters to escape, only " and $ (to prevent a $something replaced by an environment variable)
static const char s_charsToEscape[] = "\"$";
std::string res;

1
code/nel/src/net/unified_network.cpp
View file

@ -828,7 +828,6 @@ void CUnifiedNetwork::addService(const string &name, const vector<CInetAddress>
for (uint i = 0; i < addr.size(); i++)
{
// first we have to look if we have a network that can established the connection
uint j = 0;
// it's loopback ip address, it's ok

41
code/ryzom/client/src/entities.cpp
View file

@ -800,7 +800,8 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
if (param == "transparency")
{
uint t;
if( fromString( values[i], t ) ) {
if (fromString(values[i], t))
{
t = max(0, min((int)t, 255));
makeInstanceTransparent(instance, t, t == 255);
}
@ -864,9 +865,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
float v;
CVector pos = getInstancePos(idx);
if( getRelativeFloatFromString( values[i], v ) ) {
if (getRelativeFloatFromString(values[i], v))
{
updateVector(param, pos, v, true);
} else {
}
else
{
updateVector(param, pos, v, false);
}
setInstancePos(idx, pos);
@ -877,9 +881,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
float v;
CVector rot = getInstanceRot(idx);
if( getRelativeFloatFromString( values[i], v ) ) {
if (getRelativeFloatFromString(values[i], v))
{
updateVector(param, rot, v, true);
} else {
}
else
{
updateVector(param, rot, v, false);
}
setInstanceRot(idx, rot);
@ -889,9 +896,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
float v;
CVector scale = instance.getScale();
if( getRelativeFloatFromString( values[i], v ) ) {
if (getRelativeFloatFromString(values[i], v))
{
updateVector(param, scale, v, true);
} else {
}
else
{
updateVector(param, scale, v, false);
}
instance.setScale(scale);
@ -909,9 +919,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
CVector size = CVector(width, depth, height);
float v;
if( getRelativeFloatFromString( values[i], v ) ) {
if (getRelativeFloatFromString(values[i], v))
{
updateVector(param, size, v, true);
} else {
}
else
{
updateVector(param, size, v, false);
}
primitive->setSize(size.x, size.y);
@ -922,9 +935,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
CVector pos = instance.getPos();
float v;
if( getRelativeFloatFromString( values[i], v ) ) {
if (getRelativeFloatFromString(values[i], v))
{
updateVector(param, _ShapeInstances[idx].PrimRelativePos, v, false);
} else {
}
else
{
if (param == "col pos x")
_ShapeInstances[idx].PrimRelativePos.x = v - pos.x;
if (param == "col pos y")
@ -1023,7 +1039,8 @@ CShapeInstanceReference CEntityManager::getShapeInstanceUnderPos(float x, float
// if intersect the bbox
NLMISC::CAABBox bbox;
//= _ShapeInstances[i].SelectionBox;
if(!_ShapeInstances[i].Instance.empty()) {
if(!_ShapeInstances[i].Instance.empty())
{
_ShapeInstances[i].Instance.getShapeAABBox(bbox);
CVector bbox_min;
CVector bbox_max;