eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts for merge

Browse Source
This commit is contained in:
Hirek
2025-09-04 20:27:45 +02:00
parent 311a827ade 6b21737ec4
commit 072165aae3
7 changed files with 631 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DynObj.cpp
View File

@@ -770,7 +770,7 @@ void TDynamicObject::UpdateWiper(TAnim* pAnim)
if (!pAnim || !pAnim->smElement)
return;
int i = pAnim->iNumber;
int i = pAnim->iNumber;
// odwaramy animacje dla parzystych indexow
const double rotateAngle = (i + 1) % 2 == 0 ? -MoverParameters->WiperAngle : MoverParameters->WiperAngle;
@@ -6726,12 +6726,12 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co
else if (token == "wiperFromPark:")
{
sWiperFromPark.deserialize(parser, sound_type::single);
sWiperFromPark.owner(this);
sWiperFromPark.owner(this);
}
else if (token == "wiperToPark:")
{
sWiperToPark.deserialize(parser, sound_type::single);
sWiperToPark.owner(this);
sWiperToPark.owner(this);
}
else if (token == "retarder:") {