From 2382152cb83c589b5f288cf855aec8a564aa7f8f Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 22 Dec 2010 13:20:43 +0800 Subject: [PATCH] Hand: select() update - Fix holecards for holdem --- pyfpdb/Hand.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 68c87425..f61f0765 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -309,10 +309,16 @@ db: a connected Database object""" #print "DEBUG: addPlayer(%s, %s, %s)" %(seat,name,str(chips)) self.addPlayer(seat,name,str(chips)) #print "DEBUG: card1: %s" % card1 - cardlist = map(Card.valueSuitFromCard, [card1, card2, card3, card4]) - cardlist = [card1, card2, card3, card4] + # map() should work, but is returning integers... FIXME later + #cardlist = map(Card.valueSuitFromCard, [card1, card2, card3, card4]) + cardlist = [Card.valueSuitFromCard(card1), Card.valueSuitFromCard(card2), Card.valueSuitFromCard(card3), Card.valueSuitFromCard(card4)] #print "DEUBG: cardlist: '%s'" % cardlist - self.addHoleCards('PREFLOP', name, closed=cardlist, shown=False, mucked=False, dealt=True) + if cardlist[0] == '': + pass + elif self.gametype['category'] == 'holdem': + self.addHoleCards('PREFLOP', name, closed=cardlist[0:2], shown=False, mucked=False, dealt=True) + elif self.gametype['category'] == 'omaha': + self.addHoleCards('PREFLOP', name, closed=cardlist, shown=False, mucked=False, dealt=True) if winnings > 0: self.addCollectPot(name, str(winnings)) if position == 'B':