From de70415949e04e0f9a62c92018e255ee4a7e174c Mon Sep 17 00:00:00 2001
From: DenialMC <denialmc@outlook.com>
Date: Wed, 6 May 2015 10:53:09 +0300
Subject: [PATCH] We don't have any server constants

---
 otp/distributed/OTPClientRepository.py | 10 +---------
 otp/otpbase/OTPLocalizerEnglish.py     |  3 ---
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/otp/distributed/OTPClientRepository.py b/otp/distributed/OTPClientRepository.py
index d3d85649..f025f939 100644
--- a/otp/distributed/OTPClientRepository.py
+++ b/otp/distributed/OTPClientRepository.py
@@ -36,7 +36,6 @@ class OTPClientRepository(ClientRepositoryBase):
         self.playToken = launcher.getPlayToken()
         self.wantMagicWords = False
 
-        self.userSignature = base.config.GetString('signature', 'none')
         self.parentMgr.registerParent(OTPGlobals.SPRender, base.render)
         self.parentMgr.registerParent(OTPGlobals.SPHidden, NodePath())
         self.timeManager = None
@@ -56,8 +55,7 @@ class OTPClientRepository(ClientRepositoryBase):
                   self.exitConnect, [
                       'noConnection',
                       'login',
-                      'failedToConnect',
-                      'failedToGetServerConstants']),
+                      'failedToConnect']),
             State('login',
                   self.enterLogin,
                   self.exitLogin, [
@@ -71,12 +69,6 @@ class OTPClientRepository(ClientRepositoryBase):
                   self.exitFailedToConnect, [
                       'connect',
                       'shutdown']),
-            State('failedToGetServerConstants',
-                  self.enterFailedToGetServerConstants,
-                  self.exitFailedToGetServerConstants, [
-                      'connect',
-                      'shutdown',
-                      'noConnection']),
             State('shutdown',
                   self.enterShutdown,
                   self.exitShutdown, [
diff --git a/otp/otpbase/OTPLocalizerEnglish.py b/otp/otpbase/OTPLocalizerEnglish.py
index 28851dcf..e4472dd6 100644
--- a/otp/otpbase/OTPLocalizerEnglish.py
+++ b/otp/otpbase/OTPLocalizerEnglish.py
@@ -116,9 +116,6 @@ CRToontownUnavailable = 'The server appears to be temporarily unavailable, still
 CRToontownUnavailableCancel = lCancel
 CRNameCongratulations = 'CONGRATULATIONS!!'
 CRNameAccepted = 'Your name has been\napproved by the Toon Council.\n\nFrom this day forth\nyou will be named\n"%s"'
-CRServerConstantsProxyNoPort = 'Unable to contact %s.\n\nYou are communicating to the internet via a proxy, but your proxy does not permit connections on port %s.\n\nYou must open up this port, or disable your proxy, in order to play.  If your proxy has been provided by your ISP, you must contact your ISP to request them to open up this port.'
-CRServerConstantsProxyNoCONNECT = 'Unable to contact %s.\n\nYou are communicating to the internet via a proxy, but your proxy does not support the CONNECT method.\n\nYou must enable this capability, or disable your proxy, in order to play.  If your proxy has been provided by your ISP, you must contact your ISP to request them to enable this capability.'
-CRServerConstantsTryAgain = 'Unable to contact %s.\n\nThe account server might be temporarily down, or there might be some problem with your internet connection.\n\nTry again?'
 CRServerDateTryAgain = 'Could not get server date from %s. Try again?'
 CRMaintenanceCountdownMessage = 'Attention Toons! Toontown United will be going down for maintenance in %d minutes.'
 CRMaintenanceMessage = 'Attention Toons! Toontown United is now going down for maintenance.'