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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-23 19:42:49 +01:00
commit f8e46962e2
1 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
code/ryzom/client/src/cdb_synchronised.cpp
View file

@ -132,22 +132,29 @@ void CCDBSynchronised::read( const string &fileName )
// value
token = strtok(buffer," \t");
if( token == NULL ) continue;
sint64 value;
fromString((const char*)token, value);
// property name
token = strtok(NULL," \n");
if( token == NULL ) continue;
string propName(token);
if (token)
{
sint64 value;
fromString((const char*)token, value);
// set the value of the property
ICDBNode::CTextId txtId(propName);
_Database->setProp(txtId,value);
// property name
token = strtok(NULL," \n");
if (token)
{
string propName(token);
// set the value of the property
ICDBNode::CTextId txtId(propName);
_Database->setProp(txtId, value);
}
}
delete [] buffer;
}
f.close();
} // read //
@ -160,7 +167,7 @@ void CCDBSynchronised::write( const string &fileName )
{
bool res = false;
if( _Database != 0 )
if (_Database != 0)
{
FILE * f = nlfopen(fileName, "w");
if (f)
@ -177,7 +184,6 @@ void CCDBSynchronised::write( const string &fileName )
{
nlwarning("<CCDBSynchronised::write> can't write %s : the database has not been initialized",fileName.c_str());
}
} // write //
@ -285,11 +291,9 @@ string CCDBSynchronised::getString( uint32 id )
{
return (*itStr).second;
}
else
{
nlwarning("<CCDBSynchronised::getString> string with id %d was not found",id);
return "";
}
nlwarning("<CCDBSynchronised::getString> string with id %d was not found",id);
return "";
} // getString //