Changeset 341 for trunk

Timestamp:

10/23/09 18:18:29 (10 years ago)

Author:

eliedebrauwer

Message:

Ticket #128. Fix by octavio, PEP-8 code cleanup. (I plea guilty for the semi-colons). fixes[s:trac, t:128]

File:

• trunk/game/scripts/engine.py (modified) (8 diffs)

trunk/game/scripts/engine.py

@@ -52 +52 @@
            @param filename: the name of the file to write to
            @return: None"""
-        fname = '/'.join([path,filename])
+        fname = '/'.join([path, filename])
         try:
             f = open(fname, 'w')
@@ -61 +61 @@
         # can't pickle SwigPyObjects
         behaviours = {}
-        behaviour_player = self.game_state.PC.behaviour;
-        self.game_state.PC.behaviour = None;
+        behaviour_player = self.game_state.PC.behaviour
+        self.game_state.PC.behaviour = None
         
         # Backup the behaviours 
@@ -70 +70 @@
                 if npc.trueAttr("NPC"):
                     behaviours[map_id][object_id] = npc.behaviour
-                    npc.behaviour = None;
+                    npc.behaviour = None
         
         # Pickle it 
@@ -78 +78 @@
         # Restore behaviours
         for map_id in behaviours:
-            for (object_id,behaviour) in behaviours[map_id].items():
+            for (object_id, behaviour) in behaviours[map_id].items():
                 self.game_state.objects[map_id][object_id].behaviour = \
                     behaviours[map_id][object_id]
@@ -163 +163 @@
         if ref is None:
             # no, add it to the game state
-            self.game_state.objects[self.game_state.current_map_name][obj.ID] = obj
+            self.game_state.objects[self.game_state.current_map_name][obj.ID] \
+                                                                          = obj
         else:
             # yes, use the current game state data
@@ -184 +185 @@
            @rtype: boolean
            @return: Status of result (True/False)"""
-        for i in self.game_state.getObjectsFromMap(self.game_state.current_map_name):
+        for i in \
+           self.game_state.getObjectsFromMap(self.game_state.current_map_name):
             if (i.ID == ident):
                 # we found a match
@@ -197 +199 @@
            @rtype: list
            @return: List of text and callbacks"""
-        actions=[]
+        actions = []
         # note: ALWAYS check NPC's first!
         obj = self.game_state.getObjectById(obj_id, \
@@ -271 +273 @@
         self.game_state.PC.start()
 
-    def handleMouseClick(self,position):
+    def handleMouseClick(self, position):
         """Code called when user left clicks the screen.
            @type position: fife.ScreenPoint