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

minor refactoring and diagnostics enhancements, fixed some memory leaks, radiostop test command

Browse Source
This commit is contained in:
tmj-fstate
2017-08-30 19:54:43 +02:00
parent decbcd8055
commit e5980f946c
27 changed files with 1584 additions and 1617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AnimModel.cpp
View File

@@ -523,11 +523,11 @@ bool TAnimModel::Load(cParser *parser, bool ter)
return true;
}
TAnimContainer * TAnimModel::AddContainer(char *pName)
TAnimContainer * TAnimModel::AddContainer(std::string const &Name)
{ // dodanie sterowania submodelem dla egzemplarza
if (!pModel)
return NULL;
TSubModel *tsb = pModel->GetFromName(pName);
TSubModel *tsb = pModel->GetFromName(Name);
if (tsb)
{
TAnimContainer *tmp = new TAnimContainer();
@@ -539,16 +539,16 @@ TAnimContainer * TAnimModel::AddContainer(char *pName)
return NULL;
}
TAnimContainer * TAnimModel::GetContainer(char *pName)
TAnimContainer * TAnimModel::GetContainer(std::string const &Name)
{ // szukanie/dodanie sterowania submodelem dla egzemplarza
if (!pName)
if (true == Name.empty())
return pRoot; // pobranie pierwszego (dla obrotnicy)
TAnimContainer *pCurrent;
for (pCurrent = pRoot; pCurrent != NULL; pCurrent = pCurrent->pNext)
// if (pCurrent->GetName()==pName)
if (std::string(pName) == pCurrent->NameGet())
if (Name == pCurrent->NameGet())
return pCurrent;
return AddContainer(pName);
return AddContainer(Name);
}
// przeliczenie animacji - jednorazowo na klatkę