# HG changeset patch
# User Simon Cross <hodgestar@gmail.com>
# Date 1378633911 -7200
# Node ID ceb085d5787b5f3052166a5a2a3253842672f771
# Parent  089c9ea4a652a9ca8624c7bf0e4ba99916959a80# Parent  795f1ab6494cbbc135bb69a9deb9c65e20ece3fe
Merge bugfixes into default.

diff -r 089c9ea4a652 -r ceb085d5787b LICENSE.txt
--- a/LICENSE.txt	Sun Sep 08 11:31:39 2013 +0200
+++ b/LICENSE.txt	Sun Sep 08 11:51:51 2013 +0200
@@ -1,6 +1,6 @@
-Copyright (c) 2013, Adrianna Pinska, Anna Malczyk, David Sharpe,
+Copyright (c) 2013, Adrianna Pinska, David Fraser, David Sharpe,
                     Desilu Crossman, Jeremy Thurgood, Neil Muller,
-                    Oliver Hambsch, Simon Cross, Stefano Rivera
+                    Simon Cross, Stefano Rivera
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff -r 089c9ea4a652 -r ceb085d5787b README.txt
--- a/README.txt	Sun Sep 08 11:31:39 2013 +0200
+++ b/README.txt	Sun Sep 08 11:51:51 2013 +0200
@@ -52,7 +52,7 @@
 Move Lyca, the werewolf insurance assessor, around the screen with the arrow
 keys or A, S, W, D.
 
-Fire a gun or claw aliens with X or CTRL.
+Fire a gun or claw aliens with Z or CTRL.
 
 Change between werewolf and human by pressing C.
 
diff -r 089c9ea4a652 -r ceb085d5787b nagslang/game_object.py
--- a/nagslang/game_object.py	Sun Sep 08 11:31:39 2013 +0200
+++ b/nagslang/game_object.py	Sun Sep 08 11:51:51 2013 +0200
@@ -775,6 +775,7 @@
             self._ticks += 1
             if self._ticks > self.rate:
                 self._ticks = 0
+        self.renderer.update(seconds)
 
     def collide_with_protagonist(self, protagonist):
         self._protagonist = protagonist
diff -r 089c9ea4a652 -r ceb085d5787b nagslang/screens/area.py
--- a/nagslang/screens/area.py	Sun Sep 08 11:31:39 2013 +0200
+++ b/nagslang/screens/area.py	Sun Sep 08 11:51:51 2013 +0200
@@ -101,6 +101,13 @@
 
     def teardown(self):
         sound.stop()
+        for collision_type in CALLBACK_COLLIDERS:
+            self.space.remove_collision_handler(
+                COLLISION_TYPE_PLAYER, collision_type)
+            self.space.remove_collision_handler(
+                COLLISION_TYPE_FURNITURE, collision_type)
+            self.space.remove_collision_handler(
+                COLLISION_TYPE_WEREWOLF_ATTACK, collision_type)
 
     @classmethod
     def list_areas(self):