diff options
| author |  eugue <eug.sun@gmail.com> | 2011-01-11 20:11:53 -0500 |
|---|---|---|
| committer | eugue <eug.sun@gmail.com> | 2011-01-11 20:11:53 -0500 |
| commit | 57edac95f928383bfd93da3fad97f4270b71be2d (patch) | |
| tree | f12d2e0e825d38db5ce72a8a02ec1f77cfed6438 /inputs | |
| parent | afd14947876d65736312a2956e77f2aa2a6bf7a8 (diff) | |
| parent | d9747bd0c2598a06baeaf16dca8ff3b6469d4613 (diff) | |
Merge branch 'master' into mobileapp
Conflicts:
LightInstallation.py
Diffstat (limited to 'inputs')
| -rw-r--r-- | inputs/PygameInput.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inputs/PygameInput.py b/inputs/PygameInput.py index a39c089..27b82b0 100644 --- a/inputs/PygameInput.py +++ b/inputs/PygameInput.py @@ -13,8 +13,8 @@ class PygameInput(Input): return for event in pygame.event.get(): if event.type is KEYDOWN: - if event.key == 301: - exit() + if event.key == 27: + self.die() self.respond({Strings.LOCATION: (5,5),'Key': event.key}) if event.type is MOUSEBUTTONDOWN: self.respond({Strings.LOCATION: pygame.mouse.get_pos()}) |