aboutsummaryrefslogtreecommitdiff
path: root/tetris.py
diff options
context:
space:
mode:
authorGravatar rcoh <rcoh@mit.edu>2011-08-29 15:49:27 -0400
committerGravatar rcoh <rcoh@mit.edu>2011-08-29 15:49:27 -0400
commit507b67d9190697f6324006116784c4e763e969fc (patch)
tree5a755b33a7bede95330b66949bf21031d67b7a18 /tetris.py
parentecee8bc8e2820357fca56975300bf73f492b01e6 (diff)
parentf9c82217cbbf4eb2d0f8a901af5cab3c7bad3853 (diff)
Merge branch 'master' of github.com:rcoh/Burton-Conner-Tetris-Battle
Conflicts: ddrinput.py
Diffstat (limited to 'tetris.py')
-rw-r--r--tetris.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tetris.py b/tetris.py
index a12ce15..9bab2ad 100644
--- a/tetris.py
+++ b/tetris.py
@@ -218,6 +218,7 @@ class TetrisGame(object):
self.board_animation(0,"up_arrow")
self.board_animation(1,"up_arrow")
self.start_time = None
+ self.input.reset()
self.update_gui()
self.handle_input() #this calls all other functions, such as add_player, start_game