Merge branch 'master' of github.com:rcoh/Burton-Conner-Tetris-Battle

Conflicts:
	ddrinput.py

1 files changed, 6 insertions, 1 deletions

diff --git a/ddrinput.py b/ddrinput.py
index 4d77ccc..6cad156 100644
--- a/ddrinput.py
+++ b/ddrinput.py
@@ -1,5 +1,7 @@
 import pygame
 import time
+=======
+
 JOY_EVENT = 7
 JOY_EVENT_2 = 10
 KEY_EVENT = 2
@@ -49,7 +51,10 @@ class DdrInput(object):
     for i in range(totaljoy):
       m = pygame.joystick.Joystick(i)
       m.init()
-  
+
+  def reset(self):
+    pygame.event.clear()
+    
   def poll(self):
     """
     Returns a tuple of player index (0 or 1) and move,