16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 22:59:19 +02:00

merge (with bugs)

This commit is contained in:
VB
2017-04-24 20:52:21 +02:00
40 changed files with 5449 additions and 2493 deletions

View File

@@ -342,6 +342,7 @@ private:
int *iModel; // zawartość pliku binarnego
int iSubModelsCount; // Ra: używane do tworzenia binarnych
std::string asBinary; // nazwa pod którą zapisać model binarny
std::string m_filename;
public:
inline TSubModel * GetSMRoot()
{
@@ -382,7 +383,8 @@ public:
void Init();
std::string NameGet()
{
return Root ? Root->pName : NULL;
// return Root ? Root->pName : NULL;
return m_filename;
};
int TerrainCount();
TSubModel * TerrainSquare(int n);