From b1b21b417baf819dcf50ecc9ab9c589b94c4271a Mon Sep 17 00:00:00 2001
From: jpenner <jpenner>
Date: Mon, 14 Nov 2005 14:08:54 +0000
Subject: [PATCH] *** empty log message ***

---
 TennisForTwo.leo |  4 ++--
 TennisForTwo.py  | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/TennisForTwo.leo b/TennisForTwo.leo
index 9cdc8a0..d7a59cf 100644
--- a/TennisForTwo.leo
+++ b/TennisForTwo.leo
@@ -2,7 +2,7 @@
 <leo_file>
 <leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/>
 <globals body_outline_ratio="0.603318250377">
-	<global_window_position top="25" left="10" height="734" width="1280"/>
+	<global_window_position top="25" left="10" height="734" width="1270"/>
 	<global_log_window_position top="0" left="0" height="0" width="0"/>
 </globals>
 <preferences/>
@@ -15,7 +15,7 @@ expanded="jpenner.20050601180947,jpenner.20050305124252,jpenner.20050319143816,j
 expanded="jpenner.20050604112932.41,jpenner.20050604112932.47,"><vh>@thin widgets.py</vh></v>
 <v t="jpenner.20050604113053"
 expanded="jpenner.20050604113053.2,"><vh>@thin widgetsdemo.py</vh></v>
-<v t="jpenner.20050319120621" a="ETV"><vh>@thin pygame2exe.py</vh></v>
+<v t="jpenner.20050319120621" a="E"><vh>@thin pygame2exe.py</vh></v>
 <v t="jpenner.20050604144534"><vh>@thin pygame2app.py</vh></v>
 </v>
 <v t="jpenner.20050605105545"><vh>Tasks</vh>
diff --git a/TennisForTwo.py b/TennisForTwo.py
index 4f1b95a..5dfc84a 100644
--- a/TennisForTwo.py
+++ b/TennisForTwo.py
@@ -27,7 +27,7 @@ class Game:
     currentplayer = 1
     AIPlayer = 0
     SeverPort = 7554
-    Port = None
+    port = None
     
     logfile = None
 #@nonl
@@ -792,7 +792,7 @@ class GameMgr (StateMachine):
              GameState(GameLoop([inputMgr, AIPlayer(), Game.evMgr, PhysicsEngine(), self.graphicsMgr]), self.gameEnter),
              GameState(GameLoop([Game.evMgr, self.serverWait]), self.serverEnter, self.networkExit),
              GameState(GameLoop([Game.evMgr, self.clientWait]), self.clientEnter, self.networkExit),
-             GameState(failScreen, failScreen.onEnter, self.networkExit)
+             GameState(failScreen, failScreen.onEnter)
             ])
 
     def gameEnter(self):
@@ -803,12 +803,14 @@ class GameMgr (StateMachine):
         self.clientWait.onEnter()
 
         Game.network = TFTProtocol()
-        def onResolve(ip):
-            Game.network.address = (ip, Game.ServerPort)
-            Game.port = reactor.listenUDP(0, Game.network)
-        def onFail(err):
-            Game.failure = err.getErrorMessage()
-            self.changeState(self.STATE_FAILURE)
+        def onResolve(ip, self=self):
+            if self.state == self.STATE_CONNECT:
+                Game.network.address = (ip, Game.ServerPort)
+                Game.port = reactor.listenUDP(0, Game.network)
+        def onFail(err, self=self):
+            if self.state == self.STATE_CONNECT:
+                Game.failure = err.getErrorMessage()
+                self.changeState(self.STATE_FAILURE)
         reactor.resolve(Game.ServerIP).addCallback(onResolve).addErrback(onFail)
 
     def serverEnter(self):