Merge branch 'master' of ctpug.org.za:koperkapel

[koperkapel.git] / koperkapel / scenes / menu.py

diff --git a/koperkapel/scenes/menu.py b/koperkapel/scenes/menu.py
index 9769ff602f65be54d5cf19eca52501765f3c6b58..c4707c976eb6da73eec1bc7dd75e59d2f3d03355 100644 (file)
--- a/koperkapel/scenes/menu.py
+++ b/koperkapel/scenes/menu.py
@@ -3,9 +3,7 @@
 from pgzero.constants import keys
 from ..actors.buttons import TextButton
 from ..actors.navigator import ActorNavigator
-from .base import Scene, ChangeSceneEvent, QuitEvent
-
-
+from .base import Scene, ChangeSceneEvent, WorldEvent, QuitEvent
 
 
 class MenuScene(Scene):
@@ -34,11 +32,14 @@ class MenuScene(Scene):
 
     def change_to_level(self):
         from .level import LevelScene
-        return [ChangeSceneEvent(LevelScene('level1'))]
+        return [ChangeSceneEvent(LevelScene())]
 
     def change_to_viewer(self):
         from .viewlevel import ViewLevelScene
-        return [ChangeSceneEvent(ViewLevelScene('map'))]
+        return [
+            WorldEvent("set", {"level.name": "map"}),
+            ChangeSceneEvent(ViewLevelScene())
+        ]
 
     def change_to_roaches(self):
         from .roaches import RoachesScene