Merge pull request #36 from Myggski/lobby-max-players

fix max-players in lobby

code/game/systems/bubble_controller_system.lua

@@ -1,9 +1,9 @@
 local bubble_controller = require "code.game.entities.bubble_controller"
+local player = require "code.game.entities.player"
 local helper = require "code.game.systems.bubble_controller_system_helper"
 local player_input = require "code.game.player_input"
 local system = require "code.engine.ecs.system"
 
-
 -- Is being called every frame
 local bubble_controller_system = system(function(self, dt)
   local entities = helper.sort_entities(self:to_list(bubble_controller.get_archetype()))
@@ -12,8 +12,11 @@ local bubble_controller_system = system(function(self, dt)
   local expected_number_of_bubbles = number_available_joysticks + 1 - number_active_controllers
 
   -- Remove all bubbles if max players is reached
-  if number_active_controllers >= GAME.MAX_PLAYERS then
-    helper.destroy_all(entities)
+  if #self:to_list(player.get_archetype()) >= GAME.MAX_PLAYERS then
+    if #entities > 0 then
+      helper.destroy_all(entities)
+    end
+
     return
   end
 

main.lua

@@ -86,10 +86,6 @@ function love.keypressed(key, scancode, is_repeat)
   if key == "escape" then
     love.event.quit()
   end
-
-  if key == "f2" then --set to whatever key you want to use
-    os.execute("cls")
-  end
 end
 
 function love.keyreleased(key, scancode)