W0LF/bulls-and-cows-cpp
1
0
Fork 0
mirror of https://gitflic.ru/project/w0lf/bulls-and-cows-cpp.git synced 2026-03-28 16:02:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes.

Browse Source
This commit is contained in:
W0LF
2023-08-02 15:49:16 +03:00
parent 3833461e90
commit 340924213a
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bulls-and-cows-cpp/CGame.cpp
View File

@@ -172,10 +172,11 @@ CGame::CGame()
PrintGameHeader(); PrintGameHeader();
std::wcout << L"Введите количество цифр в числе (от 3 до 7).\n"; std::wcout << L"Введите количество цифр в числе (от 3 до 7).\n";
std::wcout << L"Чем больше цифр - тем сложнее. Обычно 4.\n"; std::wcout << L"Чем больше цифр - тем сложнее. Обычно 4.\n";
std::wcout << L"> "; std::wcout << L"=> ";
if (userInput.Get()) if (userInput.Get())
{ {
if (userInput.m_vUserInput.at(0) >= 3 && userInput.m_vUserInput.at(0) <= 7) if ((userInput.m_vUserInput.at(0) >= 3) && (userInput.m_vUserInput.at(0) <= 7))
{ {
m_ucDigits = userInput.m_vUserInput.at(0); m_ucDigits = userInput.m_vUserInput.at(0);
ok = true; ok = true;
@@ -186,8 +187,6 @@ CGame::CGame()
} }
} }
} while (!ok); } while (!ok);
std::wcout << L"m_ucDigits: " << m_ucDigits << std::endl;
} }
CGame::~CGame() CGame::~CGame()

13
bulls-and-cows-cpp/CUserInput.cpp
View File

@@ -7,7 +7,7 @@ CUserInput::CUserInput(int nNumOfDigits)
m_nNumOfExpectedDigits = nNumOfDigits; m_nNumOfExpectedDigits = nNumOfDigits;
} }
int CUserInput::Get() bool CUserInput::Get()
{ {
std::wstring sDigits; std::wstring sDigits;
wchar_t cDigit; wchar_t cDigit;
@@ -15,14 +15,9 @@ int CUserInput::Get()
std::getline(std::wcin, sDigits); std::getline(std::wcin, sDigits);
if (sDigits == L"Q" || sDigits == L"q")
{
return -1;
}
if (sDigits.length() != m_nNumOfExpectedDigits) if (sDigits.length() != m_nNumOfExpectedDigits)
{ {
return -2; return false;
} }
for (unsigned i = 0; i < m_nNumOfExpectedDigits; i++) for (unsigned i = 0; i < m_nNumOfExpectedDigits; i++)
@@ -31,10 +26,10 @@ int CUserInput::Get()
if (!(bool)std::iswdigit(cDigit)) if (!(bool)std::iswdigit(cDigit))
{ {
m_vUserInput.clear(); m_vUserInput.clear();
return -2; return false;
} }
nDigit = ((int)cDigit) - 48; nDigit = ((int)cDigit) - 48;
m_vUserInput.push_back(nDigit); m_vUserInput.push_back(nDigit);
} }
return 0; return true;
} }

2
bulls-and-cows-cpp/CUserInput.h
View File

@@ -14,5 +14,5 @@ public:
std::vector<int> m_vUserInput; std::vector<int> m_vUserInput;
CUserInput(int nNumOfExpectedDigits); CUserInput(int nNumOfExpectedDigits);
int Get(); bool Get();
}; };