Mercurial > zrpn
changeset 48:60fab20f67b0
updated networking
| author | Szymon Wróblewski <bluex0@gmail.com> |
|---|---|
| date | Sat, 07 Jul 2012 18:26:16 +0200 |
| parents | f6e93c83532f |
| children | d53bde6ae6c8 |
| files | zrpn/client.py zrpn/pygame_network/__init__.py zrpn/pygame_network/event.py |
| diffstat | 3 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/zrpn/client.py Sat Jul 07 18:18:41 2012 +0200 +++ b/zrpn/client.py Sat Jul 07 18:26:16 2012 +0200 @@ -6,7 +6,6 @@ import logging import pygame_network as net -import pygame_network.event import display import packets @@ -38,6 +37,7 @@ def main(): + net.event.init() logging.basicConfig(level=logging.DEBUG) Client('localhost', 10000).run()
--- a/zrpn/pygame_network/__init__.py Sat Jul 07 18:18:41 2012 +0200 +++ b/zrpn/pygame_network/__init__.py Sat Jul 07 18:26:16 2012 +0200 @@ -3,5 +3,11 @@ from client import Client from server import Server from receiver import Receiver +try: + import pygame +except ImportError: + pass +else: + import event register = packet.PacketManager.register
--- a/zrpn/pygame_network/event.py Sat Jul 07 18:18:41 2012 +0200 +++ b/zrpn/pygame_network/event.py Sat Jul 07 18:26:16 2012 +0200 @@ -17,9 +17,13 @@ NET_RESPONSE = 3 # TODO: response !! -def conf_newtwork_event(val=1): +def init(event_val=1): global NETWORK - NETWORK = USEREVENT + val + NETWORK = USEREVENT + event_val + connection._connected_event = _connected_event + connection._disconnected_event = _disconnected_event + connection._received_event = _received_event + connection._response_event = _response_event def _connected_event(connection): @@ -28,7 +32,6 @@ #'connection': proxy(connection) 'connection': connection })) -connection._connected_event = _connected_event def _disconnected_event(connection): @@ -37,7 +40,6 @@ #'connection': proxy(connection) 'connection': connection })) -connection._disconnected_event = _disconnected_event def _received_event(connection, channel, packet, packet_id): @@ -50,7 +52,6 @@ 'p_id': packet_id, 'p_type': packet.__class__ })) -connection._received_event = _received_event def _response_event(connection, channel, packet, packet_id): @@ -63,4 +64,3 @@ 'p_id': packet_id, 'p_type': packet.__class__ })) -connection._response_event = _response_event