Merge branch 'eric'
This commit is contained in:
commit
ce7b61bbd5
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright 2008-2010, Carl Gherardi
|
||||
|
@ -174,8 +174,10 @@ or None if we fail to get the info """
|
|||
for a in m:
|
||||
seatnum = int(a.group('SEAT'))
|
||||
hand.addPlayer(seatnum, a.group('PNAME'), a.group('CASH'))
|
||||
if seatnum > 6:
|
||||
hand.maxseats = 10 # everleaf currently does 2/6/10 games, so if seats > 6 are in use, it must be 10-max.
|
||||
if seatnum > 8:
|
||||
hand.maxseats = 10 # they added 8-seat games now
|
||||
elif seatnum > 6:
|
||||
hand.maxseats = 8 # everleaf currently does 2/6/10 games, so if seats > 6 are in use, it must be 10-max.
|
||||
# TODO: implement lookup list by table-name to determine maxes, then fall back to 6 default/10 here, if there's no entry in the list?
|
||||
|
||||
|
||||
|
|
|
@ -290,6 +290,18 @@ Left-Drag to Move"
|
|||
<location seat="9" x="7" y="88"> </location>
|
||||
<location seat="10" x="196" y="69"> </location>
|
||||
</layout>
|
||||
<layout fav_seat="0" height="546" max="8" width="792">
|
||||
<location seat="0" x="182" y="69"> </location>
|
||||
<location seat="1" x="456" y="74"> </location>
|
||||
<location seat="2" x="630" y="81"> </location>
|
||||
<location seat="3" x="618" y="352"> </location>
|
||||
<location seat="4" x="426" y="380"> </location>
|
||||
<location seat="5" x="243" y="382"> </location>
|
||||
<location seat="6" x="34" y="351"> </location>
|
||||
<location seat="7" x="22" y="82"> </location>
|
||||
<location seat="8" x="213" y="74"> </location>
|
||||
</layout>
|
||||
|
||||
<layout fav_seat="0" height="546" max="2" width="792">
|
||||
<location seat="1" x="651" y="288"> </location>
|
||||
<location seat="2" x="10" y="288"> </location>
|
||||
|
|
Loading…
Reference in New Issue
Block a user