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

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2019-01-27 22:18:46 +01:00
parent 8617196c26 4dc7b3d3d0
commit 902d536e70
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AnimModel.cpp
View File

@@ -447,6 +447,7 @@ bool TAnimModel::Load(cParser *parser, bool ter)
std::string name = parser->getToken<std::string>(); std::string name = parser->getToken<std::string>();
std::string texture = parser->getToken<std::string>( false ); // tekstura (zmienia na małe) std::string texture = parser->getToken<std::string>( false ); // tekstura (zmienia na małe)
replace_slashes( name ); replace_slashes( name );
replace_slashes( texture );
if (!Init( name, texture )) if (!Init( name, texture ))
{ {
if (name != "notload") if (name != "notload")

2
version.h
View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (GL3) 27.01.2018, based on milek-0bf7238b, tmj-753cf7ee5" #define VERSION_INFO "M7 (GL3) 27.01.2018, based on milek-4dc7b3d3d, tmj-753cf7ee5"