Ignore:
Timestamp:
06/19/10 23:03:06 (10 years ago)
Author:
beliar
Message:

Merged changes from code-cleanup-and-refactoring back into the trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/game/scripts/objects/composed.py

    r477 r553  
    1818"""Composite game object classes are kept here""" 
    1919 
    20 from base import * 
     20from base import GameObject, Container, Lockable, \ 
     21                Scriptable, Trappable, Destructable, Carryable 
    2122 
    2223class ImmovableContainer(GameObject, Container, Lockable, Scriptable,  
     
    3233        self.blocking = True 
    3334 
    34 class CarryableContainer(DynamicObject, Container, Carryable): 
     35class CarryableContainer(Container, Carryable): 
    3536    """Composite class that will be used for backpack, pouches, etc.""" 
    3637    def __init__ (self, **kwargs): 
    37         DynamicObject.__init__(self, **kwargs) 
    38         Container.__init__(self,**kwargs) 
    39         Carryable.__init__(self,**kwargs) 
     38        Container.__init__(self, **kwargs) 
     39        Carryable.__init__(self, **kwargs) 
     40        self.own_bulk = 0 
     41        self.own_weight = 0 
    4042 
    4143    def getWeight(self): 
Note: See TracChangeset for help on using the changeset viewer.