changeset 487:efb34a6cd2a1 engine_refactor

Make name param to an Item optional and use NAME if present.
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 29 Aug 2010 13:07:49 +0200
parents 14eb4b92c93b
children d8087848722d
files gamelib/state.py
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/state.py	Sun Aug 29 19:41:07 2010 +0200
+++ b/gamelib/state.py	Sun Aug 29 13:07:49 2010 +0200
@@ -505,11 +505,16 @@
     # name for interactions (i.e. def interact_with_<TOOL_NAME>)
     TOOL_NAME = None
 
+    # name for interactions (i.e. def interact_with_<TOOL_NAME>)
+    NAME = None
+
     # set to instance of CursorSprite
     CURSOR = None
 
-    def __init__(self, name):
-        self.name = name
+    def __init__(self, name=None):
+        self.name = self.NAME
+        if name is not None:
+            self.name = name
         self.tool_name = name
         if self.TOOL_NAME is not None:
             self.tool_name = self.TOOL_NAME
@@ -542,7 +547,7 @@
         cls._counter += 1
         return cls._counter - 1
 
-    def __init__(self, name):
+    def __init__(self, name=None):
         my_count = self._get_new_id()
         super(CloneableItem, self).__init__("%s.%s" % (name, my_count))
         self.tool_name = name