From 5d8aa6e86e52a59f100b8bf49dfe4f70ce0ede3a Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@comcast.net>
Date: Wed, 24 Jun 2015 01:58:49 -0400
Subject: [PATCH] Clean up and prepare for an upcoming commit

---
 dependencies/config/general.prc            |  1 -
 toontown/building/DistributedBuildingAI.py | 14 ++++++--------
 toontown/launcher/TTSLauncher.py           |  2 +-
 toontown/makeatoon/NameShop.py             |  3 +--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/dependencies/config/general.prc b/dependencies/config/general.prc
index cb811529..52b24cb1 100644
--- a/dependencies/config/general.prc
+++ b/dependencies/config/general.prc
@@ -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
diff --git a/toontown/building/DistributedBuildingAI.py b/toontown/building/DistributedBuildingAI.py
index 53924785..c92a90e8 100755
--- a/toontown/building/DistributedBuildingAI.py
+++ b/toontown/building/DistributedBuildingAI.py
@@ -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
@@ -318,21 +316,21 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI):
             toon = None
             if t:
                 toon = self.getToon(t)
-            
+
             if toon != None:
                 activeToons.append(toon)
                 continue
-        
+
         for t in victorList:
             toon = None
             if t:
                 toon = self.getToon(t)
                 self.air.writeServerEvent('buildingDefeated', t, '%s|%s|%s|%s' % (self.track, self.numFloors, self.zoneId, victorList))
-            
+
             if toon != None:
                 self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, 5, self.zoneId, activeToons, 1)
                 continue
-        
+
         victorList.extend([None, None, None, None])
         for i in range(0, 4):
             victor = victorList[i]
@@ -342,7 +340,7 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI):
             event = self.air.getAvatarExitEvent(victor)
             self.accept(event, self.setVictorExited, extraArgs = [
                 victor])
-        
+
         self.b_setVictorList(victorList[:4])
         self.updateSavedBy(savedBy)
         self.victorResponses = [
diff --git a/toontown/launcher/TTSLauncher.py b/toontown/launcher/TTSLauncher.py
index 038f6246..dab0c6a2 100755
--- a/toontown/launcher/TTSLauncher.py
+++ b/toontown/launcher/TTSLauncher.py
@@ -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')
diff --git a/toontown/makeatoon/NameShop.py b/toontown/makeatoon/NameShop.py
index eb4db1b8..3755cf9a 100755
--- a/toontown/makeatoon/NameShop.py
+++ b/toontown/makeatoon/NameShop.py
@@ -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 = ['',
          '',
          '',