diff --git a/code/ryzom/common/src/game_share/bmp4image.h b/code/ryzom/common/src/game_share/bmp4image.h index 4ecbd79f5..397a553b2 100644 --- a/code/ryzom/common/src/game_share/bmp4image.h +++ b/code/ryzom/common/src/game_share/bmp4image.h @@ -65,7 +65,7 @@ public: /*bool write(char *filename) { - FILE *outf=nlfopen(filename, "wb"); + FILE *outf=NLMISC::nlfopen(filename, "wb"); if (outf==NULL) return false; diff --git a/code/ryzom/server/src/pd_lib/pd_server_utils.h b/code/ryzom/server/src/pd_lib/pd_server_utils.h index 2e7c06363..2d3979f6b 100644 --- a/code/ryzom/server/src/pd_lib/pd_server_utils.h +++ b/code/ryzom/server/src/pd_lib/pd_server_utils.h @@ -283,7 +283,7 @@ public: if (_File != NULL) return false; - _File = nlfopen(filename, mode); + _File = NLMISC::nlfopen(filename, mode); if (_File == NULL) return false; diff --git a/code/ryzom/tools/pd_parser/templatizer.h b/code/ryzom/tools/pd_parser/templatizer.h index 5087e033a..e6b67708b 100644 --- a/code/ryzom/tools/pd_parser/templatizer.h +++ b/code/ryzom/tools/pd_parser/templatizer.h @@ -1009,7 +1009,7 @@ public: std::string result = ITemplatizerBloc::eval(env); FILE* f; - f = nlfopen(filename, (clearfile == "true" ? "w" : "a")); + f = NLMISC::nlfopen(filename, (clearfile == "true" ? "w" : "a")); if (f != NULL) { fwrite(result.c_str(), 1, result.size(), f); diff --git a/code/ryzom/tools/sheet_random_generator/srg_utilities.h b/code/ryzom/tools/sheet_random_generator/srg_utilities.h index 686b22418..2ba257b61 100644 --- a/code/ryzom/tools/sheet_random_generator/srg_utilities.h +++ b/code/ryzom/tools/sheet_random_generator/srg_utilities.h @@ -863,7 +863,7 @@ void loadNomenclatureCodes( const char *title, const vector& longNames, vector::iterator iarg; vector::const_iterator ivs; - if ( (rulesFile = nlfopen( filename, "r" )) == NULL ) + if ( (rulesFile = NLMISC::nlfopen( filename, "r" )) == NULL ) { nlwarning( "Can't find file %s", filename ); } @@ -1122,7 +1122,7 @@ void loadCSVFile( const char *filename, TMapDeliveryCallback deliveryCallback, b vector args; vector::iterator iarg; - if ( (file = nlfopen( filename, "r" )) == NULL ) + if ( (file = NLMISC::nlfopen( filename, "r" )) == NULL ) { nlwarning( "Can't find file %s", filename ); } @@ -1179,7 +1179,7 @@ void loadCSVFile( const char *filename, TVectorDeliveryCallback deliveryCallback vs args; vs::iterator iarg; - if ( (file = nlfopen( filename, "r" )) == NULL ) + if ( (file = NLMISC::nlfopen( filename, "r" )) == NULL ) { nlwarning( "Can't find file %s", filename ); } @@ -1218,7 +1218,7 @@ void loadValueFile( const char *filename, const vector& keyStrings, vector args; vector::iterator iarg; - if ( (rulesFile = nlfopen( filename, "r" )) == NULL ) + if ( (rulesFile = NLMISC::nlfopen( filename, "r" )) == NULL ) { nlwarning( "Can't find file %s", filename ); } @@ -1272,7 +1272,7 @@ void loadRulesFile( const char *filename, const vector& keyStrings, vector args; vector::iterator iarg; - if ( (rulesFile = nlfopen( filename, "r" )) == NULL ) + if ( (rulesFile = NLMISC::nlfopen( filename, "r" )) == NULL ) { nlwarning( "Can't find file %s", filename ); } @@ -1583,7 +1583,7 @@ void loadTitles( const string& sourceWords, const string& sourceBase, const stri void extractRawMaterialNames() { 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" ); for ( mss::const_iterator iun=UniqueRMNamesAndSheetCodeHead.begin(); iun!=UniqueRMNamesAndSheetCodeHead.end(); ++iun ) { @@ -2344,7 +2344,7 @@ public: if ( ! _Enabled ) return; - _File = nlfopen( filename, "wt" ); + _File = NLMISC::nlfopen( filename, "wt" ); fprintf( _File, ("\n\n" + title + "\n\n").c_str() ); } @@ -2409,7 +2409,7 @@ public: if ( ! _Enabled ) return; - _File = nlfopen( filename, "wt" ); + _File = NLMISC::nlfopen( filename, "wt" ); } ///