Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk into dir-restructure
This commit is contained in:
commit
403ed2600f
445 changed files with 49192 additions and 15431 deletions
|
|
@ -26,14 +26,14 @@ FileLoader::~FileLoader()
|
|||
free();
|
||||
}
|
||||
|
||||
bool FileLoader::loadFile(char *filename, bool log)
|
||||
bool FileLoader::loadFile(std::string const& fileName, bool log)
|
||||
{
|
||||
free();
|
||||
MPQFile mf(filename);
|
||||
MPQFile mf(fileName.c_str());
|
||||
if(mf.isEof())
|
||||
{
|
||||
if (log)
|
||||
printf("No such file %s\n", filename);
|
||||
printf("No such file %s\n", fileName.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ bool FileLoader::loadFile(char *filename, bool log)
|
|||
if (prepareLoadedData())
|
||||
return true;
|
||||
|
||||
printf("Error loading %s", filename);
|
||||
printf("Error loading %s", fileName.c_str());
|
||||
mf.close();
|
||||
free();
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue