[Openrpg-dev] openrpg1/orpg/networking mplay_client.py, 1.70, 1.70.4.1 mplay_server.py, 1.146, 1.146.2.1

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/networking
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24257/orpg/networking

Modified Files:
      Tag: BRANCH-1-7-3
	mplay_client.py mplay_server.py 
Log Message:
Applied patch [ 1705262 ] Fix network message pack/unpack by David Vrabel

Index: mplay_server.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_server.py,v
retrieving revision 1.146
retrieving revision 1.146.2.1
diff -C2 -d -r1.146 -r1.146.2.1
*** mplay_server.py	6 May 2007 16:42:59 -0000	1.146
--- mplay_server.py	12 May 2007 20:42:38 -0000	1.146.2.1
***************
*** 1,2843 ****
! #!/usr/bin/python2.1
! # Copyright (C) 2000-2001 The OpenRPG Project
! #
! #        ope...@li...
! #
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2 of the License, or
! # (at your option) any later version.
! #
[...5656 lines suppressed...]
!                             else: FG = LCOLOR
!                         else: FG = PCOLOR
!                         pl += "<tr><td bgcolor=" + COLOR3 + ">"
!                         pl += "<font color=" + FG + " " + SIZE + ">&nbsp;&nbsp;(" +  (self.players[id]).id  + ") "
!                         pl += (self.players[id]).name
!                         pl += "</font></td><td bgcolor=" + COLOR3 + " ><font color=" + FG + " " + SIZE + ">[IP: " + (self.players[id]).ip + "]</font></td><td  bgcolor=" + COLOR3 + " ><font color=" + FG + " " + SIZE + "> "
!                         pl += (self.players[id]).idle_status()
!                         pl += "</font></td><td><font color=" + FG + " " + SIZE + ">"
!                         pl += (self.players[id]).connected_time_string()
!                         pl += "</font>"
! 
!                     else:
!                         self.groups[k].remove_player(id)
!                         pl +="<tr><td colspan='4' bgcolor=" + COLOR3 + " >Bad Player Ref (#" + id + ") in group"
!                 pl+="</td></tr>"
!             pl += "<tr><td colspan='4' bgcolor=" + COLOR1 + "><font color=" + COLOR4 + "><b><i>Statistics: groups: " + str(len(self.groups)) + "  players: " +  str(len(self.players)) + "</i></b></font></td></tr></table>"
!         except Exception, e:
!             self.log_msg(str(e))
!         self.p_lock.release()
!         return pl

Index: mplay_client.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_client.py,v
retrieving revision 1.70
retrieving revision 1.70.4.1
diff -C2 -d -r1.70 -r1.70.4.1
*** mplay_client.py	15 Feb 2007 15:26:47 -0000	1.70
--- mplay_client.py	12 May 2007 20:42:37 -0000	1.70.4.1
***************
*** 1,1030 ****
! # Copyright (C) 2000-2001 The OpenRPG Project
! #
! #        ope...@li...
! #
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2 of the License, or
! # (at your option) any later version.
! #
! # This program is distributed in the hope that it will be useful,
[...2030 lines suppressed...]
!         time.sleep(1)
!         self.do_disconnect()
! 
! 
!     def do_disconnect(self):
!         client_base.disconnect(self)
!         self.clear_players()
!         self.clear_groups()
!         self.useroles = 0
!         self.on_mplay_event(mplay_event(MPLAY_DISCONNECTED))
!         self.useCompression = False
! 
!     def is_connected(self):
!         return (self.status == MPLAY_CONNECTED)
! 
!     def get_next_id(self):
!         self.unique_cookie += 1
! 
!         return_str = self.id + "-" + str(self.unique_cookie)
!         return return_str