eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 13:59:19 +02:00
Code Issues 123 Wiki Activity

minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2020-06-29 15:32:09 +02:00
parent 065c490bea
commit d942d43f63
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
eu07.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 17 KiB

4
material.cpp
View File

@@ -483,7 +483,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) {
erase_leading_slashes( filename ); erase_leading_slashes( filename );
} }
auto const databanklookup { find_in_databank( ToLower( filename ) ) }; auto const databanklookup { find_in_databank( filename ) };
if( databanklookup != null_handle ) { if( databanklookup != null_handle ) {
return databanklookup; return databanklookup;
} }
@@ -528,7 +528,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) {
*/ */
// HACK: create parse info for material finalize() method // HACK: create parse info for material finalize() method
cParser materialparser( cParser materialparser(
"texture1: " + Filename, "texture1: \"" + Filename + "\"",
cParser::buffer_TEXT ); cParser::buffer_TEXT );
material.deserialize( materialparser, Loadnow ); material.deserialize( materialparser, Loadnow );
} }

16
parser.cpp
View File

@@ -288,7 +288,7 @@ void cParser::skipComment( std::string const &Endmark ) { // pobieranie znaków
++mLine; ++mLine;
} }
input += c; input += c;
if( input.find( Endmark ) != std::string::npos ) // szukanie znacznika końca if( input == Endmark ) // szukanie znacznika końca
break; break;
if( input.size() >= endmarksize ) { if( input.size() >= endmarksize ) {
// keep the read text short, to avoid pointless string re-allocations on longer comments // 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 ) { 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(); String += readQuotes();
return true; return true;
} }
@@ -311,12 +311,14 @@ bool cParser::findQuotes( std::string &String ) {
bool cParser::trimComments(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); skipComment(comment.second);
String.resize(String.rfind((*cmIt).first)); String.resize(String.rfind(comment.first));
return true; return true;
} }
} }