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

build 2010181. t3d parser fix, crash fix

Browse Source
This commit is contained in:
tmj-fstate
2020-10-18 16:55:20 +02:00
parent 94a3b2fa1f
commit ccfdf5e003
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Model3d.cpp
View File

@@ -213,7 +213,7 @@ std::pair<int, int> TSubModel::Load( cParser &parser, bool dynamic )
auto token { parser.getToken<std::string>() }; auto token { parser.getToken<std::string>() };
if( token != "type:" ) { if( token != "type:" ) {
std::string errormessage { std::string errormessage {
"Bad model: expected submodel type definition not found while loading model \"" + pRoot->NameGet() + "\"" "Bad model: expected submodel type definition not found while loading model \"" + parser.Name() + "\""
+ "\ncurrent model data stream content: \"" }; + "\ncurrent model data stream content: \"" };
auto count { 10 }; auto count { 10 };
while( ( true == parser.getTokens() ) while( ( true == parser.getTokens() )
@@ -509,7 +509,7 @@ std::pair<int, int> TSubModel::Load( cParser &parser, bool dynamic )
} }
token = parser.getToken<std::string>(); token = parser.getToken<std::string>();
} }
if( token == "numverts:" ) if( ( token == "numverts:" ) || ( token == "numverts" ) )
{ // normalna lista wierzchołków { // normalna lista wierzchołków
/* /*
// Ra 15-01: to wczytać jako tekst - jeśli pierwszy znak zawiera "*", to // Ra 15-01: to wczytać jako tekst - jeśli pierwszy znak zawiera "*", to

2
version.h
View File

@@ -2,4 +2,4 @@
#define VERSION_MAJOR 20 #define VERSION_MAJOR 20
#define VERSION_MINOR 1018 #define VERSION_MINOR 1018
#define VERSION_REVISION 0 #define VERSION_REVISION 1