Mercurial > skaapsteker

diff skaapsteker/sprites/base.py @ 193:897eec397cbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix state checks for hattori, ichiro, kaneda and kumiko. In the process provide easier access to other npcs.
author Simon Cross <hodgestar@gmail.com>
date Wed, 06 Apr 2011 21:44:54 +0200
parents 993f4f55eb93
children a11325bc5ff0
line wrap: on
line diff
--- a/skaapsteker/sprites/base.py	Wed Apr 06 21:39:30 2011 +0200
+++ b/skaapsteker/sprites/base.py	Wed Apr 06 21:44:54 2011 +0200
@@ -60,8 +60,8 @@
         self._layer = Layers.PLAYER
         self.setup(**opts)
 
-    def setup(self, dsm, world):
-        self.dsm = dialogue.DSM(dsm, world)
+    def setup(self, name, world, dsm):
+        self.dsm = dialogue.DSM(name, world, dsm)
 
 
 class Projectile(Sprite):
@@ -88,7 +88,7 @@
         self.setup(**opts)
 
 
-    def setup(self):
+    def setup(self, name, world):
         pass