From d942d43f6378b01f79cbfab805db66bdbeba2b37 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 29 Jun 2020 15:32:09 +0200 Subject: [PATCH] minor bug fixes --- eu07.ico | Bin 2238 -> 16958 bytes material.cpp | 4 ++-- parser.cpp | 16 +++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/eu07.ico b/eu07.ico index 8103741aeb8877f1e3525a76e80fa21d96511fe0..af04013ca80b4f67c049534882a4c6d137e3d52f 100644 GIT binary patch literal 16958 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 literal 2238 zcmeH_y>8nu5XX;{1WU3do|ddN0uOnB?kS3neFURVVDuS`z)xWK5rU%Vb7Ttg2!WBQ zbH)sU*}Ef8qMdBbkinOn#sB^8gCq!G=x;s;vJ!rm02j2nBA=6gAvY9fTj%n5^|QIz zz~_Ar5BCr7?Q0H;Z4dpShum)9_SY?}{*vC`!Scrv7MBayZFi6p|Nf_k$NeL$ey(2i zJO|D@PXGE>o`UxrjF?Hq_U3xNt;X zjG~U`uhAIOG-a6~`yh_EBp@X*4`Sq<#IVG!A&(s};hca?gI&iS5)wY`Izzz*X(7%d zQqFO1F`W`8mwrQkJ(3($1=h-emccSQf2M+7vs%2LOr8lRu_+AS5aVYeb_`X~qiIj- q6b)UD1Bc1;^$UPg?*TqN15Ezcp8zs-?Zq>=zh8s*FV6eJwf_g~(_x+f diff --git a/material.cpp b/material.cpp index a2cd1fd3..50052bb5 100644 --- a/material.cpp +++ b/material.cpp @@ -483,7 +483,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { erase_leading_slashes( filename ); } - auto const databanklookup { find_in_databank( ToLower( filename ) ) }; + auto const databanklookup { find_in_databank( filename ) }; if( databanklookup != null_handle ) { return databanklookup; } @@ -528,7 +528,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { */ // HACK: create parse info for material finalize() method cParser materialparser( - "texture1: " + Filename, + "texture1: \"" + Filename + "\"", cParser::buffer_TEXT ); material.deserialize( materialparser, Loadnow ); } diff --git a/parser.cpp b/parser.cpp index 1ba87a48..bc7ec1f5 100644 --- a/parser.cpp +++ b/parser.cpp @@ -288,7 +288,7 @@ void cParser::skipComment( std::string const &Endmark ) { // pobieranie znaków ++mLine; } input += c; - if( input.find( Endmark ) != std::string::npos ) // szukanie znacznika końca + if( input == Endmark ) // szukanie znacznika końca break; if( input.size() >= endmarksize ) { // keep the read text short, to avoid pointless string re-allocations on longer comments @@ -300,9 +300,9 @@ void cParser::skipComment( std::string const &Endmark ) { // pobieranie znaków bool cParser::findQuotes( std::string &String ) { - if( String.rfind( '\"' ) != std::string::npos ) { + if( String.back() == '\"' ) { - String.erase( String.rfind( '\"' ), 1 ); + String.pop_back(); String += readQuotes(); return true; } @@ -311,12 +311,14 @@ bool cParser::findQuotes( std::string &String ) { bool cParser::trimComments(std::string &String) { - for (commentmap::iterator cmIt = mComments.begin(); cmIt != mComments.end(); ++cmIt) + for (auto const &comment : mComments) { - if (String.rfind((*cmIt).first) != std::string::npos) + if( String.size() < comment.first.size() ) { continue; } + + if (String.compare( String.size() - comment.first.size(), comment.first.size(), comment.first ) == 0) { - skipComment((*cmIt).second); - String.resize(String.rfind((*cmIt).first)); + skipComment(comment.second); + String.resize(String.rfind(comment.first)); return true; } }