eliminate warnings, fix bug that locked up game when single-clicking a card

[reactos.git] / rosapps / games / solitaire / cardlib / cardregion.cpp

diff --git a/rosapps/games/solitaire/cardlib/cardregion.cpp b/rosapps/games/solitaire/cardlib/cardregion.cpp
index 1a7e8ce..8ecf4be 100644 (file)
--- a/rosapps/games/solitaire/cardlib/cardregion.cpp
+++ b/rosapps/games/solitaire/cardlib/cardregion.cpp
@@ -16,7 +16,7 @@ HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, int width, int height);
 void PaintRect(HDC hdc, RECT *rect, COLORREF colour);\r
 \r
 CardRegion::CardRegion(CardWindow &parent, int Id, bool visible, int x, int y, int xOffset, int yOffset) \r
-: parentWnd(parent), id(Id), fVisible(visible), xpos(x), ypos(y), xoffset(xOffset), yoffset(yOffset)\r
+: id(Id), parentWnd(parent), xpos(x), ypos(y), xoffset(xOffset), yoffset(yOffset), fVisible(visible)\r
 {\r
        width  = __cardwidth;\r
        height = __cardheight;\r
@@ -56,7 +56,7 @@ CardRegion::CardRegion(CardWindow &parent, int Id, bool visible, int x, int y, i
 \r
        nFlashCount             = 0;\r
        fFlashVisible   = false;\r
-       uFlashTimer             = -1;\r
+       uFlashTimer             = (UINT)-1;\r
 \r
        fMouseDragging = false;\r
 \r
@@ -331,25 +331,25 @@ void CardRegion::Flash(int count, int milliseconds)
 \r
 void CardRegion::StopFlash()\r
 {\r
-       if(uFlashTimer != -1)\r
+       if(uFlashTimer != (UINT)-1)\r
        {\r
                KillTimer((HWND)parentWnd, uFlashTimer);\r
                nFlashCount             = 0;\r
-               uFlashTimer             = -1;\r
+               uFlashTimer             = (UINT)-1;\r
                fFlashVisible   = true;\r
        }\r
 }\r
 \r
 void CardRegion::DoFlash()\r
 {\r
-       if(uFlashTimer != -1)\r
+       if(uFlashTimer != (UINT)-1)\r
        {\r
                fFlashVisible = !fFlashVisible;\r
 \r
                if(--nFlashCount == 0)\r
                {\r
                        KillTimer((HWND)parentWnd, uFlashTimer);\r
-                       uFlashTimer = -1;\r
+                       uFlashTimer = (UINT)-1;\r
                        fFlashVisible = true;\r
                }\r
        \r
@@ -655,4 +655,4 @@ bool CardRegion::SimulateDrag(CardRegion *pDestStack, int iNumDragCards, bool fA
        }\r
 \r
        return true;\r
-}
\ No newline at end of file
+}\r