X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=blobdiff_plain;f=koperkapel%2Fscenes%2Flevel.py;h=a58c51d450ee3d8b04200e138b0687f3fef60f30;hp=6537e5c05e46067306317548feb21ddf95a3c4df;hb=9716c38db307a48cc69bf5a3d77347d5fba4acc2;hpb=b14fa59dfad906308eb76954322f47c559fa89e0

diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index 6537e5c..a58c51d 100644
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -1,41 +1,28 @@
 """Render a level"""
 
-import json
-import os
-
 from pgzero.constants import keys
-from pgzero.loaders import images
+from ..loaders.levelloader import levels
 from .base import Scene, ChangeSceneEvent
-from .constants import TILE_SIZE, LEVEL_PATH
+from .constants import TILE_SIZE
 
 
 class LevelScene(Scene):
     """ Level scene. """
 
     def __init__(self, level_name):
-        self._level_name = level_name
-        f = open(os.path.join(LEVEL_PATH, level_name + '.json'))
-        level_data = json.load(f)
-        f.close()
-        self._tiles = level_data['tiles']
-        self._load_tile_images()
+        self._level_data = levels.load(level_name)
+        self._tiles = self._level_data['tiles']
 
     def draw(self, screen):
         screen.clear()
-        #screen.draw.text("This is level {}".format(self._level_name), (200, 100))
         for tile in self._tiles:
             pos = tile['pos']
             pos = [pos[0] * TILE_SIZE, pos[1] * TILE_SIZE]
-            if not 'image' in tile:
+            if 'image' not in tile:
                 # Skip broken tiles for now
                 continue
             screen.blit(tile['image'], pos)
 
-    def _load_tile_images(self):
-        """Load all the tile images"""
-        for tile in self._tiles:
-            tile['image'] = getattr(images, tile['base'])
-
     def on_key_down(self, key, mod, unicode):
         if key == keys.ESCAPE:
             from .menu import MenuScene