Mercurial > traipse_dev
comparison orpg/networking/mplay_client.py @ 227:81d0bfd5e800 alpha
Traipse Alpha 'OpenRPG' {100612-00}
Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for
developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to
the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user.
Update Summary (Preparing to close updates)
New Features:
New to Map, can re-order Grid, Miniatures, and Whiteboard layer draw order
Fixes:
Fix to InterParse that was causing an Infernal Loop with Namespace Internal
Fix to XML data, removed old Minidom and switched to Element Tree
Fix to Server that was causing eternal attempt to find a Server ID, in Register Rooms thread
Fix to metaservers.xml file not being created
author | sirebral |
---|---|
date | Sat, 12 Jun 2010 03:50:37 -0500 |
parents | 06f10429eedc |
children |
comparison
equal
deleted
inserted
replaced
182:4b2884f29a72 | 227:81d0bfd5e800 |
---|---|
19 # | 19 # |
20 # File: mplay_client.py | 20 # File: mplay_client.py |
21 # Author: Chris Davis | 21 # Author: Chris Davis |
22 # Maintainer: | 22 # Maintainer: |
23 # Version: | 23 # Version: |
24 # $Id: mplay_client.py,v 1.71 2007/05/12 20:41:54 digitalxero Exp $ | 24 # $Id: mplay_client.py,v Traipse 'Ornery-Orc' prof.ebral Exp $ |
25 # | 25 # |
26 # Description: This file contains the code for the client stubs of the multiplayer | 26 # Description: This file contains the code for the client stubs of the multiplayer |
27 # features in the orpg project. | 27 # features in the orpg project. |
28 # | 28 # |
29 | 29 |
30 __version__ = "$Id: mplay_client.py,v 1.71 2007/05/12 20:41:54 digitalxero Exp $" | 30 __version__ = "$Id: mplay_client.py,v Traipse 'Ornery-Orc' prof.ebral Exp $" |
31 | 31 |
32 ### Alpha ### | |
33 ##import orpg.minidom ## Deprecated. xml.parseXml calls minidom.parseString so it was superfluous and wasteful. | |
34 import socket, Queue, thread, traceback, errno, os, time | 32 import socket, Queue, thread, traceback, errno, os, time |
35 | 33 |
36 from threading import Event, Lock | 34 from threading import Event, Lock |
37 from xml.sax.saxutils import escape | 35 from xml.sax.saxutils import escape |
38 from struct import pack, unpack, calcsize | 36 from struct import pack, unpack, calcsize |
39 from string import * | 37 from string import * |
40 from orpg.orpg_version import CLIENT_STRING, PROTOCOL_VERSION, VERSION | 38 from orpg.orpg_version import CLIENT_STRING, PROTOCOL_VERSION, VERSION |
41 | 39 |
42 from orpg.orpgCore import component | 40 from orpg.orpgCore import component |
43 from orpg.orpg_xml import xml | 41 #from orpg.orpg_xml import xml |
44 from orpg.tools.orpg_log import debug | 42 from orpg.tools.orpg_log import debug |
45 from orpg.tools.settings import settings | 43 from orpg.tools.settings import settings |
46 | 44 |
47 from xml.etree.ElementTree import ElementTree, Element, iselement | 45 from xml.etree.ElementTree import ElementTree, Element, iselement |
48 from xml.etree.ElementTree import fromstring, tostring | 46 from xml.etree.ElementTree import fromstring, tostring |
81 GROUP_DEL = 3 | 79 GROUP_DEL = 3 |
82 GROUP_UPDATE = 4 | 80 GROUP_UPDATE = 4 |
83 STATUS_SET_URL = 1 | 81 STATUS_SET_URL = 1 |
84 | 82 |
85 def parseXml(data): | 83 def parseXml(data): |
84 debug(('Developers note. Deprecated call to parseXml!!'), parents=True) | |
86 "parse and return doc" | 85 "parse and return doc" |
87 doc = xml.parseXml(data) | 86 doc = xml.parseXml(data) |
88 doc.normalize() | 87 doc.normalize() |
89 return doc | 88 return doc |
90 | 89 |
121 self.ROLE_GM = "GM" | 120 self.ROLE_GM = "GM" |
122 self.ROLE_PLAYER = "Player" | 121 self.ROLE_PLAYER = "Player" |
123 self.ROLE_LURKER = "Lurker" | 122 self.ROLE_LURKER = "Lurker" |
124 ## --TaS | 123 ## --TaS |
125 try: self.ip = socket.gethostbyname(socket.gethostname()) | 124 try: self.ip = socket.gethostbyname(socket.gethostname()) |
126 except: self.ip = socket.gethostbyname('localhost') | 125 except: self.ip = socket.gethostbyname('localhost') |
127 self.remote_ip = None | 126 self.remote_ip = None |
128 self.version = VERSION | 127 self.version = VERSION |
129 self.protocol_version = PROTOCOL_VERSION | 128 self.protocol_version = PROTOCOL_VERSION |
130 self.client_string = CLIENT_STRING | 129 self.client_string = CLIENT_STRING |
131 self.status = MPLAY_DISCONNECTED | 130 self.status = MPLAY_DISCONNECTED |
387 class mplay_client(client_base): | 386 class mplay_client(client_base): |
388 "mplay client" | 387 "mplay client" |
389 def __init__(self,name,callbacks): | 388 def __init__(self,name,callbacks): |
390 client_base.__init__(self) | 389 client_base.__init__(self) |
391 component.add('mp_client', self) | 390 component.add('mp_client', self) |
392 self.xml = component.get('xml') | |
393 self.set_name(name) | 391 self.set_name(name) |
394 self.on_receive = callbacks['on_receive'] | 392 self.on_receive = callbacks['on_receive'] |
395 self.on_mplay_event = callbacks['on_mplay_event'] | 393 self.on_mplay_event = callbacks['on_mplay_event'] |
396 self.on_group_event = callbacks['on_group_event'] | 394 self.on_group_event = callbacks['on_group_event'] |
397 self.on_player_event = callbacks['on_player_event'] | 395 self.on_player_event = callbacks['on_player_event'] |
623 if (group_id != 0): self.update_role("Lurker") | 621 if (group_id != 0): self.update_role("Lurker") |
624 el = Element('join_group') | 622 el = Element('join_group') |
625 el.set('from', self.id) | 623 el.set('from', self.id) |
626 el.set('pwd', pwd) | 624 el.set('pwd', pwd) |
627 el.set('group_id', str(group_id)) | 625 el.set('group_id', str(group_id)) |
628 | |
629 self.outbox.put(tostring(el)) | 626 self.outbox.put(tostring(el)) |
630 | 627 |
631 def poll(self, evt=None): | 628 def poll(self, evt=None): |
632 try: msg = self.inbox.get_nowait() | 629 try: msg = self.inbox.get_nowait() |
633 except: | 630 except: |
764 self.on_mplay_event(mplay_event(MPLAY_GROUP_CHANGE_F)) | 761 self.on_mplay_event(mplay_event(MPLAY_GROUP_CHANGE_F)) |
765 elif act == "del": | 762 elif act == "del": |
766 self.on_player_event(mplay_event(PLAYER_DEL, self.players[id])) | 763 self.on_player_event(mplay_event(PLAYER_DEL, self.players[id])) |
767 if self.players.has_key(id): del self.players[id] | 764 if self.players.has_key(id): del self.players[id] |
768 if id == self.id: self.do_disconnect() | 765 if id == self.id: self.do_disconnect() |
769 # the next two cases handle the events that are used to let you know when others are typing | |
770 elif act == "update": | 766 elif act == "update": |
771 if id == self.id: | 767 if id == self.id: |
772 self.players[id] = player | 768 self.players[id] = player |
773 self.update_self_from_player(player) | 769 self.update_self_from_player(player) |
774 else: self.players[id] = player | 770 else: self.players[id] = player |
840 def start_disconnect(self): | 836 def start_disconnect(self): |
841 self.on_mplay_event(mplay_event(MPLAY_DISCONNECTING)) | 837 self.on_mplay_event(mplay_event(MPLAY_DISCONNECTING)) |
842 outgoing = self.toxml('del') | 838 outgoing = self.toxml('del') |
843 if iselement(outgoing): outgoing = tostring(outgoing) | 839 if iselement(outgoing): outgoing = tostring(outgoing) |
844 self.outbox.put(outgoing) | 840 self.outbox.put(outgoing) |
845 ## Client Side Disconect Forced -- Snowdog 10-09-2003 | 841 ## Client Side Disconnect Forced -- Snowdog 10-09-2003 |
846 #pause to allow GUI events time to sync. | 842 #pause to allow GUI events time to sync. |
847 time.sleep(1) | 843 time.sleep(1) |
848 self.do_disconnect() | 844 self.do_disconnect() |
849 | 845 |
850 def do_disconnect(self): | 846 def do_disconnect(self): |
860 | 856 |
861 def get_next_id(self): | 857 def get_next_id(self): |
862 self.unique_cookie += 1 | 858 self.unique_cookie += 1 |
863 return_str = self.id + "-" + str(self.unique_cookie) | 859 return_str = self.id + "-" + str(self.unique_cookie) |
864 return return_str | 860 return return_str |
861 |