merging refs/remotes/carl/master into HEAD
This commit is contained in:
commit
f25bd33dcd
|
@ -578,6 +578,7 @@ Left-Drag to Move"
|
||||||
<hhc site="Carbon" converter="CarbonToFpdb"/>
|
<hhc site="Carbon" converter="CarbonToFpdb"/>
|
||||||
<hhc site="PKR" converter="PkrToFpdb"/>
|
<hhc site="PKR" converter="PkrToFpdb"/>
|
||||||
<hhc site="iPoker" converter="iPokerToFpdb"/>
|
<hhc site="iPoker" converter="iPokerToFpdb"/>
|
||||||
|
<hhc site="Winamax" converter="WinamaxToFpdb"/>
|
||||||
</hhcs>
|
</hhcs>
|
||||||
|
|
||||||
<supported_databases>
|
<supported_databases>
|
||||||
|
|
|
@ -152,7 +152,6 @@ class Winamax(HandHistoryConverter):
|
||||||
["ring", "hold", "fl"],
|
["ring", "hold", "fl"],
|
||||||
["ring", "hold", "nl"],
|
["ring", "hold", "nl"],
|
||||||
["ring", "hold", "pl"],
|
["ring", "hold", "pl"],
|
||||||
["ring", "stud", "fl"],
|
|
||||||
]
|
]
|
||||||
|
|
||||||
def determineGameType(self, handText):
|
def determineGameType(self, handText):
|
||||||
|
@ -233,7 +232,6 @@ class Winamax(HandHistoryConverter):
|
||||||
log.info("readplayerstacks: re is '%s'" % self.re_PlayerInfo)
|
log.info("readplayerstacks: re is '%s'" % self.re_PlayerInfo)
|
||||||
m = self.re_PlayerInfo.finditer(hand.handText)
|
m = self.re_PlayerInfo.finditer(hand.handText)
|
||||||
for a in m:
|
for a in m:
|
||||||
print "DEBUG: found '%s' with '%s'" %(a.group('PNAME'), a.group('CASH'))
|
|
||||||
hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
|
hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user