X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=c558fc0fcb429091cf2e3d7c11004230905cad56;hb=3ce7cd00032bacb036af49f3c7f453cdfd63ca31;hp=2ff13ec4f70490077d48e39cc12e64d66910f742;hpb=122d9fef6f8261a7e45026e3498ce95569b4d344;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 2ff13ec..c558fc0 100644
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -5,8 +5,8 @@ import pygame.locals as pgl
 import pymunk
 
 from .base import BaseScene
-from ..lights import BaseLight
-from ..obstacles import BaseObstacle
+from ..lights import LightManager
+from ..obstacles import ObstacleManager
 from ..enemies import Boyd
 from ..events import SceneChangeEvent
 from ..utils import debug_timer
@@ -15,27 +15,17 @@ from ..utils import debug_timer
 class NightScene(BaseScene):
     def enter(self, gamestate):
         self._space = pymunk.Space()
-        self._obstacles = [
-            BaseObstacle.load(cfg) for cfg in gamestate.station["obstacles"]]
-        self._lights = [
-            BaseLight.load(cfg) for cfg in gamestate.station["lights"]]
-        for obs in self._obstacles:
-            obs.add(self._space)
-        for light in self._lights:
-            light.add(self._space)
-
+        self._obstacles = ObstacleManager(self._space, gamestate)
+        self._lights = LightManager(self._space, gamestate)
         self._mould = Boyd(gamestate, self._space)
 
     @debug_timer("night.render")
     def render(self, surface, gamestate):
         surface.fill((0, 0, 155))
-        for light in self._lights:
-            light.render_light(surface)
-        for obs in self._obstacles:
-            obs.render(surface)
-        for light in self._lights:
-            light.render_fittings(surface)
         self._mould.render(surface)
+        self._lights.render_light(surface)
+        self._obstacles.render(surface)
+        self._lights.render_fittings(surface)
 
     def event(self, ev, gamestate):
         if ev.type == pgl.KEYDOWN: