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

List:       kde-commits
Subject:    kdegames/kpat
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2004-10-14 18:50:39
Message-ID: 20041014185039.9C9E316D5D () office ! kde ! org
[Download RAW message or body]

CVS commit by ingwa: 

Fix bug 89755: Aces up move counter doesn't work

 - increment moves and emit signal setMoves if any card was moved.
 - bump version number to 2.2.1


  M +7 -0      CHANGES   1.9
  M +10 -0     idiot.cpp   1.26
  M +1 -1      version.h   1.17


--- kdegames/kpat/CHANGES  #1.8:1.9
@@ -1,2 +1,9 @@
+2004-10-14 Inge Wallin <inge@lysator.liu.se>
+
+        - fix bug 89755: Aces up move counter doesn't work (idiot.cpp)
+        - bump version to 2.2.1
+
+------------------ KDE 3.3.1 released here ---------------------
+
 since kpat-0.7.3 (18/Nov/1999) <kpat@incense.org>
 

--- kdegames/kpat/idiot.cpp  #1.25:1.26
@@ -81,4 +81,6 @@ bool Idiot::cardClicked(Card *c)
     if (c->source() == deck) {
         deal();
+        ++moves;
+        emit setMoves(moves);
         return true;
     }
@@ -87,4 +89,5 @@ bool Idiot::cardClicked(Card *c)
         return false;
 
+    bool  didMove = true;
     if( canMoveAway(c) )
         away->add(c, false, false);
@@ -97,4 +100,11 @@ bool Idiot::cardClicked(Card *c)
     else if( play[ 3 ]->isEmpty() )
         play[3]->add(c, false, true);
+    else
+        didMove = false;
+
+    if (didMove) {
+        ++moves;
+        emit setMoves(moves);
+    }
 
     return true; // may be a lie, but noone cares

--- kdegames/kpat/version.h  #1.16:1.17
@@ -1,4 +1,4 @@
 #ifndef KPAT_VERSION
-#define KPAT_VERSION "2.2"
+#define KPAT_VERSION "2.2.1"
 #endif
 


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