Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrako <drako@drako-desktop.(none)>2010-09-07 20:37:31 (GMT)
committer drako <drako@drako-desktop.(none)>2010-09-07 20:37:31 (GMT)
commitd7d32095b35d4f962beb38b08b98cddb6adb4fe5 (patch)
tree6357b7a8746c5003087004d2141e0ee039a195e3
parentcb5c00068eeb9a3443fa7ec2ff08d1e9eeb47ecf (diff)
parent3ae3153e4ee09aa18c25371f5c67b7239c9bb5a7 (diff)
Merge branch 'master' of git.sugarlabs.org:damxo-ski-on-numbers/mainline
-rwxr-xr-ximpares.py8
-rwxr-xr-xpares.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/impares.py b/impares.py
index 91d5810..6e65e63 100755
--- a/impares.py
+++ b/impares.py
@@ -51,13 +51,13 @@ def mainImpares():
elif event.type == pygame.KEYDOWN:
if event.key == pygame.K_ESCAPE:
running = False
- elif event.key == pygame.K_LEFT or event.key == ord('a'):
+ elif event.key == pygame.K_LEFT or event.key == ord('a') or event.key == K_KP4 or event.key== K_KP7:
skier.moveLeft()
- elif event.key == pygame.K_RIGHT or event.key == ord('d'):
+ elif event.key == pygame.K_RIGHT or event.key == ord('d') or event.key == K_KP6 or event.key== K_KP1:
skier.moveRight()
- elif event.key == pygame.K_DOWN or event.key == ord('s'):
+ elif event.key == pygame.K_DOWN or event.key == ord('s') or event.key == K_KP2 or event.key== K_KP3:
skier.moveForward()
- elif event.key == pygame.K_UP or event.key == ord('w'):
+ elif event.key == pygame.K_UP or event.key == ord('w') or event.key == K_KP8 or event.key== K_KP9:
skier.moveBack()
#Simulacion
# simulation
diff --git a/pares.py b/pares.py
index b01a38b..58b9c2a 100755
--- a/pares.py
+++ b/pares.py
@@ -51,13 +51,13 @@ def mainPares():
elif event.type == pygame.KEYDOWN:
if event.key == pygame.K_ESCAPE:
running = False
- elif event.key == pygame.K_LEFT or event.key == ord('a'):
+ elif event.key == pygame.K_LEFT or event.key == ord('a') or event.key == K_KP4 or event.key== K_KP7:
skier.moveLeft()
- elif event.key == pygame.K_RIGHT or event.key == ord('d'):
+ elif event.key == pygame.K_RIGHT or event.key == ord('d') or event.key == K_KP6 or event.key== K_KP1:
skier.moveRight()
- elif event.key == pygame.K_DOWN or event.key == ord('s'):
+ elif event.key == pygame.K_DOWN or event.key == ord('s') or event.key == K_KP2 or event.key== K_KP3:
skier.moveForward()
- elif event.key == pygame.K_UP or event.key == ord('w'):
+ elif event.key == pygame.K_UP or event.key == ord('w') or event.key == K_KP8 or event.key== K_KP9:
skier.moveBack()
#Simulacion
# simulation