fixes

RigsOfRods · Sep 16, 2021 · 13c9158 · 13c9158
1 parent 1194484
commit 13c9158
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/source/main/physics/Actor.cpp b/source/main/physics/Actor.cpp
@@ -3186,7 +3186,7 @@ void Actor::updateVisual(float dt)
 
     // update exhausts
     // TODO: Move to GfxActor, don't forget dt*m_simulation_speed
-    if (!m_disable_smoke && ar_engine && exhausts.size() > 0)
+    if (ar_engine && exhausts.size() > 0)
     {
         std::vector<exhaust_t>::iterator it;
         for (it = exhausts.begin(); it != exhausts.end(); it++)
@@ -3198,7 +3198,7 @@ void Actor::updateVisual(float dt)
             ParticleEmitter* emit = it->smoker->getEmitter(0);
             it->smokeNode->setPosition(ar_nodes[it->emitterNode].AbsPosition);
             emit->setDirection(dir);
-            if (ar_engine->GetSmoke() != -1.0)
+            if (!m_disable_smoke && ar_engine->GetSmoke() != -1.0)
             {
                 emit->setEnabled(true);
                 emit->setColour(ColourValue(0.0, 0.0, 0.0, 0.02 + ar_engine->GetSmoke() * 0.06));

diff --git a/source/main/physics/ActorSpawner.cpp b/source/main/physics/ActorSpawner.cpp
@@ -657,6 +657,10 @@ void ActorSpawner::ProcessTurbojet(RigDef::Turbojet & def)
     tj->tjet_visual.SetNodes(front, back, ref);
     tj->tjet_visual.SetupVisuals(def, m_actor->ar_num_aeroengines,
         propname, nozzle_ent, afterburn_ent);
+    if (!m_actor->m_disable_smoke)
+    {
+        tj->tjet_visual.SetVisible(true);
+    }
 
     m_actor->ar_aeroengines[m_actor->ar_num_aeroengines]=tj;
     m_actor->ar_driveable=AIRPLANE;