Merge branch 'master' into 'moreitems'

# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py

squirrelbattle/game.py

@@ -97,10 +97,14 @@ class Game:
             screen.noutrefresh()
             self.display_actions(DisplayActions.REFRESH)
             curses.doupdate()
-            key = screen.getkey()
+            try:
+                key = screen.getkey()
+            except KeyboardInterrupt:
+                exit(0)
+                return
             if key == "KEY_MOUSE":
-                _ignored1, x, y, _ignored2, _ignored3 = curses.getmouse()
-                self.display_actions(DisplayActions.MOUSE, y, x)
+                _ignored1, x, y, _ignored2, attr = curses.getmouse()
+                self.display_actions(DisplayActions.MOUSE, y, x, attr)
             else:
                 self.handle_key_pressed(
                     KeyValues.translate_key(key, self.settings), key)
@@ -401,14 +405,16 @@ class Game:
         """
         Saves the game to a dictionary.
         """
-        return self.map.save_state()
+        return dict(map_index=self.map_index,
+                    maps=[m.save_state() for m in self.maps])
 
     def load_state(self, d: dict) -> None:
         """
         Loads the game from a dictionary.
         """
         try:
-            self.map.load_state(d)
+            self.map_index = d["map_index"]
+            self.maps = [Map().load_state(map_dict) for map_dict in d["maps"]]
         except KeyError:
             self.message = _("Some keys are missing in your save file.\n"
                              "Your save seems to be corrupt. It got deleted.")
@@ -425,6 +431,8 @@ class Game:
             return
 
         self.player = players[0]
+        self.map.compute_visibility(self.player.y, self.player.x,
+                                    self.player.vision)
         self.display_actions(DisplayActions.UPDATE)
 
     def load_game(self) -> None: