diff --git a/__pycache__/packets.cpython-34.pyc b/__pycache__/packets.cpython-34.pyc new file mode 100644 index 0000000..cbd4f7f Binary files /dev/null and b/__pycache__/packets.cpython-34.pyc differ diff --git a/__pycache__/spell.cpython-34.pyc b/__pycache__/spell.cpython-34.pyc new file mode 100644 index 0000000..61e5e29 Binary files /dev/null and b/__pycache__/spell.cpython-34.pyc differ diff --git a/__pycache__/status.cpython-34.pyc b/__pycache__/status.cpython-34.pyc new file mode 100644 index 0000000..6dbd8d7 Binary files /dev/null and b/__pycache__/status.cpython-34.pyc differ diff --git a/packets.py b/packets.py index dbcf3db..6ac08bf 100644 --- a/packets.py +++ b/packets.py @@ -110,7 +110,7 @@ class QuickStreamServer(PacketUtility): serverSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) if len(ipAddress) >= 7: address = (ipAddress, port) - else + else: address = (socket.gethostname(), port) serverSocket.bind(address) serverSocket.listen(expectedClients) @@ -126,36 +126,36 @@ class QuickStreamServer(PacketUtility): """Get a tuple of byte-size ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 1) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 1)) + return ret def getShort(self): """Get a tuple of short ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 2) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 2)) + return ret def getInt(self): """Get a tuple of ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 4) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 4)) + return ret def getLong(self): """Get a tuple of long ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 8) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 8)) + return ret def getString(self): """Get a string from each client.""" ret = [] for i in range(len(self.clients)): ret.append(QuickStreamServer.get_str(self.clients[i][0])) - return tuple(ret) + return ret def sendByte(self, message): """Send a tuple of byte-size ints to each client.""" diff --git a/spelling_mp.py b/spelling_mp.py index 6030736..744d714 100644 --- a/spelling_mp.py +++ b/spelling_mp.py @@ -56,10 +56,13 @@ def server(): player1 = 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.bind((socket.gethostname(), 1028)) + #server_socket.bind((socket.gethostname(), 1028)) + server_socket.bind((ip, 1028)) server_socket.listen(1) (client_socket, address) = server_socket.accept() server_socket.close()