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

Fixed: Compilation

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-18 20:39:47 +01:00
parent 0668ff8f04
commit 148c748d31
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/georges/form.cpp
View file

@ -289,7 +289,7 @@ bool CForm::insertParent (uint before, const std::string &filename, CForm *paren
else else
{ {
// Output an error // Output an error
warning (false, "insertParent", "Can't insert parent form (%s) that has not the same DFN.", filename); warning (false, "insertParent", "Can't insert parent form (%s) that has not the same DFN.", filename.c_str());
} }
return false; return false;

10
code/nel/src/georges/form_loader.cpp
View file

@ -171,7 +171,7 @@ CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad)
else else
{ {
// Output error // Output error
warning (false, "loadFormDfn", "Can't open the form file (%s).", filename); warning (false, "loadFormDfn", "Can't open the form file (%s).", filename.c_str());
// Delete the formDfn // Delete the formDfn
delete formDfn; delete formDfn;
@ -182,7 +182,7 @@ CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad)
catch (const Exception &e) catch (const Exception &e)
{ {
// Output error // Output error
warning (false, "loadFormDfn", "Error while loading the form (%s): %s", filename, e.what()); warning (false, "loadFormDfn", "Error while loading the form (%s): %s", filename.c_str(), e.what());
// Delete the formDfn // Delete the formDfn
delete formDfn; delete formDfn;
@ -257,7 +257,7 @@ UForm *CFormLoader::loadForm (const std::string &filename)
else else
{ {
// Output error // Output error
warning (false, "loadForm", "Can't open the form file (%s).", filename); warning (false, "loadForm", "Can't open the form file (%s).", filename.c_str());
// Delete the form // Delete the form
delete form; delete form;
@ -279,7 +279,7 @@ UForm *CFormLoader::loadForm (const std::string &filename)
catch (const Exception &e) catch (const Exception &e)
{ {
// Output error // Output error
warning (false, "loadForm", "Error while loading the form (%s): %s", filename, e.what()); warning (false, "loadForm", "Error while loading the form (%s): %s", filename.c_str(), e.what());
// Delete the form // Delete the form
delete form; delete form;
@ -317,7 +317,7 @@ void CFormLoader::warning (bool exception, const std::string &function, const ch
va_end( args ); va_end( args );
// Set the warning // Set the warning
NLGEORGES::warning (exception, "(CFormLoader::%s) : %s", function, buffer); NLGEORGES::warning (exception, "(CFormLoader::%s) : %s", function.c_str(), buffer);
} }
// *************************************************************************** // ***************************************************************************