Merge with develop

This commit is contained in:
kervala 2016-12-12 12:03:15 +01:00
parent 5acd03d77d
commit d3dc21ad46

View file

@ -21,6 +21,7 @@
#include "nel/misc/variable.h" #include "nel/misc/variable.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/common.h"
#include "game_share/persistent_data.h" #include "game_share/persistent_data.h"
@ -52,7 +53,7 @@ CCharacterScanJob::CCharacterScanJob()
// open the output file for the character table // open the output file for the character table
std::string filename= "char_tbl.csv"; std::string filename= "char_tbl.csv";
_CharTblFile = nlfopen(filename, "wb"); _CharTblFile = NLMISC::nlfopen(filename, "wb");
if (_CharTblFile==NULL) if (_CharTblFile==NULL)
{ {
nlwarning("Failed to open output file: %s",filename.c_str()); nlwarning("Failed to open output file: %s",filename.c_str());
@ -73,7 +74,7 @@ CCharacterScanJob::~CCharacterScanJob()
{ {
// create the output file name and open the file for writing // create the output file name and open the file for writing
std::string filename="char_stats_"+(*it).first+".csv"; std::string filename="char_stats_"+(*it).first+".csv";
FILE* f = nlfopen(filename, "wb"); FILE* f = NLMISC::nlfopen(filename, "wb");
if (f==NULL) if (f==NULL)
{ {
nlwarning("Failed to open output file: %s",filename.c_str()); nlwarning("Failed to open output file: %s",filename.c_str());