Skip to content

Commit

Permalink
One way server code (client to server)
Browse files Browse the repository at this point in the history
  • Loading branch information
Will Morton committed Apr 5, 2020
1 parent c1f3499 commit 86fc9fe
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions Platformer/Engine/Level.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,30 +46,30 @@ def network_loop(self, kill_signal, server=False):
self.sockets = []
for npc in self.npcs:
sock = socket(AF_INET, SOCK_STREAM)
sock.bind(("127.0.0.1", PORT))
sock.bind(('192.168.1.65', PORT))
sock.listen(5)
sock, client_address = sock.accept()
print("Connection from",client_address)
self.sockets.append(sock)
for sock in self.sockets:
sock.bind(("127.0.0.1", PORT))

while not kill_signal.is_set():
for i, npc in enumerate(self.npc_state_queues):
msg = self.sockets[i].recv(BUFSIZ).decode("utf8")
if msg:
try:
pos = msg.split(']')[0]
if pos.startswith('['):
print("Message = ", msg)
pos = msg.split(')')[0]
if pos.startswith('('):
pos = pos[1:]
pos = pos.split(', ')
if len(pos) == 4:
npc.put([float(p) for p in pos])

print("Message = ", msg)
except:
pass
for i, npc in enumerate(self.npc_state_queues):
msg = str([*self.player.pos, *self.player.speed]) + "\n"
self.sockets[i].send(msg.encode())
# for i, npc in enumerate(self.npc_state_queues):
# msg = str([*self.player.pos, *self.player.speed]) + "\n"
# self.sockets[i].send(msg.encode())

def run(self, kill_signal=None, framerate=60):
print("Running game {}, {}".format(self.player.name, self.map_name))
Expand Down
6 changes: 3 additions & 3 deletions Platformer/RunGame.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ def main():
if __name__=="__main__":
level = Level(
map_name="test_map_new_format",
player_character_name="Batman",
player_character_name="Treeman",
player_start_pos=(20 + 32, 80),
npc_names=["Treeman"],
npc_names=["Batman"],
npc_start_positions=[(20 + 64, 80) ],
window_size=(800, 400),
player_state_queue=[Queue()],
npc_state_queues=[Queue()],
server=False,
server=True,
)
level.run()
2 changes: 1 addition & 1 deletion Server/RunServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def broadcast(msg, prefix=""): # prefix is for name identification.
addresses = {}

HOST = '192.168.1.65'
PORT = 33000
PORT = 33012
BUFSIZ = 1024
ADDR = (HOST, PORT)

Expand Down

0 comments on commit 86fc9fe

Please sign in to comment.