Merge 1dfb607 into 6ab9b86

GlPortal · Jan 16, 2018 · ae22ef5 · ae22ef5
2 parents 6ab9b86 + 1dfb607
commit ae22ef5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/include/radix/GameWorld.hpp b/include/radix/GameWorld.hpp
@@ -2,6 +2,7 @@
 #define RADIX_GAME_WORLD_HPP
 
 #include <list>
+#include <algorithm>
 
 namespace radix {
 
@@ -13,6 +14,7 @@ class GameWorld {
   InputSource &input;
   GameWorld(InputSource &input);
   void addScreen(Screen& screen);
+  void removeScreen(Screen& screen);
   std::list<Screen*>* getScreens();
 private:
   std::list<Screen*> screens;

diff --git a/source/GameWorld.cpp b/source/GameWorld.cpp
@@ -9,6 +9,10 @@ void GameWorld::addScreen(Screen &screen) {
   screens.push_back(&screen);
 }
 
+void GameWorld::removeScreen(Screen &screen) {
+  screens.erase(std::remove(screens.begin(), screens.end(), &screen), screens.end());
+}
+
 std::list<Screen*>* GameWorld::getScreens() {
   return &screens;
 }