Changeset 1619
- Timestamp:
- 07/14/08 11:14:44 (4 months ago)
- Files:
-
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/characterserver/server.py (modified) (4 diffs)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/gmserver/gmserver.py (modified) (1 diff)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/masterserver/main.py (modified) (1 diff)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/world/theworld.py (modified) (1 diff)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worlddaemon/main.py (modified) (1 diff)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worlddaemon/worldimp.py (modified) (1 diff)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worlddaemon/worldservices.py (modified) (1 diff)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worldmanager/worldmanager.py (modified) (1 diff)
- branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worldserver/main.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/games/minionsofmirth/v1/experimental/new-stuff/mud/characterserver/server.py
r1614 r1619 7 7 sys.path.append(getcwd()) 8 8 9 USE_WX = False 10 if "-wx" in sys.argv: 11 USE_WX = True 9 USE_WX = "-wx" in sys.argv 12 10 13 11 if sys.platform == 'win32' and not USE_WX: 14 12 from twisted.internet.iocpreactor import install 15 13 else: 14 USE_WX = True 16 15 import wx 17 16 from twisted.internet.wxreactor import install … … 33 32 import random 34 33 from mud.server.config import LoadConfiguration 35 import MySQLdb34 #import MySQLdb 36 35 37 36 if USE_WX: … … 573 572 574 573 574 """ 575 575 def AwardTicket(pname,levelType="",level=None): 576 576 … … 615 615 616 616 return pname 617 """ 617 618 618 619 branches/games/minionsofmirth/v1/experimental/new-stuff/mud/gmserver/gmserver.py
r1614 r1619 8 8 from twisted.internet.iocpreactor import install 9 9 else: 10 from twisted.internet. pollreactor import install10 from twisted.internet.threadedselectreactor import install 11 11 install() 12 12 branches/games/minionsofmirth/v1/experimental/new-stuff/mud/masterserver/main.py
r219 r1619 11 11 from twisted.internet.iocpreactor import install 12 12 else: 13 from twisted.internet. pollreactor import install13 from twisted.internet.threadedselectreactor import install 14 14 install() 15 15 from twisted.internet import reactor branches/games/minionsofmirth/v1/experimental/new-stuff/mud/world/theworld.py
r1614 r1619 745 745 args = args.split(" ") 746 746 args.insert(0,cmd) 747 s = ' /usr/local/bin/pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args))747 s = 'pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args)) 748 748 print s 749 749 os.system(s) branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worlddaemon/main.py
r1614 r1619 16 16 from twisted.internet.iocpreactor import install 17 17 else: 18 USE_WX = True 18 19 import wx 19 20 from twisted.internet.wxreactor import install branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worlddaemon/worldimp.py
r1614 r1619 101 101 args.insert(0,cmd) 102 102 103 s = ' /usr/local/bin/pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args))103 s = 'pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args)) 104 104 print s 105 105 os.system(s) branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worlddaemon/worldservices.py
r1614 r1619 113 113 args.insert(0,cmd) 114 114 115 s = ' /usr/local/bin/pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args))115 s = 'pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args)) 116 116 print s 117 117 os.system(s) branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worldmanager/worldmanager.py
r1614 r1619 182 182 args.insert(0,cmd) 183 183 184 s = ' /usr/local/bin/pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args))184 s = 'pythonw -c \'import os;os.spawnv(os.P_NOWAIT,"%s",[%s])\''%(cmd,','.join('"%s"'%arg for arg in args)) 185 185 print s 186 186 os.system(s) branches/games/minionsofmirth/v1/experimental/new-stuff/mud/worldserver/main.py
r1614 r1619 21 21 win32api = win32process = None 22 22 23 USE_WX = False 24 if "-wx" in sys.argv: 25 USE_WX = True 23 USE_WX = "-wx" in sys.argv 26 24 27 25 if sys.platform == 'win32' and not USE_WX: 28 26 from twisted.internet.iocpreactor import install 29 27 else: 28 USE_WX = True 30 29 import wx 31 30 from twisted.internet.wxreactor import install
