Mercurial > skaapsteker
changeset 495:a5a57abd5472
Allow K_SPACE wherever we allow K_RETURN.
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 22:42:55 +0200 |
| parents | 89f5056518cc |
| children | 3228239a0914 |
| files | skaapsteker/levelscene.py skaapsteker/menuscene.py skaapsteker/widgets/bubble.py skaapsteker/widgets/text.py |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/skaapsteker/levelscene.py Sat Apr 09 22:42:06 2011 +0200 +++ b/skaapsteker/levelscene.py Sat Apr 09 22:42:55 2011 +0200 @@ -2,7 +2,7 @@ from pygame.locals import (KEYDOWN, KEYUP, K_DOWN, K_ESCAPE, K_LEFT, K_RIGHT, K_SEMICOLON, K_UP, K_c, K_j, K_p, K_q, K_x, K_z, - K_v, K_k, K_RETURN, SRCALPHA) + K_v, K_k, K_RETURN, K_SPACE, SRCALPHA) import pygame import time @@ -83,7 +83,7 @@ action = lambda s: getattr(self._player, 'action_%s' % s) self._quit_keys = set([K_q, K_ESCAPE]) - self._restart_keys = set([K_x, K_z, K_RETURN]) + self._restart_keys = set([K_x, K_z, K_RETURN, K_SPACE]) self._fast_key_map = { K_LEFT: action('left'),
--- a/skaapsteker/menuscene.py Sat Apr 09 22:42:06 2011 +0200 +++ b/skaapsteker/menuscene.py Sat Apr 09 22:42:55 2011 +0200 @@ -1,5 +1,5 @@ import pygame -from pygame.locals import K_ESCAPE, K_q, K_UP, K_DOWN, K_RETURN, KEYDOWN, QUIT +from pygame.locals import K_ESCAPE, K_q, K_UP, K_DOWN, K_RETURN, K_SPACE, KEYDOWN, QUIT from .data import load_image from .cutscene import OpeningCutScene, UsageCutScene, CreditsCutScene @@ -52,7 +52,7 @@ self._selected += 1 elif ev.key == K_UP: self._selected -= 1 - elif ev.key == K_RETURN: + elif ev.key in [K_RETURN, K_SPACE]: self.selected(self._selected, self._options[self._selected]) self._selected %= 4 + int(self._can_resume)
--- a/skaapsteker/widgets/bubble.py Sat Apr 09 22:42:06 2011 +0200 +++ b/skaapsteker/widgets/bubble.py Sat Apr 09 22:42:55 2011 +0200 @@ -1,6 +1,6 @@ """Widget for in-level dialogue / speech bubbles.""" -from pygame.locals import (KEYDOWN, K_UP, K_p, K_q, K_x, K_z, K_RETURN, SRCALPHA) +from pygame.locals import (KEYDOWN, K_UP, K_p, K_q, K_x, K_z, K_RETURN, K_SPACE, SRCALPHA) import pygame.draw import pygame @@ -34,7 +34,7 @@ pass def dispatch(self, ev): - if ev.type == KEYDOWN and ev.key == K_RETURN: + if ev.type == KEYDOWN and ev.key in [K_RETURN, K_SPACE]: CloseDialog.post(None)
--- a/skaapsteker/widgets/text.py Sat Apr 09 22:42:06 2011 +0200 +++ b/skaapsteker/widgets/text.py Sat Apr 09 22:42:55 2011 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pygame -from pygame.locals import KEYDOWN, K_UP, K_DOWN, K_RETURN +from pygame.locals import KEYDOWN, K_UP, K_DOWN, K_RETURN, K_SPACE from ..widgets import Widget from ..data import filepath @@ -140,7 +140,7 @@ self.selected -= 1 elif ev.key == K_DOWN: self.selected += 1 - elif ev.key == K_RETURN: + elif ev.key in [K_RETURN, K_SPACE]: for callback in self.callbacks: callback(self.selected, self.options[self.selected][1]) @@ -181,7 +181,7 @@ self.selected -= 1 elif ev.key == K_DOWN: self.selected += 1 - elif ev.key == K_RETURN: + elif ev.key in [K_RETURN, K_SPACE]: for callback in self.callbacks: callback(self.selected, self.options[self.selected][1])