Attachment #130348 for bug #191714

Lines 454-460 Link Here

(-)bubbob/images.py (-1 lines)
454	# check and maybe regenerate the colored image files	454	# check and maybe regenerate the colored image files
455	file = os.path.join('images', 'buildcolors.py')	455	file = os.path.join('images', 'buildcolors.py')
456	g = {'__name__': '__auto__', '__file__': file}	456	g = {'__name__': '__auto__', '__file__': file}
457	execfile(file, g)
458	# replace the entries 'filename_%d.ppm' by a family of entries,	457	# replace the entries 'filename_%d.ppm' by a family of entries,
459	# one for each color	458	# one for each color
460	sprmap = {}	459	sprmap = {}

Lines 162-169 Link Here

(-)display/pclient.py (-2 / +2 lines)
162	if mode[-1].has_key('cfgfile'):	162	if mode[-1].has_key('cfgfile'):
163	self.trackcfgfile = mode[-1]['cfgfile']	163	self.trackcfgfile = mode[-1]['cfgfile']
164	else:	164	else:
165	self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,	165	self.trackcfgfile = os.path.join(os.environ.get('HOME'),
166	'http2', 'config.txt')	166	'.bubnbros')
167	self.udpsock = None	167	self.udpsock = None
168	self.udpsock_low = None	168	self.udpsock_low = None
169	self.udpsock2 = None	169	self.udpsock2 = None






class PageServer:
    CONFIGFILE = '.bubnbros'
    localservers = None

    def __init__(self, Game):

        self.seed = hex(random.randrange(0x1000, 0x10000))
        #self.unique_actions = {}
        self.localhost = gamesrv.HOSTNAME
        self.filename = os.path.join(os.environ.get('HOME'), self.CONFIGFILE)
        data = self.loadoptionfile()
        self.globaloptions = Options(data.get('*', {}))
        self.localoptions  = Options(data.get(self.localhost, {}))

                            'buildcolors.py')
        if os.path.exists(file):
            g = {'__name__': '__auto__', '__file__': file}
            execfile(file, g)

        if port:
            address = '%s:%s' % (host, port)

Return to bug 191714

Lines 38-44 Link Here

(-)http2/httppages.py (-3 / +2 lines)
38		38
39		39
40	class PageServer:	40	class PageServer:
41	CONFIGFILE = 'config.txt'	41	CONFIGFILE = '.bubnbros'
42	localservers = None	42	localservers = None
43		43
44	def __init__(self, Game):	44	def __init__(self, Game):
Lines 46-52 Link Here
46	self.seed = hex(random.randrange(0x1000, 0x10000))	46	self.seed = hex(random.randrange(0x1000, 0x10000))
47	#self.unique_actions = {}	47	#self.unique_actions = {}
48	self.localhost = gamesrv.HOSTNAME	48	self.localhost = gamesrv.HOSTNAME
49	self.filename = os.path.join(LOCALDIR, self.CONFIGFILE)	49	self.filename = os.path.join(os.environ.get('HOME'), self.CONFIGFILE)
50	data = self.loadoptionfile()	50	data = self.loadoptionfile()
51	self.globaloptions = Options(data.get('*', {}))	51	self.globaloptions = Options(data.get('*', {}))
52	self.localoptions = Options(data.get(self.localhost, {}))	52	self.localoptions = Options(data.get(self.localhost, {}))
Lines 333-339 Link Here
333	'buildcolors.py')	333	'buildcolors.py')
334	if os.path.exists(file):	334	if os.path.exists(file):
335	g = {'__name__': '__auto__', '__file__': file}	335	g = {'__name__': '__auto__', '__file__': file}
336	execfile(file, g)
337		336
338	if port:	337	if port:
339	address = '%s:%s' % (host, port)	338	address = '%s:%s' % (host, port)