*** empty log message ***

This commit is contained in:
jpenner 2005-11-14 14:08:54 +00:00
parent f6fc1c23b4
commit b1b21b417b
2 changed files with 12 additions and 10 deletions

View file

@ -2,7 +2,7 @@
<leo_file> <leo_file>
<leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/> <leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/>
<globals body_outline_ratio="0.603318250377"> <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"/> <global_log_window_position top="0" left="0" height="0" width="0"/>
</globals> </globals>
<preferences/> <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> expanded="jpenner.20050604112932.41,jpenner.20050604112932.47,"><vh>@thin widgets.py</vh></v>
<v t="jpenner.20050604113053" <v t="jpenner.20050604113053"
expanded="jpenner.20050604113053.2,"><vh>@thin widgetsdemo.py</vh></v> 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 t="jpenner.20050604144534"><vh>@thin pygame2app.py</vh></v>
</v> </v>
<v t="jpenner.20050605105545"><vh>Tasks</vh> <v t="jpenner.20050605105545"><vh>Tasks</vh>

View file

@ -27,7 +27,7 @@ class Game:
currentplayer = 1 currentplayer = 1
AIPlayer = 0 AIPlayer = 0
SeverPort = 7554 SeverPort = 7554
Port = None port = None
logfile = None logfile = None
#@nonl #@nonl
@ -792,7 +792,7 @@ class GameMgr (StateMachine):
GameState(GameLoop([inputMgr, AIPlayer(), Game.evMgr, PhysicsEngine(), self.graphicsMgr]), self.gameEnter), 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.serverWait]), self.serverEnter, self.networkExit),
GameState(GameLoop([Game.evMgr, self.clientWait]), self.clientEnter, 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): def gameEnter(self):
@ -803,12 +803,14 @@ class GameMgr (StateMachine):
self.clientWait.onEnter() self.clientWait.onEnter()
Game.network = TFTProtocol() Game.network = TFTProtocol()
def onResolve(ip): def onResolve(ip, self=self):
Game.network.address = (ip, Game.ServerPort) if self.state == self.STATE_CONNECT:
Game.port = reactor.listenUDP(0, Game.network) Game.network.address = (ip, Game.ServerPort)
def onFail(err): Game.port = reactor.listenUDP(0, Game.network)
Game.failure = err.getErrorMessage() def onFail(err, self=self):
self.changeState(self.STATE_FAILURE) if self.state == self.STATE_CONNECT:
Game.failure = err.getErrorMessage()
self.changeState(self.STATE_FAILURE)
reactor.resolve(Game.ServerIP).addCallback(onResolve).addErrback(onFail) reactor.resolve(Game.ServerIP).addCallback(onResolve).addErrback(onFail)
def serverEnter(self): def serverEnter(self):