eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 03:09:18 +02:00
Code Issues 121 Wiki Activity

Merge pull request #25 from MaSzyna-EU07/parser-logger-bug-fix

Browse Source 
bug fix related to commented out WriteLog call, also improved formatting of the modified code
This commit is contained in:
Hirek
2025-10-14 22:37:25 +02:00
committed by GitHub
parent 3590b87328 9901fc98b3
commit 62f8c2a225
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
parser.cpp
View File

@@ -253,17 +253,18 @@ 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 ) );
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
mIncludeParser->autoclear( m_autoclear );
if( mIncludeParser->mSize <= 0 ) {
ErrorLog( "Bad include: can't open file \"" + includefile + "\"" );
}
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 + "\"");
}
}
else
{
{
if(true == Global.file_binary_terrain_state)
{
WriteLog("SBT found, ignoring: " + includefile);
@@ -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)
WriteLog("including terrain: " + includefile);
if (Global.ParserLogIncludes) {
WriteLog("including terrain: " + includefile);
}
mIncludeParser =
std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction,
readParameters(includeparser));