[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kajongg/sid] src: Game.prepareHand: move common code from subclasses to Game
From:       Wolfgang Rohdewald <wolfgang () rohdewald ! de>
Date:       2013-10-31 21:21:12
Message-ID: E1Vbzg0-0002lj-L3 () scm ! kde ! org
[Download RAW message or body]

Git commit ac35ef592b4af7ac1abc6f029097cc211478318a by Wolfgang Rohdewald.
Committed on 31/10/2013 at 11:57.
Pushed by wrohdewald into branch 'sid'.

Game.prepareHand: move common code from subclasses to Game

M  +3    -3    src/game.py
M  +1    -3    src/playfield.py

http://commits.kde.org/kajongg/ac35ef592b4af7ac1abc6f029097cc211478318a

diff --git a/src/game.py b/src/game.py
index ac5b9e9..cc73adf 100644
--- a/src/game.py
+++ b/src/game.py
@@ -404,6 +404,8 @@ class Game(object):
     def prepareHand(self):
         """prepare a game hand"""
         self.clearHand()
+        if self.finished():
+            self.close()
 
     def initHand(self):
         """directly before starting"""
@@ -688,9 +690,7 @@ class PlayingGame(Game):
     def prepareHand(self):
         """prepares the next hand"""
         Game.prepareHand(self)
-        if self.finished():
-            self.close()
-        else:
+        if not self.finished():
             self.sortPlayers()
             self.hidePopups()
             self._setHandSeed()
diff --git a/src/playfield.py b/src/playfield.py
index f330a0c..e9af0e3 100644
--- a/src/playfield.py
+++ b/src/playfield.py
@@ -456,9 +456,7 @@ class ScoringGame(Game):
     def prepareHand(self):
         """prepare a scoring game hand"""
         Game.prepareHand(self)
-        if self.finished():
-            self.close()
-        else:
+        if not self.finished():
             selector = Internal.field.selectorBoard
             selector.refill()
             selector.hasFocus = True

[prev in list] [next in list] [prev in thread] [next in thread]