projects
/
erdslangetjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hook up some basic sound support
[erdslangetjie.git]
/
erdslangetjie
/
__main__.py
diff --git
a/erdslangetjie/__main__.py
b/erdslangetjie/__main__.py
index dd96a96be8e6d983319d46de1662234e77aa0460..362bded7dd84ffe240d2982c8e2ce918f839d0cd 100644
(file)
--- a/
erdslangetjie/__main__.py
+++ b/
erdslangetjie/__main__.py
@@
-12,7
+12,7
@@
from kivy.clock import Clock
from kivy.config import Config
from erdslangetjie.level import LevelList
from kivy.config import Config
from erdslangetjie.level import LevelList
-from erdslangetjie.data import load_image
+from erdslangetjie.data import load_image
, load_sound
from erdslangetjie.player import ThePlayer, Nemesis
from erdslangetjie.player import ThePlayer, Nemesis
@@
-42,8
+42,10
@@
class GameWindow(RelativeLayout):
self.mouse_move = False
self.mouse_move = False
+ self.caught = load_sound('sounds/caught.ogg')
+
self.player = ThePlayer()
self.player = ThePlayer()
- self.nemesis = Nemesis()
+ self.nemesis = Nemesis(
self.app.config
)
if not self.level_obj.enter_pos:
raise RuntimeError('No entry point')
self.player_tile = None
if not self.level_obj.enter_pos:
raise RuntimeError('No entry point')
self.player_tile = None
@@
-248,6
+250,8
@@
class GameWindow(RelativeLayout):
return
elif self.check_caught():
# Caught
return
elif self.check_caught():
# Caught
+ if self.app.config.getdefault('bane', 'sound', '0') != '0':
+ self.caught.play()
self.reset_level()
app = self.app
self.app = None
self.reset_level()
app = self.app
self.app = None