Clean up and prepare for an upcoming commit

This commit is contained in:
John Cote 2015-06-24 01:58:49 -04:00
parent d2b0d99175
commit 5d8aa6e86e
4 changed files with 8 additions and 12 deletions

View file

@ -33,7 +33,6 @@ server-port 7199
account-bridge-filename astron/databases/account-bridge.db
# Performance:
sync-video #f
texture-power-2 none
gl-check-errors #f
garbage-collect-states #f

View file

@ -141,12 +141,10 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI):
self.fsm.request('clearOutToonInterior')
def cogdoTakeOver(self, difficulty, buildingHeight, track = 's'):
print 'Building %s (%s): cogdoTakeOver' % (self.doId, self.zoneId)
if not self.isToonBlock():
return None
self.updateSavedBy(None)
self.track = track
self.realTrack = track
self.difficulty = difficulty

View file

@ -31,7 +31,7 @@ class TTSLauncher:
logSuffix = '%02d%02d%02d_%02d%02d%02d' % (ltime[0] - 2000, ltime[1], ltime[2], ltime[3], ltime[4], ltime[5])
if not os.path.exists('user/logs/'):
os.mkdir('user/logs/client/')
os.mkdir('user/logs/')
self.notify.info('Made new directory to save logs.')
logfile = os.path.join('user/logs', self.logPrefix + logSuffix + '.log')

View file

@ -29,7 +29,7 @@ ServerDialogTimeout = 3.0
class NameShop(StateData.StateData):
notify = DirectNotifyGlobal.directNotify.newCategory('NameShop')
def __init__(self, makeAToon, doneEvent, avList, index, isPaid):
def __init__(self, makeAToon, doneEvent, avList, index):
StateData.StateData.__init__(self, doneEvent)
self.makeAToon = makeAToon
self.avList = avList
@ -37,7 +37,6 @@ class NameShop(StateData.StateData):
self.shopsVisited = []
self.avId = -1
self.avExists = 0
self.isPaid = isPaid
self.names = ['',
'',
'',