Ignore:
Timestamp:
06/25/10 18:01:54 (9 years ago)
Author:
beliar
Message:

Ticket #200: Patch by Beliar.

  • Merging map_loading_change branch back into trunk

fixes[s:trac, t:200]

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:ignore
      •  

        old new  
         1*.pyc 
         2.project 
         3.pydevproject 
        14Thumbs.db 
        2 *.pyc 
    • Property svn:mergeinfo changed
      /branches/map_loading_change (added)merged: 554-562
  • trunk/game/scripts/gamesceneview.py

    r557 r563  
    6060        """Fade or unfade TopLayer instances if the PlayerCharacter  
    6161        is under them.""" 
     62        if not self.model.active_map: 
     63            return 
     64 
    6265        # get the PlayerCharacter's screen coordinates 
    6366        camera = self.model.active_map.cameras[self.model.active_map.my_cam_id] 
     
    9093        """Highlights the object that is at the  
    9194        current mouse coordinates"""         
     95        if not self.model.active_map: 
     96            return 
    9297        if mouse_coords: 
    9398            front_obj = self.model.getObjectAtCoords(mouse_coords) 
Note: See TracChangeset for help on using the changeset viewer.