Commit 875bde45 authored by Matthew Hausknecht's avatar Matthew Hausknecht

Updated with extra sleeps

parent b336a23f
...@@ -337,6 +337,18 @@ class Trainer(object): ...@@ -337,6 +337,18 @@ class Trainer(object):
""" Returns true all players are connected. """ """ Returns true all players are connected. """
return len(self._connectedPlayers) == self._numOffense + self._numDefense return len(self._connectedPlayers) == self._numOffense + self._numDefense
def sendHFOConfig(self):
""" Broadcast the HFO configuration """
offense_nums = ' '.join([str(self.convertToExtPlayer(self._offenseTeamName, i))
for i in xrange(1, self._numOffense + 1)])
defense_nums = ' '.join([str(self.convertToExtPlayer(self._defenseTeamName, i))
for i in xrange(self._numDefense)])
self.send('(say HFO_SETUP offense_name %s defense_name %s num_offense %d'\
' num_defense %d offense_nums %s defense_nums %s)'
%(self._offenseTeamName, self._defenseTeamName,
self._numOffense, self._numDefense,
offense_nums, defense_nums))
def startGame(self): def startGame(self):
""" Starts a game of HFO. """ """ Starts a game of HFO. """
self.send('(change_mode play_on)') self.send('(change_mode play_on)')
...@@ -415,17 +427,11 @@ class Trainer(object): ...@@ -415,17 +427,11 @@ class Trainer(object):
while not self.allPlayersConnected(): while not self.allPlayersConnected():
self.getConnectedPlayers() self.getConnectedPlayers()
# Broadcast the HFO configuration time.sleep(0.1)
offense_nums = ' '.join([str(self.convertToExtPlayer(self._offenseTeamName, i)) self.sendHFOConfig()
for i in xrange(1, self._numOffense + 1)])
defense_nums = ' '.join([str(self.convertToExtPlayer(self._defenseTeamName, i))
for i in xrange(self._numDefense)])
self.send('(say HFO_SETUP offense_name %s defense_name %s num_offense %d'\
' num_defense %d offense_nums %s defense_nums %s)'
%(self._offenseTeamName, self._defenseTeamName,
self._numOffense, self._numDefense,
offense_nums, defense_nums))
print 'Starting game' print 'Starting game'
time.sleep(0.1)
self.startGame() self.startGame()
while self.allPlayersConnected() and self.checkLive(necProcesses) and not self._done: while self.allPlayersConnected() and self.checkLive(necProcesses) and not self._done:
prevFrame = self._frame prevFrame = self._frame
......
...@@ -181,7 +181,6 @@ inline bool ParseConfig(const std::string& message, Config& config) { ...@@ -181,7 +181,6 @@ inline bool ParseConfig(const std::string& message, Config& config) {
std::string key, val; std::string key, val;
iss >> key; iss >> key;
if (header.compare(key) != 0) { if (header.compare(key) != 0) {
std::cerr << "Got unexpected message header: " << header;
return false; return false;
} }
while (iss >> key) { while (iss >> key) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment