Cheese-water/spelling-game-python
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed various bugs in packets.py and spelling_mp.py

Browse source
This commit is contained in:
Patrick Marsee 2016-11-25 12:26:07 -05:00
parent 9312ae4b10
commit 56f53dccfe
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
__pycache__/packets.cpython-34.pyc Normal file
View file

Binary file not shown.

BIN
__pycache__/spell.cpython-34.pyc Normal file
View file

Binary file not shown.

BIN
__pycache__/status.cpython-34.pyc Normal file
View file

Binary file not shown.

20
packets.py
View file

@ -110,7 +110,7 @@ class QuickStreamServer(PacketUtility):
serverSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) serverSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if len(ipAddress) >= 7: if len(ipAddress) >= 7:
address = (ipAddress, port) address = (ipAddress, port)
else else:
address = (socket.gethostname(), port) address = (socket.gethostname(), port)
serverSocket.bind(address) serverSocket.bind(address)
serverSocket.listen(expectedClients) serverSocket.listen(expectedClients)
@ -126,36 +126,36 @@ class QuickStreamServer(PacketUtility):
"""Get a tuple of byte-size ints from each client.""" """Get a tuple of byte-size ints from each client."""
ret = [] ret = []
for i in range(len(self.clients)): for i in range(len(self.clients)):
ret.append(QuickStreamServer.get_int(self.clients[i][0], 1) ret.append(QuickStreamServer.get_int(self.clients[i][0], 1))
return tuple(ret) return ret
def getShort(self): def getShort(self):
"""Get a tuple of short ints from each client.""" """Get a tuple of short ints from each client."""
ret = [] ret = []
for i in range(len(self.clients)): for i in range(len(self.clients)):
ret.append(QuickStreamServer.get_int(self.clients[i][0], 2) ret.append(QuickStreamServer.get_int(self.clients[i][0], 2))
return tuple(ret) return ret
def getInt(self): def getInt(self):
"""Get a tuple of ints from each client.""" """Get a tuple of ints from each client."""
ret = [] ret = []
for i in range(len(self.clients)): for i in range(len(self.clients)):
ret.append(QuickStreamServer.get_int(self.clients[i][0], 4) ret.append(QuickStreamServer.get_int(self.clients[i][0], 4))
return tuple(ret) return ret
def getLong(self): def getLong(self):
"""Get a tuple of long ints from each client.""" """Get a tuple of long ints from each client."""
ret = [] ret = []
for i in range(len(self.clients)): for i in range(len(self.clients)):
ret.append(QuickStreamServer.get_int(self.clients[i][0], 8) ret.append(QuickStreamServer.get_int(self.clients[i][0], 8))
return tuple(ret) return ret
def getString(self): def getString(self):
"""Get a string from each client.""" """Get a string from each client."""
ret = [] ret = []
for i in range(len(self.clients)): for i in range(len(self.clients)):
ret.append(QuickStreamServer.get_str(self.clients[i][0])) ret.append(QuickStreamServer.get_str(self.clients[i][0]))
return tuple(ret) return ret
def sendByte(self, message): def sendByte(self, message):
"""Send a tuple of byte-size ints to each client.""" """Send a tuple of byte-size ints to each client."""

7
spelling_mp.py
View file

@ -56,10 +56,13 @@ def server():
player1 = Player() player1 = Player()
player2 = Player() player2 = Player()
print("Tell your friend to connect to " + socket.gethostbyname(socket.gethostname())) #print("Tell your friend to connect to " + socket.gethostbyname(socket.gethostname()))
#Linus only, duct tape quick fix:
ip = input("Your ip addr: ")
server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
server_socket.bind((socket.gethostname(), 1028)) #server_socket.bind((socket.gethostname(), 1028))
server_socket.bind((ip, 1028))
server_socket.listen(1) server_socket.listen(1)
(client_socket, address) = server_socket.accept() (client_socket, address) = server_socket.accept()
server_socket.close() server_socket.close()