Mercurial > traipse_dev
changeset 58:27e58b0483e7 traipse_dev
Fixed major bug that caused an error to spit out in Windows platforms.
Added /tmp/tmp.txt placeholder to ensure the /tmp/ folder is there.
removed more print statements.
| author | sirebral |
|---|---|
| date | Sat, 08 Aug 2009 00:25:33 -0500 |
| parents | 9014d7861bb3 |
| children | 5aff3ef1ae46 54e5831be350 |
| files | orpg/networking/mplay_server.py orpg/networking/mplay_server_gui.py orpg/orpg_version.py upmana/tmp/tmp.txt upmana/updatemana.py |
| diffstat | 5 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/networking/mplay_server.py Fri Aug 07 23:21:37 2009 -0500 +++ b/orpg/networking/mplay_server.py Sat Aug 08 00:25:33 2009 -0500 @@ -2408,8 +2408,8 @@ self.log_msg("Exception: send_to_all(): " + str(e)) def send_to_group(self, from_id, group_id, data): - data = ("<msg to='all' from='0' group_id='"+group_id+"'><font color='#FF0000'>" + data + "</font>") - data = ServerPlugins.postParseIncoming(data) + #data = ("<msg to='all' from='0' group_id='"+str(group_id)+"'><font color='#FF0000'>" + data + "</font>") + data = ServerPlugins.postParseIncoming(data) #Function breaks here. try: self.p_lock.acquire() keys = self.groups[group_id].get_player_ids()
--- a/orpg/networking/mplay_server_gui.py Fri Aug 07 23:21:37 2009 -0500 +++ b/orpg/networking/mplay_server_gui.py Sat Aug 08 00:25:33 2009 -0500 @@ -224,7 +224,7 @@ def updateRoom( self, data ): (room, room_id, player) = data i = self.FindItemData( -1, int(player) ) - self.SetStringItem( i, 3, room ) + if i > 0: self.SetStringItem( i, 3, room ) self.AutoAjust() def setPlayerRole( self, id, role ): @@ -275,8 +275,7 @@ elif menuItem == MENU_PLAYER_SEND_ROOM_MESSAGE: print "Send message to room..." msg = self.GetMessageInput( "Send message to room of this player") - if len(msg): - self.main.server.server.send_to_group("0", str(groupID), msg ) + if len(msg): self.main.server.server.send_to_group('0', str(groupID), msg ) elif menuItem == MENU_PLAYER_SEND_SERVER_MESSAGE: print "broadcast a message..."
--- a/orpg/orpg_version.py Fri Aug 07 23:21:37 2009 -0500 +++ b/orpg/orpg_version.py Sat Aug 08 00:25:33 2009 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Dev" DIS_VER = "Grumpy Goblin" -BUILD = "090807-01" +BUILD = "090807-02" # This version is for network capability. PROTOCOL_VERSION = "1.2"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upmana/tmp/tmp.txt Sat Aug 08 00:25:33 2009 -0500 @@ -0,0 +1,1 @@ +upmana/tmp/
--- a/upmana/updatemana.py Fri Aug 07 23:21:37 2009 -0500 +++ b/upmana/updatemana.py Sat Aug 08 00:25:33 2009 -0500 @@ -102,7 +102,6 @@ shutil.copy(ignore, orpg.dirpath.dir_struct["home"] + 'upmana' + os.sep + 'tmp' + os.sep +ignore.split('/')[len(ignore.split('/')) - 1]) hg.clean(self.repo, self.current) for ignore in self.ignorelist: - print ignore.split('/')[len(ignore.split('/')) - 1] shutil.copyfile(orpg.dirpath.dir_struct["home"] + 'upmana' + os.sep + 'tmp' + os.sep + ignore.split('/')[len(ignore.split('/')) - 1], ignore) os.remove(orpg.dirpath.dir_struct["home"] + 'upmana' + os.sep + 'tmp' + os.sep + ignore.split('/')[len(ignore.split('/')) - 1])