From 2c4cbbb025fb8f2b78e0e5514de6837a20758322 Mon Sep 17 00:00:00 2001 From: Loudrob Date: Wed, 22 Apr 2015 07:40:47 -0400 Subject: [PATCH] Boolean to turn these little assholes off. --- toontown/battle/DistributedBattleBase.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/toontown/battle/DistributedBattleBase.py b/toontown/battle/DistributedBattleBase.py index a96b7ccc..541e5e88 100644 --- a/toontown/battle/DistributedBattleBase.py +++ b/toontown/battle/DistributedBattleBase.py @@ -319,16 +319,19 @@ class DistributedBattleBase(DistributedNode.DistributedNode, BattleBase): pass def getInteractiveProp(self): - if self.interactiveProp: - return self.interactiveProp - elif base.cr.playGame.hood: - loader = base.cr.playGame.hood.loader - - if hasattr(loader, 'getInteractiveProp'): - self.interactiveProp = base.cr.playGame.hood.loader.getInteractiveProp(self.zoneId) - + if config.GetBool('want-anim-props', True): + if self.interactiveProp: return self.interactiveProp - return None + elif base.cr.playGame.hood: + loader = base.cr.playGame.hood.loader + + if hasattr(loader, 'getInteractiveProp'): + self.interactiveProp = base.cr.playGame.hood.loader.getInteractiveProp(self.zoneId) + + return self.interactiveProp + return None + else: + return None def getInteractivePropTrackBonus(self): prop = self.getInteractiveProp()