X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Flevel.py;h=82fff6581665f43c12b4124a926ee3634db8c0b1;hb=a3a4e8d31e4e44d4f245b4c2de9d32b37a530c5c;hp=37f554012e7500db17585a88a0c27f6d13beac70;hpb=acc9b01b638c88871d67ea84476eae2bdf8bdd1b;p=koperkapel.git

diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index 37f5540..82fff65 100644
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -5,15 +5,15 @@ from pygame import Surface
 import pygame.locals as pgl
 from ..loaders.levelloader import levels
 from .base import Scene, ChangeSceneEvent
-from ..constants import TILE_SIZE
+from ..constants import TILE_SIZE, WIDTH, HEIGHT
 
 
-class LevelScene(Scene):
+class BaseLevelScene(Scene):
     """ Level scene. """
 
     def enter(self, world):
-        self._level_data = levels.load(world.level.name)
-        self._tiles = self._level_data['tiles']
+        self._level = levels.load(world.level.name)
+        self._tiles = self._level.tiles
         self._level_layer = 'floor'
         self._surfaces = {}
         self._overlay = {}
@@ -42,20 +42,18 @@ class LevelScene(Scene):
         # Viewport is the position of the screen relative to the
         # surface. We need the position of the surface relative to
         # the screen for the blit, so this conversion
-        screen_pos = -viewport[0], -viewport[1]
-        if self._level_layer == 'floor':
-            screen.blit(self._surfaces[self._level_layer], screen_pos)
-        else:
-            # blit tunnels, with translucent overlay
-            # We need to call pygame.Surface.blit ourselves,
-            # since pgzero's screen blit hides the blend flags
-            # from us
-            tunnels = self._surfaces[self._level_layer].copy()
-            tunnels.blit(self._overlay, (0, 0),
+        screen.surface.blit(self._surfaces[self._level_layer], (0, 0),
+                            area=(viewport[0], viewport[1], WIDTH, HEIGHT))
+        if self._level_layer != 'floor':
+            screen.surface.blit(self._overlay, (0, 0),
+                         area=(viewport[0], viewport[1], WIDTH, HEIGHT), 
                          special_flags=pgl.BLEND_MULT)
-            screen.blit(tunnels, screen_pos)
 
     def on_key_down(self, key, mod, unicode):
         if key == keys.ESCAPE:
             from .menu import MenuScene
             return [ChangeSceneEvent(MenuScene())]
+
+
+class GameLevelScene(BaseLevelScene):
+    pass