scenery: don't activate generic static scenery

1 files changed, 16 insertions, 6 deletions

diff --git a/src/scenery.cpp b/src/scenery.cpp
index e103d679..cf2c6e98 100644
--- a/src/scenery.cpp
+++ b/src/scenery.cpp
@@ -88,12 +88,22 @@ void scenery::update(float dt, const anim_atlas& anim)
 
 bool scenery::activate(const anim_atlas& atlas)
 {
-    if (!active) {
-        fm_assert(frame == 0 || frame == atlas.info().nframes-1);
-        active = true;
-        return true;
-    } else
-        return false;
+    switch (type)
+    {
+    default:
+    case scenery_type::none:
+    case scenery_type::generic:
+        break;
+    case scenery_type::door:
+        if (!active)
+        {
+            fm_assert(frame == 0 || frame == atlas.info().nframes-1);
+            active = true;
+            return true;
+        }
+        break;
+    }
+    return false;
 }
 
 } // namespace floormat