mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-03-22 15:05:03 +01:00
bug fix related to commented out WriteLog call, also improved formatting of the modified code
This commit is contained in:
24
parser.cpp
24
parser.cpp
@@ -253,13 +253,14 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
||||
{
|
||||
if (false == contains(includefile, "_ter.scm"))
|
||||
{
|
||||
if (Global.ParserLogIncludes)
|
||||
//WriteLog("including: " + includefile);
|
||||
mIncludeParser = std::make_shared<cParser>( includefile, buffer_FILE, mPath, LoadTraction, readParameters( *this ) );
|
||||
if (Global.ParserLogIncludes) {
|
||||
// WriteLog("including: " + includefile);
|
||||
}
|
||||
mIncludeParser = std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction, readParameters(*this));
|
||||
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
||||
mIncludeParser->autoclear( m_autoclear );
|
||||
if( mIncludeParser->mSize <= 0 ) {
|
||||
ErrorLog( "Bad include: can't open file \"" + includefile + "\"" );
|
||||
mIncludeParser->autoclear(m_autoclear);
|
||||
if (mIncludeParser->mSize <= 0) {
|
||||
ErrorLog("Bad include: can't open file \"" + includefile + "\"");
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -271,8 +272,9 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Global.ParserLogIncludes)
|
||||
if (Global.ParserLogIncludes) {
|
||||
WriteLog("including terrain: " + includefile);
|
||||
}
|
||||
mIncludeParser = std::make_shared<cParser>(includefile, buffer_FILE, mPath,
|
||||
LoadTraction, readParameters(*this));
|
||||
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
||||
@@ -301,8 +303,9 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
||||
{
|
||||
if (false == contains(includefile, "_ter.scm"))
|
||||
{
|
||||
if (Global.ParserLogIncludes)
|
||||
//WriteLog("including: " + includefile);
|
||||
if (Global.ParserLogIncludes) {
|
||||
// WriteLog("including: " + includefile);
|
||||
}
|
||||
mIncludeParser = std::make_shared<cParser>(
|
||||
includefile, buffer_FILE, mPath, LoadTraction, readParameters(includeparser));
|
||||
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
||||
@@ -321,8 +324,9 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Global.ParserLogIncludes)
|
||||
if (Global.ParserLogIncludes) {
|
||||
WriteLog("including terrain: " + includefile);
|
||||
}
|
||||
mIncludeParser =
|
||||
std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction,
|
||||
readParameters(includeparser));
|
||||
|
||||
Reference in New Issue
Block a user