Mercurial > parpg-source
diff gamescenecontroller.py @ 167:b3b82c2aebee
Using fife settings module again instead of our own.
| author | Beliar <KarstenBock@gmx.net> |
|---|---|
| date | Mon, 20 Feb 2012 16:50:10 +0100 |
| parents | d224bbce512a |
| children | 62aed6388159 |
line wrap: on
line diff
--- a/gamescenecontroller.py Thu Jan 12 18:42:48 2012 +0100 +++ b/gamescenecontroller.py Mon Feb 20 16:50:10 2012 +0100 @@ -100,7 +100,7 @@ self.resetMouseCursor() self.paused = False - if model.settings.fife.EnableSound: + if model.settings.get("fife", "PlaySounds"): if not self.view.sounds.music_init: music_path = 'music' music_file = random.choice( @@ -309,22 +309,22 @@ #up if mouse_y <= pixle_edge: direction.append("up") - image = '/'.join(['gui/cursors', settings.parpg.CursorUp]) + image = '/'.join(['gui/cursors', settings.get("parpg", "CursorUp")]) #right if mouse_x >= screen_width - pixle_edge: direction.append("right") - image = '/'.join(['gui/cursors', settings.parpg.CursorRight]) + image = '/'.join(['gui/cursors', settings.get("parpg", "CursorRight")]) #down if mouse_y >= screen_height - pixle_edge: direction.append("down") - image = '/'.join(['gui/cursors', settings.parpg.CursorDown]) + image = '/'.join(['gui/cursors', settings.get("parpg", "CursorDown")]) #left if mouse_x <= pixle_edge: direction.append("left") - image = '/'.join(['gui/cursors', settings.parpg.CursorLeft]) + image = '/'.join(['gui/cursors', settings.get("parpg", "CursorLeft")]) if image is not None and not data_drag.dragging: self.setMouseCursor(image, image) @@ -387,7 +387,7 @@ mouse = self.scroll_data["mouse"] keyboard = self.scroll_data["kb"] - speed = self.model.settings.parpg.ScrollSpeed + speed = self.model.settings.get("parpg", "ScrollSpeed") #adds a value to the offset depending on the contents of each # of the controllers: set() removes doubles