Re: [ros-dev] [ros-diffs] [tfaber] 57815: [SPIDER] - Only dissolve a stack of cards if they're of the same color - Allow easier recognition of suit in concealed cards - Patch by Marcel Leyendeckers, m dot leyendeckers at gm...

[Timo Kreuzer]

YAY!
Finally this is fixed!

Am 07.12.2012 19:00, schrieb tfaber(a)svn.reactos.org:
>   Author: tfaber
>  Date: Fri Dec  7 18:00:30 2012
>  New Revision: 57815
>
>  URL: http://svn.reactos.org/svn/reactos?rev=57815&view=rev
>  Log:
>  [SPIDER]
>  - Only dissolve a stack of cards if they're of the same color
>  - Allow easier recognition of suit in concealed cards
>  - Patch by Marcel Leyendeckers, m dot leyendeckers at gmx dot de
>  CORE-6808 #resolve #comment Committed. Thanks!
>
>  Modified:
>       trunk/reactos/base/applications/games/spider/spigame.cpp
>
>  Modified: trunk/reactos/base/applications/games/spider/spigame.cpp
>  URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp…
>  ==============================================================================
>  --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original)
>  +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Fri Dec  7
> 18:00:30 2012
>  @@ -249,7 +249,8 @@
>                int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1;
>    
>                /* Dragged cards have been checked to be in order, check stack cards */
>  -            if (stackLookingGood(mystack, max))
>  +            if (mystack[0].Suit() == dragcard.Suit() &&
>  +                stackLookingGood(mystack, max))
>                {
>                    CardStack s = stackobj.GetCardStack();
>                    CardStack f;
>  @@ -279,8 +280,8 @@
>    {
>        int i, pos;
>    
>  -    /* Compute the value for yRowStackCardOffset based on the height of the card, so the
> card number isn't hidden on larger cards */
>  -    yRowStackCardOffset = (int)(__cardheight / 6.7);
>  +    /* Compute the value for yRowStackCardOffset based on the height of the card, so the
> card number and suite isn't hidden on larger cards except Ace */
>  +    yRowStackCardOffset = (int)(__cardheight / 6.4);
>    
>        pDeck = SpiderWnd.CreateRegion(0, true, 0, 0, -15, 0);
>        pDeck->SetFaceDirection(CS_FACE_DOWN, 0);
>
>
>

[Aleksey Bragin]

Now ReactOS is perfect.

On 15.12.2012 0:39, Timo Kreuzer wrote:
>   YAY!
>  Finally this is fixed!
>
>  Am 07.12.2012 19:00, schrieb tfaber(a)svn.reactos.org:
> >   Author: tfaber
> >  Date: Fri Dec  7 18:00:30 2012
> >  New Revision: 57815
> >
> >  URL: http://svn.reactos.org/svn/reactos?rev=57815&view=rev
> >  Log:
> >  [SPIDER]
> >  - Only dissolve a stack of cards if they're of the same color
> >  - Allow easier recognition of suit in concealed cards
> >  - Patch by Marcel Leyendeckers, m dot leyendeckers at gmx dot de
> >  CORE-6808 #resolve #comment Committed. Thanks!
> >
> >  Modified:
> >       trunk/reactos/base/applications/games/spider/spigame.cpp
> >
> >  Modified: trunk/reactos/base/applications/games/spider/spigame.cpp
> >  URL: 
> >
> > http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp…
> >  ============================================================================== 
> >
> >  --- trunk/reactos/base/applications/games/spider/spigame.cpp 
> >  [iso-8859-1] (original)
> >  +++ trunk/reactos/base/applications/games/spider/spigame.cpp 
> >  [iso-8859-1] Fri Dec  7 18:00:30 2012
> >  @@ -249,7 +249,8 @@
> >                int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() 
> >  - 1;
> >                  /* Dragged cards have been checked to be in order, 
> >  check stack cards */
> >  -            if (stackLookingGood(mystack, max))
> >  +            if (mystack[0].Suit() == dragcard.Suit() &&
> >  +                stackLookingGood(mystack, max))
> >                {
> >                    CardStack s = stackobj.GetCardStack();
> >                    CardStack f;
> >  @@ -279,8 +280,8 @@
> >    {
> >        int i, pos;
> >    -    /* Compute the value for yRowStackCardOffset based on the 
> >  height of the card, so the card number isn't hidden on larger cards */
> >  -    yRowStackCardOffset = (int)(__cardheight / 6.7);
> >  +    /* Compute the value for yRowStackCardOffset based on the height 
> >  of the card, so the card number and suite isn't hidden on larger 
> >  cards except Ace */
> >  +    yRowStackCardOffset = (int)(__cardheight / 6.4);
> >          pDeck = SpiderWnd.CreateRegion(0, true, 0, 0, -15, 0);
> >        pDeck->SetFaceDirection(CS_FACE_DOWN, 0);
> >
> >
> >  
>