Merge branch 'conner5' of github.com:dxiao/SmootLight into conner5

Conflicts:
	config/C5Sign.xml

1 files changed, 4 insertions, 0 deletions

diff --git a/inputs/PygameInput.py b/inputs/PygameInput.py
index 480630c..8de55f9 100644
--- a/inputs/PygameInput.py
+++ b/inputs/PygameInput.py
@@ -15,6 +15,10 @@ class PygameInput(Input):
     NB: If follow mouse is enabled, PygameInput will not return mouse and keypresses.  You can, however,
     instantiate other PygameInputs in the XML that will capture mouse and keypresses."""
     def sensingLoop(self):
+        if 'Scale' in self:
+            scale = self['Scale']
+        else:
+            scale = 1
         if self['FollowMouse']:
             self.respond({Strings.LOCATION: pygame.mouse.get_pos()})
             return