Split get_foremost_layer and get_foremost_opaque_layer

SuperTux · Jan 24, 2024 · f62ddbc · f62ddbc
1 parent 651caaa
commit f62ddbc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
@@ -635,7 +635,7 @@ BadGuy::kill_fall()
 
     // Set the badguy layer to be the foremost, so that
     // this does not reveal secret tilemaps:
-    m_layer = Sector::get().get_foremost_layer() + 1;
+    m_layer = Sector::get().get_foremost_opaque_layer() + 1;
     // Start the dead-script.
     run_dead_script();
   }

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
@@ -263,7 +263,7 @@ void Yeti::take_hit(Player& )
 
     // Set the badguy layer to be above the foremost, so that
     // this does not reveal secret tilemaps:
-    m_layer = Sector::get().get_foremost_layer() + 1;
+    m_layer = Sector::get().get_foremost_opaque_layer() + 1;
     m_state = SQUISHED;
     m_state_timer.start(YETI_SQUISH_TIME);
     set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
@@ -394,7 +394,7 @@ Yeti::SnowExplosionParticle::SnowExplosionParticle(const Vector& pos, const Vect
   m_physic.set_velocity(velocity);
   m_physic.enable_gravity(true);
   set_state(STATE_FALLING);
-  m_layer = Sector::get().get_foremost_layer() + 1;
+  m_layer = Sector::get().get_foremost_opaque_layer() + 1;
 }
 
 std::vector<Direction>

diff --git a/src/object/player.cpp b/src/object/player.cpp
@@ -2121,7 +2121,7 @@ Player::draw(DrawingContext& context)
   }  // don't draw Tux
 
   else if (m_dying)
-    m_sprite->draw(context.color(), get_pos(), Sector::get().get_foremost_layer() + 1);
+    m_sprite->draw(context.color(), get_pos(), Sector::get().get_foremost_opaque_layer() + 1);
   else
     m_sprite->draw(context.color(), get_pos(), LAYER_OBJECTS + 1);
 

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
@@ -65,6 +65,7 @@ Sector::Sector(Level& parent) :
   m_level(parent),
   m_fully_constructed(false),
   m_foremost_layer(),
+  m_foremost_opaque_layer(),
   m_gravity(10.0f),
   m_collision_system(new CollisionSystem(*this)),
   m_text_object(add<TextObject>("Text"))
@@ -154,7 +155,8 @@ Sector::finish_construction(bool editable)
   m_initialized = false;
   flush_game_objects();
 
-  m_foremost_layer = calculate_foremost_layer();
+  m_foremost_layer = calculate_foremost_layer(false);
+  m_foremost_opaque_layer = calculate_foremost_layer();
 
   process_resolve_requests();
 
@@ -302,14 +304,14 @@ Sector::get_active_region() const
 }
 
 int
-Sector::calculate_foremost_layer() const
+Sector::calculate_foremost_layer(bool including_transparent) const
 {
   int layer = LAYER_BACKGROUND0;
   for (auto& tm : get_objects_by_type<TileMap>())
   {
     if (tm.get_layer() > layer)
     {
-      if ( (tm.get_alpha() < 1.0f) )
+      if ( including_transparent && tm.get_alpha() < 1.0f )
       {
         layer = tm.get_layer() - 1;
       }
@@ -323,6 +325,12 @@ Sector::calculate_foremost_layer() const
   return layer;
 }
 
+int
+Sector::get_foremost_opaque_layer() const
+{
+  return m_foremost_opaque_layer;
+}
+
 int
 Sector::get_foremost_layer() const
 {

diff --git a/src/supertux/sector.hpp b/src/supertux/sector.hpp
@@ -130,6 +130,7 @@ class Sector final : public Base::Sector
 
   Rectf get_active_region() const;
 
+  int get_foremost_opaque_layer() const;
   int get_foremost_layer() const;
 
   /** returns the editor size (in tiles) of a sector */
@@ -156,7 +157,7 @@ class Sector final : public Base::Sector
   virtual bool before_object_add(GameObject& object) override;
   virtual void before_object_remove(GameObject& object) override;
 
-  int calculate_foremost_layer() const;
+  int calculate_foremost_layer(bool including_transparent = true) const;
 
   /** Convert tiles into their corresponding GameObjects (e.g.
       bonusblocks, add light to lava tiles) */
@@ -167,6 +168,7 @@ class Sector final : public Base::Sector
 
   bool m_fully_constructed;
   int m_foremost_layer;
+  int m_foremost_opaque_layer;
 
   float m_gravity;