Moved Background2D and Character2D OnLayer methods into header

CommitteeOfZero · Feb 8, 2025 · 73b8d60 · 73b8d60
1 parent b56f9ac
commit 73b8d60
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/background2d.cpp b/src/background2d.cpp
@@ -79,10 +79,6 @@ void Background2D::MainThreadOnLoad() {
   std::fill(Layers.begin(), Layers.end(), -1);
 }
 
-bool Background2D::OnLayer(int layer) {
-  return std::find(Layers.begin(), Layers.end(), layer) != Layers.end();
-}
-
 void Background2D::Render(int bgId, int layer) {
   if (Status != LS_Loaded || !OnLayer(layer) || !Show) return;
 

diff --git a/src/background2d.h b/src/background2d.h
@@ -60,7 +60,9 @@ class Background2D : public Loadable<Background2D> {
   void UnloadSync();
   void MainThreadOnLoad();
 
-  bool OnLayer(int layer);
+  bool OnLayer(int layer) {
+    return std::find(Layers.begin(), Layers.end(), layer) != Layers.end();
+  }
 
  private:
   Texture BgTexture;

diff --git a/src/character2d.cpp b/src/character2d.cpp
@@ -197,10 +197,6 @@ void Character2D::Update(float dt) {
   }
 }
 
-bool Character2D::OnLayer(int layer) {
-  return std::find(Layers.begin(), Layers.end(), layer) != Layers.end();
-}
-
 void Character2D::Render(int layer) {
   if (Status != LS_Loaded || !OnLayer(layer) || !Show) return;
 

diff --git a/src/character2d.h b/src/character2d.h
@@ -50,7 +50,9 @@ class Character2D : public Loadable<Character2D> {
   void UnloadSync();
   void MainThreadOnLoad();
 
-  bool OnLayer(int layer);
+  bool OnLayer(int layer) {
+    return std::find(Layers.begin(), Layers.end(), layer) != Layers.end();
+  }
 
  private:
   Texture CharaTexture;