smartness now required for keypads

[koperkapel.git] / koperkapel / loaders / levelloader.py

diff --git a/koperkapel/loaders/levelloader.py b/koperkapel/loaders/levelloader.py
index a775838dc54b1b02c18734ab69709d4a34c16230..9c3b6cfc19fc57c31af97b1c4337bb016131d7f8 100644 (file)
--- a/koperkapel/loaders/levelloader.py
+++ b/koperkapel/loaders/levelloader.py
@@ -65,7 +65,7 @@ class LevelLoader(ResourceLoader):
                 doors.append(new_door)
             # Add the keypads
             for keypad in door_info['keypads']:
-                new_keypad = Keypad(keypad[0], keypad[1], doors)
+                new_keypad = Keypad(keypad[0], keypad[1], doors, keypad[2])
                 self._level.keypads.append(new_keypad)
         for pos in level_data['friendly roaches']:
             roach = get_friendly_roach(pos[0], pos[1])
@@ -73,7 +73,7 @@ class LevelLoader(ResourceLoader):
         for item in level_data['items']:
             self._level.items.append(get_item(item))
         for generator in level_data['enemy generators']:
-            enemy = EnemyGenerator(generator)
+            enemy = EnemyGenerator(generator, self._level)
             self._level.enemy_generators.append(enemy)
         return self._level