aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-25 18:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-03-20 17:09:13 +01:00
commit 323d981318
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/common/src/game_share/bmp4image.h
View file

@ -65,7 +65,7 @@ public:
/*bool write(char *filename) /*bool write(char *filename)
{ {
FILE *outf=nlfopen(filename, "wb"); FILE *outf=NLMISC::nlfopen(filename, "wb");
if (outf==NULL) if (outf==NULL)
return false; return false;

2
code/ryzom/server/src/pd_lib/pd_server_utils.h
View file

@ -283,7 +283,7 @@ public:
if (_File != NULL) if (_File != NULL)
return false; return false;
_File = nlfopen(filename, mode); _File = NLMISC::nlfopen(filename, mode);
if (_File == NULL) if (_File == NULL)
return false; return false;

2
code/ryzom/tools/pd_parser/templatizer.h
View file

@ -1009,7 +1009,7 @@ public:
std::string result = ITemplatizerBloc::eval(env); std::string result = ITemplatizerBloc::eval(env);
FILE* f; FILE* f;
f = nlfopen(filename, (clearfile == "true" ? "w" : "a")); f = NLMISC::nlfopen(filename, (clearfile == "true" ? "w" : "a"));
if (f != NULL) if (f != NULL)
{ {
fwrite(result.c_str(), 1, result.size(), f); fwrite(result.c_str(), 1, result.size(), f);

16
code/ryzom/tools/sheet_random_generator/srg_utilities.h
View file

@ -863,7 +863,7 @@ void loadNomenclatureCodes( const char *title, const vector<string>& longNames,
vector<string>::iterator iarg; vector<string>::iterator iarg;
vector<string>::const_iterator ivs; vector<string>::const_iterator ivs;
if ( (rulesFile = nlfopen( filename, "r" )) == NULL ) if ( (rulesFile = NLMISC::nlfopen( filename, "r" )) == NULL )
{ {
nlwarning( "Can't find file %s", filename ); nlwarning( "Can't find file %s", filename );
} }
@ -1122,7 +1122,7 @@ void loadCSVFile( const char *filename, TMapDeliveryCallback deliveryCallback, b
vector<string> args; vector<string> args;
vector<string>::iterator iarg; vector<string>::iterator iarg;
if ( (file = nlfopen( filename, "r" )) == NULL ) if ( (file = NLMISC::nlfopen( filename, "r" )) == NULL )
{ {
nlwarning( "Can't find file %s", filename ); nlwarning( "Can't find file %s", filename );
} }
@ -1179,7 +1179,7 @@ void loadCSVFile( const char *filename, TVectorDeliveryCallback deliveryCallback
vs args; vs args;
vs::iterator iarg; vs::iterator iarg;
if ( (file = nlfopen( filename, "r" )) == NULL ) if ( (file = NLMISC::nlfopen( filename, "r" )) == NULL )
{ {
nlwarning( "Can't find file %s", filename ); nlwarning( "Can't find file %s", filename );
} }
@ -1218,7 +1218,7 @@ void loadValueFile( const char *filename, const vector<string>& keyStrings,
vector<string> args; vector<string> args;
vector<string>::iterator iarg; vector<string>::iterator iarg;
if ( (rulesFile = nlfopen( filename, "r" )) == NULL ) if ( (rulesFile = NLMISC::nlfopen( filename, "r" )) == NULL )
{ {
nlwarning( "Can't find file %s", filename ); nlwarning( "Can't find file %s", filename );
} }
@ -1272,7 +1272,7 @@ void loadRulesFile( const char *filename, const vector<string>& keyStrings,
vector<string> args; vector<string> args;
vector<string>::iterator iarg; vector<string>::iterator iarg;
if ( (rulesFile = nlfopen( filename, "r" )) == NULL ) if ( (rulesFile = NLMISC::nlfopen( filename, "r" )) == NULL )
{ {
nlwarning( "Can't find file %s", filename ); nlwarning( "Can't find file %s", filename );
} }
@ -1583,7 +1583,7 @@ void loadTitles( const string& sourceWords, const string& sourceBase, const stri
void extractRawMaterialNames() void extractRawMaterialNames()
{ {
loadCSVFile( ExtractNamesCsv.c_str(), readRMNames ); loadCSVFile( ExtractNamesCsv.c_str(), readRMNames );
FILE *output = nlfopen( CFile::getFilenameWithoutExtension( ExtractNamesCsv ) + "_output.csv", "wt" ); FILE *output = NLMISC::nlfopen( CFile::getFilenameWithoutExtension( ExtractNamesCsv ) + "_output.csv", "wt" );
fprintf( output, "Code;Name\n" ); fprintf( output, "Code;Name\n" );
for ( mss::const_iterator iun=UniqueRMNamesAndSheetCodeHead.begin(); iun!=UniqueRMNamesAndSheetCodeHead.end(); ++iun ) for ( mss::const_iterator iun=UniqueRMNamesAndSheetCodeHead.begin(); iun!=UniqueRMNamesAndSheetCodeHead.end(); ++iun )
{ {
@ -2344,7 +2344,7 @@ public:
if ( ! _Enabled ) if ( ! _Enabled )
return; return;
_File = nlfopen( filename, "wt" ); _File = NLMISC::nlfopen( filename, "wt" );
fprintf( _File, ("<html><head>\n<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n<title>" + title + "</title>\n</head><body>\n").c_str() ); fprintf( _File, ("<html><head>\n<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n<title>" + title + "</title>\n</head><body>\n").c_str() );
} }
@ -2409,7 +2409,7 @@ public:
if ( ! _Enabled ) if ( ! _Enabled )
return; return;
_File = nlfopen( filename, "wt" ); _File = NLMISC::nlfopen( filename, "wt" );
} }
/// ///