|
|
@ -368,7 +368,7 @@ class Solitaire : public olc::PixelGameEngine |
|
|
|
draggedCardSuccess: |
|
|
|
draggedCardSuccess: |
|
|
|
bool gameWon = true; |
|
|
|
bool gameWon = true; |
|
|
|
for (int i = 0; i < Home.size(); i++) { |
|
|
|
for (int i = 0; i < Home.size(); i++) { |
|
|
|
if (Home[i].faceUpCards[Home[i].faceUpCards.size() - 1].number != 13) { |
|
|
|
if (Home[i].faceUpCards.size()==0||Home[i].faceUpCards[Home[i].faceUpCards.size() - 1].number != 13) { |
|
|
|
gameWon = false; |
|
|
|
gameWon = false; |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
@ -432,10 +432,6 @@ class Solitaire : public olc::PixelGameEngine |
|
|
|
} |
|
|
|
} |
|
|
|
Field[i].faceUpCards.push_back(DrawCard()); |
|
|
|
Field[i].faceUpCards.push_back(DrawCard()); |
|
|
|
} |
|
|
|
} |
|
|
|
Home[0].faceUpCards.push_back({SPADE, 1}); |
|
|
|
|
|
|
|
Home[1].faceUpCards.push_back({ HEART, 1 }); |
|
|
|
|
|
|
|
Home[2].faceUpCards.push_back({ DIAMOND, 1 }); |
|
|
|
|
|
|
|
Home[3].faceUpCards.push_back({ CLUB, 1 }); |
|
|
|
|
|
|
|
for (int i = 0; i < Home.size();i++) { |
|
|
|
for (int i = 0; i < Home.size();i++) { |
|
|
|
CardSlot&c = Home[i]; |
|
|
|
CardSlot&c = Home[i]; |
|
|
|
c.pos = vi2d{ 136 + i * 40,8 }; |
|
|
|
c.pos = vi2d{ 136 + i * 40,8 }; |
|
|
|